commit c85ad9112067abf83f8d7753018cc57535dc93c3
author Mike Yu <yumike@google.com> Tue Feb 02 07:11:56 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 02 07:11:56 2021 +0000
tree 563b083f8e2f930230568307c034bab6bb747c31
parent ab40e873491e515dc8f673c869c7a3299fc5cfc5
parent 4a99aa16d6c0e2ce8b64fa4bb52bd2b6d535120e

Revert "Update D8 and R8 to 3.0.17-dev" am: 4a99aa16d6

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I172027b0bfa35fe244754b27d878671f9a07bbcd

r8.jar

diff --git a/r8.jar b/r8.jar
index a7b585d..d32c5c4 100644
--- a/r8.jar
+++ b/r8.jar
Binary files differ

r8.jar.map

diff --git a/r8.jar.map b/r8.jar.map
index 49a76b4..128b56a 100644
--- a/r8.jar.map
+++ b/r8.jar.map
@@ -1,9 +1,9 @@
 # compiler: R8
-# compiler_version: 3.0.17-dev
+# compiler_version: 3.0.13-dev
 # compiler_hash: engineering
-# pg_map_id: f702651
+# pg_map_id: 6f035bd
 # common_typos_disable
-com.android.tools.r8.ApiLevelException -> com.android.tools.r8.internal.h1:
+com.android.tools.r8.ApiLevelException -> com.android.tools.r8.internal.g1:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():10:10 -> <clinit>
     1:1:void <init>(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String,java.lang.String):14:14 -> <init>
@@ -514,31 +514,31 @@
     18:23:com.android.tools.r8.graph.AppView readApp(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):168:173 -> a
     24:26:void lambda$run$4(com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis,com.android.tools.r8.graph.DexProgramClass):203:205 -> a
     27:27:void lambda$run$5(java.lang.String):235:235 -> a
-    28:48: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):341:361 -> a
-    49:77: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):358:386 -> a
+    28:48: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):351:371 -> a
+    49:77: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):368:396 -> a
     78:78:com.android.tools.r8.graph.DexApplication com.android.tools.r8.graph.LazyLoadedDexApplication$Builder.build():193:193 -> a
-    78:78: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
-    79:79: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
-    80:80: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):380:380 -> 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 -> 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:394 -> a
+    78:78: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):396 -> a
+    79:79:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):404:404 -> a
+    80:80: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):378:378 -> 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):404 -> 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):404:404 -> a
     1:1:void lambda$run$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):120:120 -> 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:12:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):178:189 -> d
     13:26:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):188:201 -> d
     27:42:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):200:215 -> d
-    43:43: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):380:380 -> d
+    43:43: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):378:378 -> d
     43:43:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):215 -> d
-    44:105:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):215:276 -> d
-    106:106:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():459:459 -> d
-    106:106:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):278 -> d
-    107:127:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):278:298 -> d
-    128:134:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):297:303 -> d
-    135:139:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):300:304 -> d
-    140:181:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):285:326 -> d
-    182:182:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):221:221 -> d
-    182:182:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):321 -> d
-    183:188:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):321:326 -> d
+    44:110:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):215:281 -> d
+    111:111:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():466:466 -> d
+    111:111:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):283 -> d
+    112:132:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):283:303 -> d
+    133:139:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):302:308 -> d
+    140:144:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):305:309 -> d
+    145:191:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):290:336 -> d
+    192:192:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):210:210 -> d
+    192:192:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):331 -> d
+    193:198:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):331:336 -> d
     1:4:void main(java.lang.String[]):145:148 -> main
     5:5:void main(java.lang.String[]):146:146 -> main
     1:5:void run(com.android.tools.r8.D8Command):93:97 -> run
@@ -547,20 +547,21 @@
     11:11:void run(com.android.tools.r8.D8Command,java.util.concurrent.ExecutorService):117:117 -> run
 com.android.tools.r8.D8$ConvertedCfFiles -> com.android.tools.r8.D8$a:
     java.util.List resources -> a
-    1:3:void <init>():409:411 -> <init>
-    1:3:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):417:419 -> accept
-    4:4:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):418:418 -> accept
-    5:5:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):417:417 -> accept
-    1:1:java.util.Collection getProgramResources():424:424 -> getProgramResources
+    1:3:void <init>():419:421 -> <init>
+    1:3:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):427:429 -> accept
+    4:4:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):428:428 -> accept
+    5:5:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):427:427 -> accept
+    1:1:java.util.Collection getProgramResources():434:434 -> getProgramResources
 com.android.tools.r8.D8Command -> com.android.tools.r8.D8Command:
-    com.android.tools.r8.graph.DexItemFactory factory -> B
-    boolean enableMainDexListCheck -> y
-    boolean minimalMainDex -> z
+    com.android.tools.r8.graph.DexItemFactory factory -> C
+    java.lang.String synthesizedClassPrefix -> x
+    boolean skipDump -> y
+    boolean enableMainDexListCheck -> z
     com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> u
     com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> v
-    boolean skipDump -> x
+    boolean minimalMainDex -> A
+    com.android.tools.r8.com.google.common.collect.ImmutableList mainDexKeepRules -> B
     java.lang.String USAGE_MESSAGE -> r
-    com.android.tools.r8.com.google.common.collect.ImmutableList mainDexKeepRules -> A
     boolean $assertionsDisabled -> s
     com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration libraryConfiguration -> w
     boolean intermediate -> t
@@ -570,10 +571,10 @@
     3:26:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.InternalOptions$DesugarState,boolean,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration,java.util.List,java.util.List,java.lang.String,boolean,boolean,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList,int,com.android.tools.r8.graph.DexItemFactory):400:423 -> <init>
     27:37:void <init>(boolean,boolean):427:437 -> <init>
     1:1:com.android.tools.r8.D8Command$Builder builder(com.android.tools.r8.utils.AndroidApp):346:346 -> a
-    1:65:com.android.tools.r8.utils.InternalOptions getInternalOptions():442:506 -> b
-    66:71:com.android.tools.r8.DumpOptions dumpOptions():514:519 -> b
-    66:71:com.android.tools.r8.utils.InternalOptions getInternalOptions():508 -> b
-    72:72:com.android.tools.r8.utils.InternalOptions getInternalOptions():508:508 -> b
+    1:61:com.android.tools.r8.utils.InternalOptions getInternalOptions():442:502 -> b
+    62:67:com.android.tools.r8.DumpOptions dumpOptions():510:515 -> b
+    62:67:com.android.tools.r8.utils.InternalOptions getInternalOptions():504 -> b
+    68:68:com.android.tools.r8.utils.InternalOptions getInternalOptions():504:504 -> b
     1:1:com.android.tools.r8.D8Command$Builder builder():337:337 -> builder
     2:2:com.android.tools.r8.D8Command$Builder builder(com.android.tools.r8.DiagnosticsHandler):341:341 -> builder
     1:1:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):359:359 -> parse
@@ -756,21 +757,21 @@
     17:17:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):90 -> a
     18:18:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):97:97 -> a
     19:19:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):96:96 -> a
-    20:20: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
+    20:20: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):404:404 -> a
     20:20:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):99 -> a
-    21:21: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):380:380 -> 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 -> a
+    21:21: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):378:378 -> 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):404 -> 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.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
+    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):404:404 -> 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:42:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):101:120 -> a
-    43:43:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):221:221 -> a
+    43:43:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):210:210 -> a
     43:43:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):115 -> a
     44:49:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):115:120 -> a
-    50:50:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():650:650 -> a
+    50:50:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():632:632 -> a
     50:50:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):41 -> a
     51:51:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):41:41 -> a
-    52:52:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():650:650 -> a
+    52:52:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():632:632 -> a
     52:52:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):42 -> a
     53:70:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):42:59 -> a
     71:82:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):46:57 -> a
@@ -915,7 +916,7 @@
     10:71:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String,java.util.concurrent.ExecutorService):64:125 -> run
     72:81:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String,java.util.concurrent.ExecutorService):123:132 -> run
     82:84:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String,java.util.concurrent.ExecutorService):130:132 -> run
-    85:85:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):221:221 -> run
+    85:85:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):210:210 -> run
     85:85:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String,java.util.concurrent.ExecutorService):128 -> run
     86:90:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String,java.util.concurrent.ExecutorService):128:132 -> run
     1:3:void runD8ForTesting(com.android.tools.r8.D8Command,boolean):156:158 -> runD8ForTesting
@@ -1185,10 +1186,10 @@
     73:74:java.nio.file.Path getAndroidJarPath(com.android.tools.r8.utils.AndroidApiLevel):119:120 -> a
     73:74:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):221 -> a
     75:93:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):221:239 -> a
-    94:94:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DirectMappedDexApplication.programDefinitionFor(com.android.tools.r8.graph.DexType):84:84 -> a
+    94:94:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DirectMappedDexApplication.programDefinitionFor(com.android.tools.r8.graph.DexType):83:83 -> a
     94:94:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):239 -> a
     95:95:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):244:244 -> a
-    96:96:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():501:501 -> a
+    96:96:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():514:514 -> a
     96:96:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):245 -> a
     97:107:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):248:258 -> a
     108:161:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):241:294 -> a
@@ -1322,25 +1323,27 @@
     com.android.tools.r8.utils.Timing timing -> b
     com.android.tools.r8.utils.InternalOptions options -> c
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():38:38 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions):45:45 -> <init>
-    2:8:void <init>(com.android.tools.r8.utils.InternalOptions):40:46 -> <init>
-    1:17:java.util.List run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):52:68 -> a
-    18:18:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):221:221 -> a
-    18:18:java.util.List run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):70 -> a
-    19:19:java.util.List run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):70:70 -> a
-    20:27:void lambda$run$1(com.android.tools.r8.shaking.MainDexTracingResult):58:65 -> a
-    28:28:java.lang.String lambda$run$0(com.android.tools.r8.graph.DexType):59:59 -> a
+    1:1:void <clinit>():39:39 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions):46:46 -> <init>
+    2:8:void <init>(com.android.tools.r8.utils.InternalOptions):41:47 -> <init>
+    1:17:java.util.List run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):53:69 -> a
+    18:18:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):210:210 -> a
+    18:18:java.util.List run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):71 -> a
+    19:19:java.util.List run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):71:71 -> a
+    20:27:void lambda$run$1(com.android.tools.r8.shaking.MainDexTracingResult):59:66 -> a
+    28:28:java.lang.String lambda$run$0(com.android.tools.r8.graph.DexType):60:60 -> a
     29:33:java.lang.Iterable lambda$traceMainDex$3(com.android.tools.r8.shaking.MainDexTracingResult,com.android.tools.r8.graph.AppView):108:112 -> a
-    34:36:void lambda$traceMainDex$2(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):114:116 -> a
-    37:39:void lambda$run$4(com.android.tools.r8.utils.Box,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):173:175 -> a
+    34:36:void lambda$run$4(com.android.tools.r8.utils.Box,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):173:175 -> a
+    37:37:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    37:37:void lambda$traceMainDex$2(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):114 -> a
+    38:39:void lambda$traceMainDex$2(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):115:116 -> a
     1:13:void main(java.lang.String[]):182:194 -> main
     1:5:java.util.List run(com.android.tools.r8.GenerateMainDexListCommand):143:147 -> run
     6:10:java.util.List run(com.android.tools.r8.GenerateMainDexListCommand,java.util.concurrent.ExecutorService):166:170 -> run
-    11:11:void com.android.tools.r8.utils.ExceptionUtils.withMainDexListHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):74:74 -> run
+    11:11:void com.android.tools.r8.utils.ExceptionUtils.withMainDexListHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):63:63 -> run
     11:11:java.util.List run(com.android.tools.r8.GenerateMainDexListCommand,java.util.concurrent.ExecutorService):169 -> run
     12:12:java.util.List run(com.android.tools.r8.GenerateMainDexListCommand,java.util.concurrent.ExecutorService):178:178 -> run
-    1:26:void traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,java.util.function.Consumer):80:105 -> traceMainDex
+    1:25:void traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,java.util.function.Consumer):81:105 -> traceMainDex
 com.android.tools.r8.GenerateMainDexListCommand -> com.android.tools.r8.GenerateMainDexListCommand:
     com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> h
     java.util.List mainDexKeepRules -> f
@@ -1423,44 +1426,44 @@
     1:1:void <clinit>():39:39 -> <clinit>
     1:1:void <init>():40:40 -> <init>
     1:2:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,boolean,com.android.tools.r8.D8Command,com.android.tools.r8.R8Command):80:81 -> a
-    3:28:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,boolean,com.android.tools.r8.D8Command,com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):93:118 -> a
-    29:33:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):99:103 -> a
-    34:49:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):124:139 -> a
-    34:49:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):105 -> a
-    50:50:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):375:375 -> a
-    50:50:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):139 -> a
-    50:50:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):105 -> a
-    51:59:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):139:147 -> a
-    51:59:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):105 -> a
-    60:60:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():459:459 -> a
-    60:60:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):148 -> a
-    60:60:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):105 -> a
-    61:69:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):148:156 -> a
-    61:69:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):105 -> a
-    70:72:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):107:109 -> a
-    73:73:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):221:221 -> a
-    73:73:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):151 -> a
-    73:73:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):105 -> a
-    74:79:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):151:156 -> a
-    74:79:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):105 -> a
-    80:87:com.android.tools.r8.graph.AppView readApp(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):164:171 -> a
-    88:89:void run(java.lang.String[]):175:176 -> a
-    88:89:void lambda$main$1(java.lang.String[]):197 -> a
-    90:90:void com.android.tools.r8.utils.SelfRetraceTest.test():25:25 -> a
-    90:90:void run(java.lang.String[]):177 -> a
-    90:90:void lambda$main$1(java.lang.String[]):197 -> a
-    91:91:void run(java.lang.String[]):178:178 -> a
-    91:91:void lambda$main$1(java.lang.String[]):197 -> a
-    92:92:void com.android.tools.r8.utils.SelfRetraceTest.foo3():13:13 -> a
-    92:92:void com.android.tools.r8.utils.SelfRetraceTest.foo2():17 -> a
-    92:92:void com.android.tools.r8.utils.SelfRetraceTest.foo1():21 -> a
-    92:92:void com.android.tools.r8.utils.SelfRetraceTest.test():26 -> a
-    92:92:void run(java.lang.String[]):177 -> a
-    92:92:void lambda$main$1(java.lang.String[]):197 -> a
-    93:97:void run(java.lang.String[]):181:185 -> a
-    93:97:void lambda$main$1(java.lang.String[]):197 -> a
-    1:4:void main(java.lang.String[]):194:197 -> main
-    5:5:void main(java.lang.String[]):195:195 -> main
+    3:18:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,boolean,com.android.tools.r8.D8Command,com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):93:108 -> a
+    19:19:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):97:97 -> a
+    20:35:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):114:129 -> a
+    20:35:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):98 -> a
+    36:36:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):373:373 -> a
+    36:36:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):129 -> a
+    36:36:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):98 -> a
+    37:50:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):129:142 -> a
+    37:50:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):98 -> a
+    51:51:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():466:466 -> a
+    51:51:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):143 -> a
+    51:51:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):98 -> a
+    52:60:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):143:151 -> a
+    52:60:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):98 -> a
+    61:61:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):99:99 -> a
+    62:62:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):210:210 -> a
+    62:62:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):146 -> a
+    62:62:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):98 -> a
+    63:68:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):146:151 -> a
+    63:68:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):98 -> a
+    69:76:com.android.tools.r8.graph.AppView readApp(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):159:166 -> a
+    77:78:void run(java.lang.String[]):170:171 -> a
+    77:78:void lambda$main$1(java.lang.String[]):192 -> a
+    79:79:void com.android.tools.r8.utils.SelfRetraceTest.test():25:25 -> a
+    79:79:void run(java.lang.String[]):172 -> a
+    79:79:void lambda$main$1(java.lang.String[]):192 -> a
+    80:80:void run(java.lang.String[]):173:173 -> a
+    80:80:void lambda$main$1(java.lang.String[]):192 -> a
+    81:81:void com.android.tools.r8.utils.SelfRetraceTest.foo3():13:13 -> a
+    81:81:void com.android.tools.r8.utils.SelfRetraceTest.foo2():17 -> a
+    81:81:void com.android.tools.r8.utils.SelfRetraceTest.foo1():21 -> a
+    81:81:void com.android.tools.r8.utils.SelfRetraceTest.test():26 -> a
+    81:81:void run(java.lang.String[]):172 -> a
+    81:81:void lambda$main$1(java.lang.String[]):192 -> a
+    82:86:void run(java.lang.String[]):176:180 -> a
+    82:86:void lambda$main$1(java.lang.String[]):192 -> a
+    1:4:void main(java.lang.String[]):189:192 -> main
+    5:5:void main(java.lang.String[]):190:190 -> main
     1:5:void run(com.android.tools.r8.L8Command):49:53 -> run
     6:6:void run(com.android.tools.r8.L8Command):48:48 -> run
     7:11:void run(com.android.tools.r8.L8Command,java.util.concurrent.ExecutorService):65:69 -> run
@@ -1477,10 +1480,10 @@
     2:2:void <init>(boolean,boolean,com.android.tools.r8.L8Command$1):34:34 -> <init>
     3:20:void <init>(com.android.tools.r8.R8Command,com.android.tools.r8.D8Command,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,boolean,java.util.function.BiPredicate,com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration,java.util.List,java.util.List,int,com.android.tools.r8.graph.DexItemFactory):98:115 -> <init>
     21:25:void <init>(boolean,boolean):119:123 -> <init>
-    1:46:com.android.tools.r8.utils.InternalOptions getInternalOptions():152:197 -> b
-    47:49:com.android.tools.r8.DumpOptions dumpOptions():389:391 -> b
-    47:49:com.android.tools.r8.utils.InternalOptions getInternalOptions():199 -> b
-    50:50:com.android.tools.r8.utils.InternalOptions getInternalOptions():199:199 -> b
+    1:47:com.android.tools.r8.utils.InternalOptions getInternalOptions():152:198 -> b
+    48:50:com.android.tools.r8.DumpOptions dumpOptions():390:392 -> b
+    48:50:com.android.tools.r8.utils.InternalOptions getInternalOptions():200 -> b
+    51:51:com.android.tools.r8.utils.InternalOptions getInternalOptions():200:200 -> b
     1:1:com.android.tools.r8.L8Command$Builder builder():143:143 -> builder
     2:2:com.android.tools.r8.L8Command$Builder builder(com.android.tools.r8.DiagnosticsHandler):147:147 -> builder
     1:1:com.android.tools.r8.D8Command getD8Command():48:48 -> e
@@ -1493,45 +1496,45 @@
     java.util.List proguardConfigStrings -> v
     boolean $assertionsDisabled -> u
     java.util.List proguardConfigFiles -> w
-    1:1:void <clinit>():209:209 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.L8Command$1):210:210 -> <init>
-    2:2:void <init>(com.android.tools.r8.L8Command$1):210:210 -> <init>
-    3:3:void <init>():216:216 -> <init>
-    4:4:void <init>(com.android.tools.r8.DiagnosticsHandler):220:220 -> <init>
-    5:6:void <init>(com.android.tools.r8.DiagnosticsHandler):212:213 -> <init>
-    1:1:com.android.tools.r8.L8Command$Builder addProguardConfiguration(java.util.List,com.android.tools.r8.origin.Origin):252:252 -> addProguardConfiguration
-    1:1:com.android.tools.r8.L8Command$Builder addProguardConfigurationFiles(java.nio.file.Path[]):240:240 -> addProguardConfigurationFiles
-    2:2:com.android.tools.r8.L8Command$Builder addProguardConfigurationFiles(java.util.List):246:246 -> addProguardConfigurationFiles
-    1:5:com.android.tools.r8.L8Command makeCommand():281:285 -> c
-    1:5:com.android.tools.r8.BaseCommand makeCommand():209 -> c
-    6:6:com.android.tools.r8.CompilationMode defaultCompilationMode():235:235 -> c
-    6:6:com.android.tools.r8.L8Command makeCommand():286 -> c
-    6:6:com.android.tools.r8.BaseCommand makeCommand():209 -> c
-    7:25:com.android.tools.r8.L8Command makeCommand():286:304 -> c
-    7:25:com.android.tools.r8.BaseCommand makeCommand():209 -> c
-    26:41:com.android.tools.r8.L8Command makeCommand():303:318 -> c
-    26:41:com.android.tools.r8.BaseCommand makeCommand():209 -> c
-    42:54:com.android.tools.r8.L8Command makeCommand():317:329 -> c
-    42:54:com.android.tools.r8.BaseCommand makeCommand():209 -> c
-    55:88:com.android.tools.r8.L8Command makeCommand():328:361 -> c
-    55:88:com.android.tools.r8.BaseCommand makeCommand():209 -> c
-    89:89:com.android.tools.r8.L8Command makeCommand():282:282 -> c
-    89:89:com.android.tools.r8.BaseCommand makeCommand():209 -> c
+    1:1:void <clinit>():210:210 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.L8Command$1):211:211 -> <init>
+    2:2:void <init>(com.android.tools.r8.L8Command$1):211:211 -> <init>
+    3:3:void <init>():217:217 -> <init>
+    4:4:void <init>(com.android.tools.r8.DiagnosticsHandler):221:221 -> <init>
+    5:6:void <init>(com.android.tools.r8.DiagnosticsHandler):213:214 -> <init>
+    1:1:com.android.tools.r8.L8Command$Builder addProguardConfiguration(java.util.List,com.android.tools.r8.origin.Origin):253:253 -> addProguardConfiguration
+    1:1:com.android.tools.r8.L8Command$Builder addProguardConfigurationFiles(java.nio.file.Path[]):241:241 -> addProguardConfigurationFiles
+    2:2:com.android.tools.r8.L8Command$Builder addProguardConfigurationFiles(java.util.List):247:247 -> addProguardConfigurationFiles
+    1:5:com.android.tools.r8.L8Command makeCommand():282:286 -> c
+    1:5:com.android.tools.r8.BaseCommand makeCommand():210 -> c
+    6:6:com.android.tools.r8.CompilationMode defaultCompilationMode():236:236 -> c
+    6:6:com.android.tools.r8.L8Command makeCommand():287 -> c
+    6:6:com.android.tools.r8.BaseCommand makeCommand():210 -> c
+    7:25:com.android.tools.r8.L8Command makeCommand():287:305 -> c
+    7:25:com.android.tools.r8.BaseCommand makeCommand():210 -> c
+    26:41:com.android.tools.r8.L8Command makeCommand():304:319 -> c
+    26:41:com.android.tools.r8.BaseCommand makeCommand():210 -> c
+    42:54:com.android.tools.r8.L8Command makeCommand():318:330 -> c
+    42:54:com.android.tools.r8.BaseCommand makeCommand():210 -> c
+    55:88:com.android.tools.r8.L8Command makeCommand():329:362 -> c
+    55:88:com.android.tools.r8.BaseCommand makeCommand():210 -> c
+    89:89:com.android.tools.r8.L8Command makeCommand():283:283 -> c
+    89:89:com.android.tools.r8.BaseCommand makeCommand():210 -> c
     com.android.tools.r8.BaseCommand$Builder self() -> d
-    1:19:void validate():258:276 -> e
-    1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():235:235 -> f
-    1:1:boolean isShrinking():225:225 -> isShrinking
+    1:19:void validate():259:277 -> e
+    1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():236:236 -> f
+    1:1:boolean isShrinking():226:226 -> isShrinking
 com.android.tools.r8.L8Command$DefaultL8DiagnosticsHandler -> com.android.tools.r8.L8Command$b:
     1:1:void <init>():126:126 -> <init>
     1:5:void error(com.android.tools.r8.Diagnostic):130:134 -> error
     6:12:void error(com.android.tools.r8.Diagnostic):132:138 -> error
 com.android.tools.r8.L8Command$InMemoryJarContent -> com.android.tools.r8.L8Command$c:
     java.util.List resources -> a
-    1:3:void <init>():366:368 -> <init>
-    1:3:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):374:376 -> accept
-    4:4:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):375:375 -> accept
-    5:5:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):374:374 -> accept
-    1:1:java.util.Collection getProgramResources():381:381 -> getProgramResources
+    1:3:void <init>():367:369 -> <init>
+    1:3:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):375:377 -> accept
+    4:4:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):376:376 -> accept
+    5:5:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):375:375 -> accept
+    1:1:java.util.Collection getProgramResources():382:382 -> getProgramResources
 com.android.tools.r8.L8CommandParser -> com.android.tools.r8.j:
     java.lang.String USAGE_MESSAGE -> g
     java.util.Set OPTIONS_WITH_PARAMETER -> f
@@ -1597,115 +1600,119 @@
     com.android.tools.r8.utils.Timing timing -> b
     com.android.tools.r8.utils.InternalOptions options -> c
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():165:165 -> <clinit>
-    1:6:void <init>(com.android.tools.r8.utils.InternalOptions):171:176 -> <init>
+    1:1:void <clinit>():170:170 -> <clinit>
+    1:6:void <init>(com.android.tools.r8.utils.InternalOptions):176:181 -> <init>
     boolean lambda$run$2(com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.graph.DexApplication lambda$run$4(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):209:209 -> a
-    2: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):222:231 -> a
-    12:12:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():459:459 -> 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):232 -> 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):232:245 -> a
-    27:28:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):251:252 -> a
-    29:29:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):69:69 -> a
-    29:29:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):252 -> a
-    30:30:com.android.tools.r8.graph.DirectMappedDexApplication getDirectApp(com.android.tools.r8.graph.AppView):269:269 -> a
-    31:72:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):273:314 -> a
-    73:90:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):313:330 -> a
-    91:91:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):327:327 -> a
-    92:104:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):324:336 -> a
-    105:109:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):335:339 -> a
-    110:110:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):338:338 -> a
-    111:122:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):337:348 -> a
-    123:123:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):347:347 -> a
-    124:129:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):344:349 -> a
-    130:161:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):343:374 -> a
-    162:183:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):373:394 -> a
-    184:248:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):389:453 -> a
-    249:338:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):450:539 -> a
-    339:350:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):538:549 -> a
-    351:482:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):544:675 -> a
-    483:483:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):674:674 -> a
-    484:502:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):673:691 -> a
-    503:521:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):689:707 -> a
-    522:538:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):702:718 -> a
-    539:585:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):717:763 -> a
-    586:641:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):744:799 -> a
-    642:666:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):798:822 -> a
-    667:757:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):821:911 -> a
-    758:772:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):859:873 -> a
-    773:803:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):870:900 -> a
-    804:822:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):893:911 -> a
-    823:823:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):579:579 -> a
-    824:1321:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):414:911 -> a
-    1322:1322:void lambda$run$3(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):382:382 -> a
-    1323:1327:java.lang.Iterable lambda$run$6(com.android.tools.r8.shaking.MainDexTracingResult,com.android.tools.r8.graph.AppView):632:636 -> a
-    1328:1330:void lambda$run$5(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):638:640 -> a
-    1331:1331:void lambda$run$7(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):682:682 -> a
-    1332:1332:com.android.tools.r8.shaking.TreePrunerConfiguration lambda$run$8(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):690:690 -> a
-    1333:1333:void lambda$run$10(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):758:758 -> a
-    1334:1334:void lambda$run$11(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):765:765 -> a
-    1335:1335:void lambda$run$12(java.lang.String):854:854 -> a
-    1336:1336:boolean lambda$run$13(com.android.tools.r8.graph.DexProgramClass):860:860 -> a
-    1337:1338:boolean verifyMovedMethodsHaveOriginalMethodPosition(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication):919:920 -> a
-    1339:1339:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$15(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):922:922 -> a
-    1340:1351:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$14(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):925:936 -> a
-    1352:1353:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):948:949 -> a
-    1352:1353:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$14(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):936 -> a
-    1354:1354:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
-    1354:1354:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):949 -> a
-    1354:1354:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$14(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):936 -> a
-    1355:1356:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):952:953 -> a
-    1355:1356:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$14(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):936 -> a
-    1357:1358:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$14(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):938:939 -> a
-    1359:1363:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):959:963 -> a
-    1359:1363:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$14(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):939 -> a
-    1364:1364:boolean com.android.tools.r8.graph.DexDebugEvent.isSetInlineFrame():0:0 -> a
-    1364:1364:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):963 -> a
-    1364:1364:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$14(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):939 -> a
-    1365:1365:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):963:963 -> a
-    1365:1365:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$14(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):939 -> a
-    1366:1374: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):976:984 -> a
-    1375:1380: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):982:987 -> a
-    1381:1383:void com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder.attach(com.android.tools.r8.shaking.Enqueuer):74:76 -> a
-    1381:1383: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):988 -> a
-    1384:1384: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):994:994 -> a
-    1385:1385: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):993:993 -> a
-    1386:1400: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):992:1006 -> a
-    1401:1401:void lambda$runEnqueuer$16(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoShrinker):1004:1004 -> a
-    1402:1404:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetUtils$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):1025:1027 -> a
-    1405:1443:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetUtils$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):1026:1064 -> a
-    1444:1448:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetUtils$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:1065 -> a
-    1449:1452:boolean verifyNoJarApplicationReaders(java.util.Collection):1069:1072 -> a
-    1453:1453:void lambda$run$18(com.android.tools.r8.R8Command,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):1094:1094 -> a
-    1454:1454:void lambda$main$19(java.lang.String[]):1109:1109 -> a
-    1:3:void lambda$runForTesting$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):256:258 -> b
-    4:4:java.lang.Iterable lambda$run$9(com.android.tools.r8.graph.AppView):719:719 -> b
-    5:5:void lambda$runEnqueuer$17(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):1008:1008 -> b
-    6:7:void run(java.lang.String[]):1080:1081 -> b
+    1:1:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):214:214 -> a
+    2: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):227:236 -> a
+    12:12:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():466:466 -> 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):237 -> 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):237:250 -> a
+    27:28:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):256:257 -> a
+    29:29:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):58:58 -> a
+    29:29:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):257 -> a
+    30:30:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    30:30:void lambda$run$5(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):666 -> a
+    31:32:void lambda$run$5(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):667:668 -> a
+    33:33:com.android.tools.r8.graph.DirectMappedDexApplication getDirectApp(com.android.tools.r8.graph.AppView):274:274 -> a
+    34:75:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):278:319 -> a
+    76:93:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):318:335 -> a
+    94:94:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):332:332 -> a
+    95:107:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):329:341 -> a
+    108:112:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):340:344 -> a
+    113:113:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):343:343 -> a
+    114:125:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):342:353 -> a
+    126:128:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):352:354 -> a
+    129:160:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):348:379 -> a
+    161:182:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):378:399 -> a
+    183:246:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):394:457 -> a
+    247:364:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):454:571 -> a
+    365:376:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):570:581 -> a
+    377:504:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):576:703 -> a
+    505:505:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):701:701 -> a
+    506:525:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):700:719 -> a
+    526:544:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):717:735 -> a
+    545:561:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):730:746 -> a
+    562:608:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):745:791 -> a
+    609:664:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):772:827 -> a
+    665:681:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):826:842 -> a
+    682:695:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):841:854 -> a
+    696:784:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):853:941 -> a
+    785:799:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):891:905 -> a
+    800:830:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):902:932 -> a
+    831:847:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):925:941 -> a
+    848:848:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):611:611 -> a
+    849:1371:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):419:941 -> a
+    1372:1372:void lambda$run$3(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):387:387 -> a
+    1373:1377:java.lang.Iterable lambda$run$6(com.android.tools.r8.shaking.MainDexTracingResult,com.android.tools.r8.graph.AppView):660:664 -> a
+    1378:1378:void lambda$run$7(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):710:710 -> a
+    1379:1379:com.android.tools.r8.shaking.TreePrunerConfiguration lambda$run$8(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):718:718 -> a
+    1380:1380:void lambda$run$10(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):786:786 -> a
+    1381:1381:void lambda$run$11(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):793:793 -> a
+    1382:1382:void lambda$run$12(java.lang.String):886:886 -> a
+    1383:1383:boolean lambda$run$13(com.android.tools.r8.graph.DexProgramClass):892:892 -> a
+    1384:1385:boolean verifyMovedMethodsHaveOriginalMethodPosition(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication):949:950 -> a
+    1386:1386:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$15(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):952:952 -> a
+    1387:1398:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$14(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):955:966 -> a
+    1399:1400:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):978:979 -> a
+    1399:1400:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$14(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):966 -> a
+    1401:1401:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
+    1401:1401:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):979 -> a
+    1401:1401:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$14(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):966 -> a
+    1402:1403:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):982:983 -> a
+    1402:1403:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$14(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):966 -> a
+    1404:1405:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$14(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):968:969 -> a
+    1406:1410:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):989:993 -> a
+    1406:1410:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$14(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):969 -> a
+    1411:1411:boolean com.android.tools.r8.graph.DexDebugEvent.isSetInlineFrame():0:0 -> a
+    1411:1411:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):993 -> a
+    1411:1411:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$14(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):969 -> a
+    1412:1412:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):993:993 -> a
+    1412:1412:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$14(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):969 -> a
+    1413:1421: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):1005:1013 -> a
+    1422:1427: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):1011:1016 -> a
+    1428:1430:void com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder.attach(com.android.tools.r8.shaking.Enqueuer):74:76 -> a
+    1428:1430: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):1017 -> a
+    1431:1432: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):1023:1024 -> a
+    1433: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):1022:1022 -> a
+    1434:1449: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:1036 -> a
+    1450:1450:void lambda$runEnqueuer$16(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoShrinker):1034:1034 -> a
+    1451:1453: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):1055:1057 -> a
+    1454: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):1056:1083 -> a
+    1482:1492: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):1081:1091 -> a
+    1493:1497: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):1088:1092 -> a
+    1498:1501:boolean verifyNoJarApplicationReaders(java.util.Collection):1096:1099 -> a
+    1502:1502:void lambda$run$18(com.android.tools.r8.R8Command,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):1121:1121 -> a
+    1503:1503:void lambda$main$19(java.lang.String[]):1136:1136 -> a
+    1:3:void lambda$runForTesting$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):261:263 -> b
+    4:4:java.lang.Iterable lambda$run$9(com.android.tools.r8.graph.AppView):747:747 -> b
+    5:5:void lambda$runEnqueuer$17(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):1038:1038 -> b
+    6:7:void run(java.lang.String[]):1107:1108 -> b
     8:8:void com.android.tools.r8.utils.SelfRetraceTest.test():25:25 -> b
-    8:8:void run(java.lang.String[]):1082 -> b
-    9:9:void run(java.lang.String[]):1083:1083 -> b
+    8:8:void run(java.lang.String[]):1109 -> b
+    9:9:void run(java.lang.String[]):1110:1110 -> 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[]):1082 -> b
-    11:18:void run(java.lang.String[]):1086:1093 -> b
-    19:19:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):69:69 -> b
-    19:19:void run(java.lang.String[]):1093 -> b
-    20:20:void run(java.lang.String[]):1096:1096 -> b
-    1:1:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):265:265 -> c
-    1:4:void main(java.lang.String[]):1106:1109 -> main
-    5:5:void main(java.lang.String[]):1107:1107 -> main
-    1:3:void run(com.android.tools.r8.R8Command):188:190 -> run
-    4:7:void run(com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):204:207 -> run
-    8:8:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):69:69 -> run
-    8:8:void run(com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):206 -> run
+    10:10:void run(java.lang.String[]):1109 -> b
+    11:18:void run(java.lang.String[]):1113:1120 -> b
+    19:19:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):58:58 -> b
+    19:19:void run(java.lang.String[]):1120 -> b
+    20:20:void run(java.lang.String[]):1123:1123 -> b
+    1:1:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):270:270 -> c
+    1:4:void main(java.lang.String[]):1133:1136 -> main
+    5:5:void main(java.lang.String[]):1134:1134 -> main
+    1:3:void run(com.android.tools.r8.R8Command):193:195 -> run
+    4:7:void run(com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):209:212 -> run
+    8:8:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):58:58 -> run
+    8:8:void run(com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):211 -> run
 com.android.tools.r8.R8Command -> com.android.tools.r8.R8Command:
     com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> F
+    java.lang.String synthesizedClassPrefix -> K
     java.util.List mainDexKeepRules -> t
-    boolean skipDump -> K
+    boolean skipDump -> L
     boolean enableTreeShaking -> v
     boolean enableMinification -> w
     boolean disableVerticalClassMerging -> x
@@ -1730,28 +1737,28 @@
     38:57:void <init>(boolean,boolean):794:813 -> <init>
     1:1:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.utils.AndroidApp):688:688 -> a
     2:2:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):693:693 -> a
-    3:5:com.android.tools.r8.StringConsumer wrapStringConsumer(com.android.tools.r8.StringConsumer,boolean,java.nio.file.Path):980:982 -> a
+    3:5:com.android.tools.r8.StringConsumer wrapStringConsumer(com.android.tools.r8.StringConsumer,boolean,java.nio.file.Path):983:985 -> a
     1:33:com.android.tools.r8.utils.InternalOptions getInternalOptions():828:860 -> b
-    34:44:com.android.tools.r8.utils.InternalOptions getInternalOptions():859:869 -> b
-    45:45:void com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.disable():1148:1148 -> b
-    45:45:com.android.tools.r8.utils.InternalOptions getInternalOptions():869 -> b
-    46:56:com.android.tools.r8.utils.InternalOptions getInternalOptions():870:880 -> b
-    57:57:void com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.disable():1148:1148 -> b
-    57:57:com.android.tools.r8.utils.InternalOptions getInternalOptions():880 -> b
-    58:65:com.android.tools.r8.utils.InternalOptions getInternalOptions():881:888 -> b
-    66:66:void com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.disable():1148:1148 -> b
-    66:66:com.android.tools.r8.utils.InternalOptions getInternalOptions():888 -> b
-    67:71:com.android.tools.r8.utils.InternalOptions getInternalOptions():892:896 -> b
-    72:82:com.android.tools.r8.utils.InternalOptions getInternalOptions():893:903 -> b
-    83:93:com.android.tools.r8.utils.InternalOptions getInternalOptions():900:910 -> b
-    94:104:com.android.tools.r8.utils.InternalOptions getInternalOptions():907:917 -> b
-    105:137:com.android.tools.r8.utils.InternalOptions getInternalOptions():914:946 -> b
-    138:138:void com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.disable():1148:1148 -> b
-    138:138:com.android.tools.r8.utils.InternalOptions getInternalOptions():946 -> b
-    139:158:com.android.tools.r8.utils.InternalOptions getInternalOptions():950:969 -> b
-    159:169:com.android.tools.r8.DumpOptions dumpOptions():1002:1012 -> b
-    159:169:com.android.tools.r8.utils.InternalOptions getInternalOptions():971 -> b
-    170:170:com.android.tools.r8.utils.InternalOptions getInternalOptions():971:971 -> b
+    34:45:com.android.tools.r8.utils.InternalOptions getInternalOptions():859:870 -> b
+    46:46:void com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.disable():1290:1290 -> b
+    46:46:com.android.tools.r8.utils.InternalOptions getInternalOptions():870 -> b
+    47:58:com.android.tools.r8.utils.InternalOptions getInternalOptions():871:882 -> b
+    59:59:void com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.disable():1290:1290 -> b
+    59:59:com.android.tools.r8.utils.InternalOptions getInternalOptions():882 -> b
+    60:68:com.android.tools.r8.utils.InternalOptions getInternalOptions():883:891 -> b
+    69:69:void com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.disable():1290:1290 -> b
+    69:69:com.android.tools.r8.utils.InternalOptions getInternalOptions():891 -> b
+    70:74:com.android.tools.r8.utils.InternalOptions getInternalOptions():895:899 -> b
+    75:85:com.android.tools.r8.utils.InternalOptions getInternalOptions():896:906 -> b
+    86:96:com.android.tools.r8.utils.InternalOptions getInternalOptions():903:913 -> b
+    97:107:com.android.tools.r8.utils.InternalOptions getInternalOptions():910:920 -> b
+    108:140:com.android.tools.r8.utils.InternalOptions getInternalOptions():917:949 -> b
+    141:141:void com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.disable():1290:1290 -> b
+    141:141:com.android.tools.r8.utils.InternalOptions getInternalOptions():949 -> b
+    142:161:com.android.tools.r8.utils.InternalOptions getInternalOptions():953:972 -> b
+    162:172:com.android.tools.r8.DumpOptions dumpOptions():1005:1015 -> b
+    162:172:com.android.tools.r8.utils.InternalOptions getInternalOptions():974 -> b
+    173:173:com.android.tools.r8.utils.InternalOptions getInternalOptions():974:974 -> b
     1:1:com.android.tools.r8.R8Command$Builder builder():678:678 -> builder
     2:2:void com.android.tools.r8.R8Command$Builder.<init>():122:122 -> builder
     2:2:com.android.tools.r8.R8Command$Builder builder():678 -> builder
@@ -1831,7 +1838,7 @@
     1:4:com.android.tools.r8.R8Command makeCommand():467:470 -> p
     5:5:com.android.tools.r8.R8Command makeCommand():468:468 -> p
     1:16:com.android.tools.r8.R8Command makeR8Command():474:489 -> q
-    17:17:boolean com.android.tools.r8.utils.InternalOptions.shouldEnableKeepRuleSynthesisForRecompilation():658:658 -> q
+    17:17:boolean com.android.tools.r8.utils.InternalOptions.shouldEnableKeepRuleSynthesisForRecompilation():668:668 -> q
     17:17:com.android.tools.r8.R8Command makeR8Command():489 -> q
     18:79:com.android.tools.r8.R8Command makeR8Command():490:551 -> q
     80:80:com.android.tools.r8.utils.InternalOptions$DesugarState com.android.tools.r8.BaseCompilerCommand$Builder.getDesugaringState():478:478 -> q
@@ -1877,8 +1884,8 @@
     1:1:com.android.tools.r8.DataResourceProvider getDataResourceProvider():650:650 -> getDataResourceProvider
     1:4:java.util.Collection getProgramResources():638:641 -> getProgramResources
 com.android.tools.r8.R8Command$StandardOutConsumer -> com.android.tools.r8.R8Command$c:
-    1:1:void <init>(com.android.tools.r8.StringConsumer):991:991 -> <init>
-    1:2:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):996:997 -> accept
+    1:1:void <init>(com.android.tools.r8.StringConsumer):994:994 -> <init>
+    1:2:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):999:1000 -> accept
 com.android.tools.r8.R8CommandParser -> com.android.tools.r8.m:
     java.util.Set OPTIONS_WITH_TWO_PARAMETERS -> g
     java.lang.String USAGE_MESSAGE -> h
@@ -2087,14 +2094,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.AD:
+com.android.tools.r8.StringResource -> com.android.tools.r8.internal.oC:
     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.AD$a:
-com.android.tools.r8.StringResource$FileResource -> com.android.tools.r8.internal.AD$b:
+com.android.tools.r8.StringResource$1 -> com.android.tools.r8.internal.oC$a:
+com.android.tools.r8.StringResource$FileResource -> com.android.tools.r8.internal.oC$b:
     java.nio.charset.Charset charset -> c
     java.nio.file.Path file -> b
     com.android.tools.r8.origin.Origin origin -> d
@@ -2104,7 +2111,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.AD$c:
+com.android.tools.r8.StringResource$StringContentResource -> com.android.tools.r8.internal.oC$c:
     com.android.tools.r8.origin.Origin origin -> b
     boolean $assertionsDisabled -> a
     java.lang.String content -> c
@@ -2125,7 +2132,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.nB:
+com.android.tools.r8.algorithms.scc.SCC -> com.android.tools.r8.internal.Zz:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap discoverTime -> c
     java.util.Set unassignedSet -> d
     java.util.function.Function successors -> h
@@ -2139,7 +2146,7 @@
     2:12:void <init>(java.util.function.Function):19:29 -> <init>
     1:3:java.util.List computeSCC(java.lang.Object):33:35 -> a
     1:33:void dfs(java.lang.Object):39:71 -> b
-com.android.tools.r8.androidapi.AvailableApiExceptions -> com.android.tools.r8.internal.V1:
+com.android.tools.r8.androidapi.AvailableApiExceptions -> com.android.tools.r8.internal.Q1:
     java.util.Set exceptions -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():24:24 -> <clinit>
@@ -2149,20 +2156,20 @@
     261:321:java.util.Set build(com.android.tools.r8.graph.DexItemFactory,int):296:356 -> a
     322:366:java.util.Set build(com.android.tools.r8.graph.DexItemFactory,int):355:399 -> a
     367:370:java.util.Set build(com.android.tools.r8.graph.DexItemFactory,int):398:401 -> a
-com.android.tools.r8.bisect.Bisect -> com.android.tools.r8.internal.C2:
+com.android.tools.r8.bisect.Bisect -> com.android.tools.r8.internal.x2:
     1:4:com.android.tools.r8.graph.DexProgramClass run(com.android.tools.r8.bisect.BisectState,com.android.tools.r8.bisect.Bisect$Command,java.nio.file.Path,java.util.concurrent.ExecutorService):80:83 -> a
     5:23:void com.android.tools.r8.bisect.Bisect.writeApp(com.android.tools.r8.graph.DexApplication,java.nio.file.Path,java.util.concurrent.ExecutorService):186:204 -> a
     5:23:com.android.tools.r8.graph.DexProgramClass run(com.android.tools.r8.bisect.BisectState,com.android.tools.r8.bisect.Bisect$Command,java.nio.file.Path,java.util.concurrent.ExecutorService):86 -> a
     24:30:com.android.tools.r8.graph.DexProgramClass run(com.android.tools.r8.bisect.BisectState,com.android.tools.r8.bisect.Bisect$Command,java.nio.file.Path,java.util.concurrent.ExecutorService):87:93 -> a
-com.android.tools.r8.bisect.Bisect$Command -> com.android.tools.r8.internal.C2$a:
+com.android.tools.r8.bisect.Bisect$Command -> com.android.tools.r8.internal.x2$a:
     com.android.tools.r8.bisect.BisectOptions$Result apply(com.android.tools.r8.graph.DexApplication) -> a
-com.android.tools.r8.bisect.BisectOptions$Result -> com.android.tools.r8.internal.D2:
+com.android.tools.r8.bisect.BisectOptions$Result -> com.android.tools.r8.internal.y2:
     com.android.tools.r8.bisect.BisectOptions$Result UNKNOWN -> a
     com.android.tools.r8.bisect.BisectOptions$Result GOOD -> b
     com.android.tools.r8.bisect.BisectOptions$Result BAD -> c
     1:1:void <clinit>():33:33 -> <clinit>
     1:1:void <init>(java.lang.String,int):33:33 -> <init>
-com.android.tools.r8.bisect.BisectState -> com.android.tools.r8.internal.E2:
+com.android.tools.r8.bisect.BisectState -> com.android.tools.r8.internal.z2:
     com.android.tools.r8.bisect.BisectState$Range nextRange -> h
     java.util.List sortedGoodClasses -> d
     java.nio.file.Path stateFile -> f
@@ -2239,7 +2246,7 @@
     8:10:void write():315 -> d
     11:16:void write():316:321 -> d
     17:27:void write():311:321 -> d
-com.android.tools.r8.bisect.BisectState$Range -> com.android.tools.r8.internal.E2$a:
+com.android.tools.r8.bisect.BisectState$Range -> com.android.tools.r8.internal.z2$a:
     boolean $assertionsDisabled -> a
     int start -> b
     int end -> c
@@ -2253,14 +2260,14 @@
     1:5:boolean equals(java.lang.Object):99:103 -> equals
     1:1:int hashCode():108:108 -> hashCode
     1:1:java.lang.String toString():94:94 -> toString
-com.android.tools.r8.bisect.BisectState$Run -> com.android.tools.r8.internal.E2$b:
+com.android.tools.r8.bisect.BisectState$Run -> com.android.tools.r8.internal.z2$b:
     boolean $assertionsDisabled -> a
     boolean good -> b
     com.android.tools.r8.bisect.BisectState$Range range -> c
     1:1:void <clinit>():116:116 -> <clinit>
     1:4:void <init>(com.android.tools.r8.bisect.BisectOptions$Result,com.android.tools.r8.bisect.BisectState$Range):120:123 -> <init>
     5:9:void <init>(java.lang.String):126:130 -> <init>
-com.android.tools.r8.cf.CfCodePrinter -> com.android.tools.r8.internal.S3:
+com.android.tools.r8.cf.CfCodePrinter -> com.android.tools.r8.internal.F3:
     java.util.Map knownTypeFields -> s
     java.util.List sortedLabels -> o
     boolean $assertionsDisabled -> j
@@ -2337,43 +2344,37 @@
     148:149:void print(com.android.tools.r8.cf.code.CfInvoke):444:445 -> a
     150:150:void print(com.android.tools.r8.cf.code.CfInvoke):441:441 -> a
     151:151:void print(com.android.tools.r8.cf.code.CfInvokeDynamic):450:450 -> a
-    152:153:void print(com.android.tools.r8.cf.code.CfFrame):455:456 -> a
-    154:154:java.lang.String com.android.tools.r8.utils.StringUtils.join(java.lang.String,java.lang.Iterable,java.util.function.Function):132:132 -> a
-    154:154:void print(com.android.tools.r8.cf.code.CfFrame):456 -> a
-    155:155:void print(com.android.tools.r8.cf.code.CfFrame):457:457 -> a
-    156:156:java.lang.String com.android.tools.r8.utils.StringUtils.join(java.lang.String,java.lang.Iterable,java.util.function.Function):132:132 -> a
-    156:156:void print(com.android.tools.r8.cf.code.CfFrame):457 -> a
-    157:157:void print(com.android.tools.r8.cf.code.CfFrame):458:458 -> a
-    158:158:java.lang.String com.android.tools.r8.cf.CfCodePrinter.int2ReferenceAVLTreeMapType():194:194 -> a
-    158:158:void print(com.android.tools.r8.cf.code.CfFrame):461 -> a
-    159:159:java.lang.String com.android.tools.r8.cf.CfCodePrinter.int2ReferenceAVLTreeMapType():193:193 -> a
-    159:159:void print(com.android.tools.r8.cf.code.CfFrame):461 -> a
-    160:166:void print(com.android.tools.r8.cf.code.CfFrame):461:467 -> a
-    167:167:java.lang.String com.android.tools.r8.cf.CfCodePrinter.arrayDequeType():206:206 -> a
+    152:155:void print(com.android.tools.r8.cf.code.CfFrame):455:458 -> a
+    156:156:java.lang.String com.android.tools.r8.cf.CfCodePrinter.int2ReferenceAVLTreeMapType():194:194 -> a
+    156:156:void print(com.android.tools.r8.cf.code.CfFrame):461 -> a
+    157:157:java.lang.String com.android.tools.r8.cf.CfCodePrinter.int2ReferenceAVLTreeMapType():193:193 -> a
+    157:157:void print(com.android.tools.r8.cf.code.CfFrame):461 -> a
+    158:164:void print(com.android.tools.r8.cf.code.CfFrame):461:467 -> a
+    165:165:java.lang.String com.android.tools.r8.cf.CfCodePrinter.arrayDequeType():206:206 -> a
+    165:165:void print(com.android.tools.r8.cf.code.CfFrame):471 -> a
+    166:166:void print(com.android.tools.r8.cf.code.CfFrame):471:471 -> a
+    167:167:java.lang.String com.android.tools.r8.cf.CfCodePrinter.arraysType():210:210 -> a
     167:167:void print(com.android.tools.r8.cf.code.CfFrame):471 -> a
     168:168:void print(com.android.tools.r8.cf.code.CfFrame):471:471 -> a
-    169:169:java.lang.String com.android.tools.r8.cf.CfCodePrinter.arraysType():210:210 -> a
-    169:169:void print(com.android.tools.r8.cf.code.CfFrame):471 -> a
-    170:170:void print(com.android.tools.r8.cf.code.CfFrame):471:471 -> a
-    171:171:void print(com.android.tools.r8.cf.code.CfFrame):458:458 -> a
-    172:172:void print(com.android.tools.r8.cf.code.CfInstanceOf):493:493 -> a
-    173:173:void print(com.android.tools.r8.cf.code.CfCheckCast):498:498 -> a
-    174:174:void print(com.android.tools.r8.cf.code.CfFieldInstruction):503:503 -> a
-    175:175:void print(com.android.tools.r8.cf.code.CfNew):508:508 -> a
-    176:176:void print(com.android.tools.r8.cf.code.CfNewArray):513:513 -> a
-    177:177:void print(com.android.tools.r8.cf.code.CfMultiANewArray):518:518 -> a
-    178:178:void print(com.android.tools.r8.cf.code.CfArrayLength):523:523 -> a
-    179:179:void print(com.android.tools.r8.cf.code.CfGoto):539:539 -> a
-    180:180:void print(com.android.tools.r8.cf.code.CfIf):545:545 -> a
-    181:181:void print(com.android.tools.r8.cf.code.CfIf):544:544 -> a
-    182:182:void print(com.android.tools.r8.cf.code.CfIfCmp):551:551 -> a
-    183:183:void print(com.android.tools.r8.cf.code.CfIfCmp):550:550 -> a
-    184:184:void print(com.android.tools.r8.cf.code.CfSwitch):556:556 -> a
-    185:185:void print(com.android.tools.r8.cf.code.CfLoad):561:561 -> a
-    186:186:void print(com.android.tools.r8.cf.code.CfStore):566:566 -> a
-    187:191:void print(com.android.tools.r8.cf.code.CfIinc):571:571 -> a
-    192:192:void print(com.android.tools.r8.cf.code.CfConstMethodHandle):579:579 -> a
-    193:193:void print(com.android.tools.r8.cf.code.CfConstMethodType):584:584 -> a
+    169:169:void print(com.android.tools.r8.cf.code.CfFrame):458:458 -> a
+    170:170:void print(com.android.tools.r8.cf.code.CfInstanceOf):493:493 -> a
+    171:171:void print(com.android.tools.r8.cf.code.CfCheckCast):498:498 -> a
+    172:172:void print(com.android.tools.r8.cf.code.CfFieldInstruction):503:503 -> a
+    173:173:void print(com.android.tools.r8.cf.code.CfNew):508:508 -> a
+    174:174:void print(com.android.tools.r8.cf.code.CfNewArray):513:513 -> a
+    175:175:void print(com.android.tools.r8.cf.code.CfMultiANewArray):518:518 -> a
+    176:176:void print(com.android.tools.r8.cf.code.CfArrayLength):523:523 -> a
+    177:177:void print(com.android.tools.r8.cf.code.CfGoto):539:539 -> a
+    178:178:void print(com.android.tools.r8.cf.code.CfIf):545:545 -> a
+    179:179:void print(com.android.tools.r8.cf.code.CfIf):544:544 -> a
+    180:180:void print(com.android.tools.r8.cf.code.CfIfCmp):551:551 -> a
+    181:181:void print(com.android.tools.r8.cf.code.CfIfCmp):550:550 -> a
+    182:182:void print(com.android.tools.r8.cf.code.CfSwitch):556:556 -> a
+    183:183:void print(com.android.tools.r8.cf.code.CfLoad):561:561 -> a
+    184:184:void print(com.android.tools.r8.cf.code.CfStore):566:566 -> a
+    185:189:void print(com.android.tools.r8.cf.code.CfIinc):571:571 -> a
+    190:190:void print(com.android.tools.r8.cf.code.CfConstMethodHandle):579:579 -> a
+    191:191:void print(com.android.tools.r8.cf.code.CfConstMethodType):584:584 -> a
     1:3:java.lang.String type(java.lang.String,java.util.List):182:184 -> b
     4:4:java.lang.String valueType(com.android.tools.r8.ir.code.ValueType):236:236 -> b
     5:5:java.lang.String memberType(com.android.tools.r8.ir.code.MemberType):244:244 -> b
@@ -2398,7 +2399,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.P4:
+com.android.tools.r8.cf.CfPrinter -> com.android.tools.r8.internal.C4:
     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
@@ -2531,7 +2532,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.CfPrinter$1 -> com.android.tools.r8.internal.P4$a:
+com.android.tools.r8.cf.CfPrinter$1 -> com.android.tools.r8.internal.C4$a:
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> b
     int[] $SwitchMap$com$android$tools$r8$ir$code$MemberType -> c
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> d
@@ -2540,7 +2541,7 @@
     2:2:void <clinit>():623:623 -> <clinit>
     3:3:void <clinit>():303:303 -> <clinit>
     4:4:void <clinit>():259:259 -> <clinit>
-com.android.tools.r8.cf.CfRegisterAllocator -> com.android.tools.r8.internal.R4:
+com.android.tools.r8.cf.CfRegisterAllocator -> com.android.tools.r8.internal.E4:
     int maxArgumentRegisterNumber -> n
     int nextUnusedRegisterNumber -> l
     int maxRegisterNumber -> m
@@ -2644,12 +2645,12 @@
     10:19:com.android.tools.r8.cf.CfRegisterAllocator$TypesAtBlockEntry lambda$getTypesAtBlockEntry$0(com.android.tools.r8.ir.code.BasicBlock):368:377 -> b
     20:31: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.Q4:
+com.android.tools.r8.cf.CfRegisterAllocator$TypesAtBlockEntry -> com.android.tools.r8.internal.D4:
     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.p5:
+com.android.tools.r8.cf.CfVersion -> com.android.tools.r8.internal.b5:
     com.android.tools.r8.cf.CfVersion V1_2 -> b
     com.android.tools.r8.cf.CfVersion V1_4 -> c
     int version -> k
@@ -2668,14 +2669,14 @@
     1:1:int minor():47:47 -> b
     1:1:int raw():51:51 -> c
     1:1:com.android.tools.r8.cf.CfVersion fromRaw(int):39:39 -> d
+    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():65:65 -> e
     1:1:boolean equals(java.lang.Object):70:70 -> equals
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():65:65 -> f
     1:1:int hashCode():75:75 -> hashCode
     2:2:int com.android.tools.r8.utils.structural.HashCodeVisitor.run(com.android.tools.r8.utils.structural.StructuralItem):28:28 -> hashCode
     2:2:int hashCode():75 -> hashCode
     com.android.tools.r8.utils.structural.StructuralItem self() -> k
     1:1:java.lang.String toString():80:80 -> toString
-com.android.tools.r8.cf.FixedLocalValue -> com.android.tools.r8.internal.zc:
+com.android.tools.r8.cf.FixedLocalValue -> com.android.tools.r8.internal.Sb:
     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() -> O
@@ -2685,7 +2686,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 -> k0
     1:1:java.lang.String toString():45:45 -> toString
-com.android.tools.r8.cf.LoadStoreHelper -> com.android.tools.r8.internal.hp:
+com.android.tools.r8.cf.LoadStoreHelper -> com.android.tools.r8.internal.ko:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.ir.code.IRCode code -> c
     boolean $assertionsDisabled -> a
@@ -2824,14 +2825,14 @@
     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$1 -> com.android.tools.r8.internal.fp:
+com.android.tools.r8.cf.LoadStoreHelper$1 -> com.android.tools.r8.internal.io:
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:void <clinit>():65:65 -> <clinit>
-com.android.tools.r8.cf.LoadStoreHelper$PhiMove -> com.android.tools.r8.internal.gp:
+com.android.tools.r8.cf.LoadStoreHelper$PhiMove -> com.android.tools.r8.internal.jo:
     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.JF:
+com.android.tools.r8.cf.TypeVerificationHelper -> com.android.tools.r8.internal.ZE:
     boolean computingVerificationTypes -> j
     com.android.tools.r8.ir.code.IRCode code -> g
     com.android.tools.r8.graph.AppView appView -> f
@@ -2874,10 +2875,10 @@
     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.EF:
+com.android.tools.r8.cf.TypeVerificationHelper$1 -> com.android.tools.r8.internal.UE:
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:void <clinit>():161:161 -> <clinit>
-com.android.tools.r8.cf.TypeVerificationHelper$InitializedTypeInfo -> com.android.tools.r8.internal.FF:
+com.android.tools.r8.cf.TypeVerificationHelper$InitializedTypeInfo -> com.android.tools.r8.internal.VE:
     com.android.tools.r8.graph.DexType type -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():41:41 -> <clinit>
@@ -2885,7 +2886,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.GF:
+com.android.tools.r8.cf.TypeVerificationHelper$NewInstanceInfo -> com.android.tools.r8.internal.WE:
     com.android.tools.r8.ir.code.NewInstance newInstance -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():60:60 -> <clinit>
@@ -2895,7 +2896,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.HF:
+com.android.tools.r8.cf.TypeVerificationHelper$ThisInstanceInfo -> com.android.tools.r8.internal.XE:
     com.android.tools.r8.graph.DexType type -> b
     boolean $assertionsDisabled -> a
     com.android.tools.r8.ir.code.Argument thisArgument -> c
@@ -2906,9 +2907,9 @@
     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.IF:
+com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo -> com.android.tools.r8.internal.YE:
     com.android.tools.r8.graph.DexType getDexType() -> a
-com.android.tools.r8.cf.code.CfArithmeticBinop -> com.android.tools.r8.internal.H3:
+com.android.tools.r8.cf.code.CfArithmeticBinop -> com.android.tools.r8.internal.u3:
     com.android.tools.r8.ir.code.NumericType type -> d
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
@@ -2942,12 +2943,12 @@
     1:1:int getAsmOpcodeTypeOffset():133:133 -> u
     1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getOpcode():61:61 -> v
     1:1:com.android.tools.r8.ir.code.NumericType getType():65:65 -> w
-com.android.tools.r8.cf.code.CfArithmeticBinop$1 -> com.android.tools.r8.internal.H3$a:
+com.android.tools.r8.cf.code.CfArithmeticBinop$1 -> com.android.tools.r8.internal.u3$a:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> b
     int[] $SwitchMap$com$android$tools$r8$cf$code$CfArithmeticBinop$Opcode -> a
     1:1:void <clinit>():133:133 -> <clinit>
     2:2:void <clinit>():116:116 -> <clinit>
-com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode -> com.android.tools.r8.internal.H3$b:
+com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode -> com.android.tools.r8.internal.u3$b:
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode[] $VALUES -> f
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode Sub -> b
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode Add -> a
@@ -2958,7 +2959,7 @@
     6:6:void <clinit>():31:31 -> <clinit>
     1:1:void <init>(java.lang.String,int):31:31 -> <init>
     1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode[] values():31:31 -> a
-com.android.tools.r8.cf.code.CfArrayLength -> com.android.tools.r8.internal.I3:
+com.android.tools.r8.cf.code.CfArrayLength -> com.android.tools.r8.internal.v3:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():26:26 -> <clinit>
     1:1:void <init>():26:26 -> <init>
@@ -2972,7 +2973,7 @@
     10:10:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):73 -> 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):85:85 -> a
     int getCompareToId() -> n
-com.android.tools.r8.cf.code.CfArrayLoad -> com.android.tools.r8.internal.J3:
+com.android.tools.r8.cf.code.CfArrayLoad -> com.android.tools.r8.internal.w3:
     com.android.tools.r8.ir.code.MemberType type -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():30:30 -> <clinit>
@@ -3002,7 +3003,7 @@
     1:1:int getCompareToId():41:41 -> n
     1:19:int getLoadType():55:73 -> t
     1:1:com.android.tools.r8.ir.code.MemberType getType():51:51 -> u
-com.android.tools.r8.cf.code.CfArrayStore -> com.android.tools.r8.internal.K3:
+com.android.tools.r8.cf.code.CfArrayStore -> com.android.tools.r8.internal.x3:
     com.android.tools.r8.ir.code.MemberType type -> a
     1:2:void <init>(com.android.tools.r8.ir.code.MemberType):33:34 -> <init>
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):49:49 -> a
@@ -3017,11 +3018,11 @@
     1:1:int getCompareToId():43:43 -> n
     1:19:int getStoreType():53:71 -> t
     1:1:com.android.tools.r8.ir.code.MemberType getType():38:38 -> u
-com.android.tools.r8.cf.code.CfCheckCast -> com.android.tools.r8.internal.O3:
+com.android.tools.r8.cf.code.CfCheckCast -> com.android.tools.r8.internal.B3:
     com.android.tools.r8.graph.DexType type -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):33:34 -> <init>
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):49:49 -> a
-    2:2:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):63:63 -> a
+    2:2:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):68:68 -> a
     2:2:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):49 -> a
     3:4: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):62:63 -> a
     5:5:void print(com.android.tools.r8.cf.CfPrinter):68:68 -> a
@@ -3032,7 +3033,7 @@
     boolean canThrow() -> l
     int getCompareToId() -> n
     1:1:com.android.tools.r8.graph.DexType getType():38:38 -> t
-com.android.tools.r8.cf.code.CfCmp -> com.android.tools.r8.internal.Q3:
+com.android.tools.r8.cf.code.CfCmp -> com.android.tools.r8.internal.D3:
     com.android.tools.r8.ir.code.Cmp$Bias bias -> c
     com.android.tools.r8.ir.code.NumericType type -> d
     boolean $assertionsDisabled -> a
@@ -3055,14 +3056,14 @@
     10:10:int getAsmOpcode():87:87 -> t
     1:1:com.android.tools.r8.ir.code.Cmp$Bias getBias():58:58 -> u
     1:1:com.android.tools.r8.ir.code.NumericType getType():62:62 -> v
-com.android.tools.r8.cf.code.CfCmp$1 -> com.android.tools.r8.internal.P3:
+com.android.tools.r8.cf.code.CfCmp$1 -> com.android.tools.r8.internal.C3:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():83:83 -> <clinit>
-com.android.tools.r8.cf.code.CfConstClass -> com.android.tools.r8.internal.W3:
+com.android.tools.r8.cf.code.CfConstClass -> com.android.tools.r8.internal.J3:
     com.android.tools.r8.graph.DexType type -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):33:34 -> <init>
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):45:45 -> a
-    2:2:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):63:63 -> a
+    2:2:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):68:68 -> a
     2:2:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):45 -> a
     3:3:void print(com.android.tools.r8.cf.CfPrinter):67:67 -> a
     4:26:java.lang.String com.android.tools.r8.cf.code.CfConstClass.getInternalName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):76:98 -> a
@@ -3077,7 +3078,7 @@
     boolean canThrow() -> l
     1:1:int getCompareToId():39:39 -> n
     1:1:com.android.tools.r8.graph.DexType getType():49:49 -> t
-com.android.tools.r8.cf.code.CfConstMethodHandle -> com.android.tools.r8.internal.X3:
+com.android.tools.r8.cf.code.CfConstMethodHandle -> com.android.tools.r8.internal.K3:
     com.android.tools.r8.graph.DexMethodHandle handle -> a
     1:2:void <init>(com.android.tools.r8.graph.DexMethodHandle):33:34 -> <init>
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):49:49 -> a
@@ -3092,7 +3093,7 @@
     boolean canThrow() -> l
     1:1:int getCompareToId():43:43 -> n
     1:1:com.android.tools.r8.graph.DexMethodHandle getHandle():38:38 -> t
-com.android.tools.r8.cf.code.CfConstMethodType -> com.android.tools.r8.internal.Y3:
+com.android.tools.r8.cf.code.CfConstMethodType -> com.android.tools.r8.internal.L3:
     com.android.tools.r8.graph.DexProto type -> a
     1:2:void <init>(com.android.tools.r8.graph.DexProto):33:34 -> <init>
     1:1:com.android.tools.r8.graph.DexProto com.android.tools.r8.cf.code.CfConstMethodType.getType():38:38 -> a
@@ -3109,7 +3110,7 @@
     boolean canThrow() -> l
     1:1:int getCompareToId():43:43 -> n
     1:1:com.android.tools.r8.graph.DexProto getType():38:38 -> t
-com.android.tools.r8.cf.code.CfConstNull -> com.android.tools.r8.internal.Z3:
+com.android.tools.r8.cf.code.CfConstNull -> com.android.tools.r8.internal.M3:
     1:1:void <init>():26:26 -> <init>
     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):38:38 -> a
     2:2:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):49:49 -> a
@@ -3122,7 +3123,7 @@
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):65 -> 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):77:77 -> a
     int getCompareToId() -> n
-com.android.tools.r8.cf.code.CfConstNumber -> com.android.tools.r8.internal.a4:
+com.android.tools.r8.cf.code.CfConstNumber -> com.android.tools.r8.internal.N3:
     com.android.tools.r8.ir.code.ValueType type -> d
     long value -> c
     boolean $assertionsDisabled -> a
@@ -3158,10 +3159,10 @@
     1:2:long getLongValue():67:68 -> w
     1:1:long getRawValue():58:58 -> x
     1:1:com.android.tools.r8.ir.code.ValueType getType():54:54 -> y
-com.android.tools.r8.cf.code.CfConstNumber$1 -> com.android.tools.r8.internal.a4$a:
+com.android.tools.r8.cf.code.CfConstNumber$1 -> com.android.tools.r8.internal.N3$a:
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:void <clinit>():91:91 -> <clinit>
-com.android.tools.r8.cf.code.CfConstString -> com.android.tools.r8.internal.b4:
+com.android.tools.r8.cf.code.CfConstString -> com.android.tools.r8.internal.O3:
     com.android.tools.r8.graph.DexString string -> a
     1:2:void <init>(com.android.tools.r8.graph.DexString):29:30 -> <init>
     com.android.tools.r8.cf.code.CfConstString asConstString() -> a
@@ -3179,7 +3180,7 @@
     boolean canThrow() -> l
     1:1:int getCompareToId():35:35 -> n
     1:1:com.android.tools.r8.graph.DexString getString():45:45 -> t
-com.android.tools.r8.cf.code.CfDexItemBasedConstString -> com.android.tools.r8.internal.c4:
+com.android.tools.r8.cf.code.CfDexItemBasedConstString -> com.android.tools.r8.internal.P3:
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> c
     boolean $assertionsDisabled -> a
     com.android.tools.r8.graph.DexReference item -> b
@@ -3202,7 +3203,7 @@
     1:1:int getCompareToId():42:42 -> n
     1:1:com.android.tools.r8.graph.DexReference getItem():52:52 -> t
     1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():56:56 -> u
-com.android.tools.r8.cf.code.CfFieldInstruction -> com.android.tools.r8.internal.d4:
+com.android.tools.r8.cf.code.CfFieldInstruction -> com.android.tools.r8.internal.Q3:
     com.android.tools.r8.graph.DexField declaringField -> d
     com.android.tools.r8.graph.DexField field -> c
     boolean $assertionsDisabled -> a
@@ -3212,28 +3213,28 @@
     1:1:int lambda$specify$0(com.android.tools.r8.cf.code.CfFieldInstruction):39:39 -> a
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):39:39 -> a
     3:3:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):65:65 -> a
-    4:9: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):92:97 -> a
-    10:10:void print(com.android.tools.r8.cf.CfPrinter):102:102 -> a
-    11:25:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):108:122 -> a
-    26:26:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):113:113 -> a
-    27:36:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):110:119 -> a
-    37:37:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):116:116 -> a
-    38:65:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):133:160 -> a
-    66:68:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):154:156 -> a
-    69:70:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):148:149 -> a
-    71:72:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):142:143 -> a
-    73:73:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):137:137 -> a
-    74:84:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):167:177 -> a
-    85:85:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):175:175 -> 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):173:173 -> 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):171:171 -> 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):169:169 -> a
-    89:111: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):188:210 -> a
-    112: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):202:202 -> a
-    113:128: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:207 -> a
+    4:9: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):88:93 -> a
+    10:10:void print(com.android.tools.r8.cf.CfPrinter):98:98 -> a
+    11:25:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):104:118 -> a
+    26:26:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):109:109 -> a
+    27:36:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):106:115 -> a
+    37:37:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):112:112 -> a
+    38:65:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):129:156 -> a
+    66:68:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):150:152 -> a
+    69:70:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):144:145 -> a
+    71:72: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
+    73:73:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):133:133 -> a
+    74:84:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):163:173 -> a
+    85:85:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):171:171 -> 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):169:169 -> 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):167:167 -> 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):165:165 -> a
+    89:111: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:206 -> a
+    112: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):198:198 -> a
+    113:128: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):188:203 -> a
     129:130: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
-    129:130: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):207 -> a
-    131: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:197 -> a
+    129:130: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):203 -> a
+    131: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):193:193 -> a
     1:1:com.android.tools.r8.graph.DexField lambda$specify$1(com.android.tools.r8.cf.code.CfFieldInstruction):39:39 -> b
     1:1:com.android.tools.r8.graph.DexField lambda$specify$2(com.android.tools.r8.cf.code.CfFieldInstruction):39:39 -> c
     com.android.tools.r8.cf.code.CfFieldInstruction asFieldInstruction() -> d
@@ -3241,8 +3242,7 @@
     1:1:int getCompareToId():59:59 -> n
     1:1:com.android.tools.r8.graph.DexField getField():50:50 -> t
     1:1:int getOpcode():54:54 -> u
-    1:1:boolean isFieldGet():69:69 -> v
-com.android.tools.r8.cf.code.CfFrame -> com.android.tools.r8.internal.f4:
+com.android.tools.r8.cf.code.CfFrame -> com.android.tools.r8.internal.S3:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap locals -> b
     java.util.Deque stack -> c
     boolean $assertionsDisabled -> a
@@ -3285,8 +3285,8 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getLocals():346:346 -> t
     1:1:java.lang.String toString():424:424 -> toString
     1:1:java.util.Deque getStack():350:350 -> u
-com.android.tools.r8.cf.code.CfFrame$1 -> com.android.tools.r8.internal.e4:
-com.android.tools.r8.cf.code.CfFrame$FrameType -> com.android.tools.r8.internal.f4$a:
+com.android.tools.r8.cf.code.CfFrame$1 -> com.android.tools.r8.internal.R3:
+com.android.tools.r8.cf.code.CfFrame$FrameType -> com.android.tools.r8.internal.S3$a:
     1:1:void <init>(com.android.tools.r8.cf.code.CfFrame$1):38:38 -> <init>
     2:2:void <init>():106:106 -> <init>
     com.android.tools.r8.graph.DexType getInitializedType() -> a
@@ -3315,7 +3315,7 @@
     boolean isWide() -> h
     1:1:com.android.tools.r8.cf.code.CfFrame$FrameType top():53:53 -> i
     1:1:com.android.tools.r8.cf.code.CfFrame$FrameType uninitializedThis():49:49 -> j
-com.android.tools.r8.cf.code.CfFrame$InitializedType -> com.android.tools.r8.internal.g4:
+com.android.tools.r8.cf.code.CfFrame$InitializedType -> com.android.tools.r8.internal.T3:
     com.android.tools.r8.graph.DexType type -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():163:163 -> <clinit>
@@ -3327,25 +3327,25 @@
     28:28:com.android.tools.r8.graph.DexType getInitializedType():211:211 -> a
     1:1:boolean isWide():201:201 -> h
     1:1:java.lang.String toString():174:174 -> toString
-com.android.tools.r8.cf.code.CfFrame$OneWord -> com.android.tools.r8.internal.h4:
+com.android.tools.r8.cf.code.CfFrame$OneWord -> com.android.tools.r8.internal.U3:
     com.android.tools.r8.cf.code.CfFrame$OneWord SINGLETON -> a
     1:1:void <clinit>():292:292 -> <clinit>
     1:1:void <init>():290:290 -> <init>
     1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):296:296 -> a
     1:1:com.android.tools.r8.cf.code.CfFrame$OneWord access$400():290:290 -> k
-com.android.tools.r8.cf.code.CfFrame$Top -> com.android.tools.r8.internal.i4:
+com.android.tools.r8.cf.code.CfFrame$Top -> com.android.tools.r8.internal.V3:
     com.android.tools.r8.cf.code.CfFrame$Top SINGLETON -> a
     1:1:void <clinit>():217:217 -> <clinit>
     1:1:void <init>():215:215 -> <init>
     1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):226:226 -> a
     1:1:com.android.tools.r8.cf.code.CfFrame$Top access$300():215:215 -> k
-com.android.tools.r8.cf.code.CfFrame$TwoWord -> com.android.tools.r8.internal.j4:
+com.android.tools.r8.cf.code.CfFrame$TwoWord -> com.android.tools.r8.internal.W3:
     com.android.tools.r8.cf.code.CfFrame$TwoWord SINGLETON -> a
     1:1:void <clinit>():312:312 -> <clinit>
     1:1:void <init>():310:310 -> <init>
     1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):316:316 -> a
     1:1:com.android.tools.r8.cf.code.CfFrame$TwoWord access$500():310:310 -> k
-com.android.tools.r8.cf.code.CfFrame$UninitializedNew -> com.android.tools.r8.internal.k4:
+com.android.tools.r8.cf.code.CfFrame$UninitializedNew -> com.android.tools.r8.internal.X3:
     com.android.tools.r8.cf.code.CfLabel label -> a
     com.android.tools.r8.graph.DexType type -> b
     1:1:void <init>(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.graph.DexType,com.android.tools.r8.cf.code.CfFrame$1):235:235 -> <init>
@@ -3353,11 +3353,11 @@
     1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):251:251 -> a
     1:1:com.android.tools.r8.cf.code.CfLabel getUninitializedLabel():261:261 -> b
     1:1:com.android.tools.r8.graph.DexType getUninitializedNewType():266:266 -> c
-com.android.tools.r8.cf.code.CfFrame$UninitializedThis -> com.android.tools.r8.internal.l4:
+com.android.tools.r8.cf.code.CfFrame$UninitializedThis -> com.android.tools.r8.internal.Y3:
     1:1:void <init>(com.android.tools.r8.cf.code.CfFrame$1):270:270 -> <init>
     2:2:void <init>():272:272 -> <init>
     1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):276:276 -> a
-com.android.tools.r8.cf.code.CfFrameVerificationHelper -> com.android.tools.r8.internal.m4:
+com.android.tools.r8.cf.code.CfFrameVerificationHelper -> com.android.tools.r8.internal.Z3:
     java.util.Set tryCatchRangeLabels -> i
     java.util.Deque currentCatchRanges -> h
     com.android.tools.r8.graph.DexItemFactory factory -> g
@@ -3470,7 +3470,7 @@
     12:12:void verifyExceptionEdges():191:191 -> c
     13:13:void verifyExceptionEdges():186:186 -> c
     1:2:void verifyFrameIsSet():162:163 -> d
-com.android.tools.r8.cf.code.CfGoto -> com.android.tools.r8.internal.n4:
+com.android.tools.r8.cf.code.CfGoto -> com.android.tools.r8.internal.a4:
     com.android.tools.r8.cf.code.CfLabel target -> a
     1:2:void <init>(com.android.tools.r8.cf.code.CfLabel):29:30 -> <init>
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):41:41 -> a
@@ -3485,7 +3485,7 @@
     8: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):100:101 -> a
     int getCompareToId() -> n
     1:1:com.android.tools.r8.cf.code.CfLabel getTarget():61:61 -> o
-com.android.tools.r8.cf.code.CfIf -> com.android.tools.r8.internal.o4:
+com.android.tools.r8.cf.code.CfIf -> com.android.tools.r8.internal.b4:
     com.android.tools.r8.ir.code.ValueType type -> c
     com.android.tools.r8.ir.code.If$Type kind -> b
     boolean $assertionsDisabled -> a
@@ -3513,10 +3513,10 @@
     16:16:int getOpcode():81:81 -> u
     17:17:int getOpcode():71:71 -> u
     1:1:com.android.tools.r8.ir.code.ValueType getType():56:56 -> v
-com.android.tools.r8.cf.code.CfIf$1 -> com.android.tools.r8.internal.o4$a:
+com.android.tools.r8.cf.code.CfIf$1 -> com.android.tools.r8.internal.b4$a:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
     1:1:void <clinit>():69:69 -> <clinit>
-com.android.tools.r8.cf.code.CfIfCmp -> com.android.tools.r8.internal.p4:
+com.android.tools.r8.cf.code.CfIfCmp -> com.android.tools.r8.internal.c4:
     com.android.tools.r8.ir.code.ValueType type -> c
     com.android.tools.r8.ir.code.If$Type kind -> b
     boolean $assertionsDisabled -> a
@@ -3546,10 +3546,10 @@
     16:16:int getOpcode():81:81 -> u
     17:17:int getOpcode():71:71 -> u
     1:1:com.android.tools.r8.ir.code.ValueType getType():60:60 -> v
-com.android.tools.r8.cf.code.CfIfCmp$1 -> com.android.tools.r8.internal.p4$a:
+com.android.tools.r8.cf.code.CfIfCmp$1 -> com.android.tools.r8.internal.c4$a:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
     1:1:void <clinit>():69:69 -> <clinit>
-com.android.tools.r8.cf.code.CfIinc -> com.android.tools.r8.internal.q4:
+com.android.tools.r8.cf.code.CfIinc -> com.android.tools.r8.internal.d4:
     int increment -> b
     int var -> a
     1:3:void <init>(int,int):36:38 -> <init>
@@ -3563,11 +3563,11 @@
     int getCompareToId() -> n
     1:1:int getIncrement():75:75 -> t
     1:1:int getLocalIndex():71:71 -> u
-com.android.tools.r8.cf.code.CfInitClass -> com.android.tools.r8.internal.r4:
+com.android.tools.r8.cf.code.CfInitClass -> com.android.tools.r8.internal.e4:
     com.android.tools.r8.graph.DexType clazz -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):34:35 -> <init>
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):54:54 -> a
-    2:2:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):63:63 -> a
+    2:2:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):68:68 -> a
     2:2:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):54 -> a
     3:8: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:74 -> a
     9:9:void print(com.android.tools.r8.cf.CfPrinter):79:79 -> a
@@ -3578,11 +3578,11 @@
     boolean canThrow() -> l
     1:1:int getCompareToId():48:48 -> n
     1:1:com.android.tools.r8.graph.DexType getClassValue():39:39 -> t
-com.android.tools.r8.cf.code.CfInstanceOf -> com.android.tools.r8.internal.s4:
+com.android.tools.r8.cf.code.CfInstanceOf -> com.android.tools.r8.internal.f4:
     com.android.tools.r8.graph.DexType type -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):32:33 -> <init>
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):48:48 -> a
-    2:2:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):63:63 -> a
+    2:2:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):68:68 -> a
     2:2:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):48 -> a
     3:4: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):71:72 -> a
     5:5:void print(com.android.tools.r8.cf.CfPrinter):77:77 -> a
@@ -3595,7 +3595,7 @@
     boolean canThrow() -> l
     int getCompareToId() -> n
     1:1:com.android.tools.r8.graph.DexType getType():37:37 -> t
-com.android.tools.r8.cf.code.CfInstruction -> com.android.tools.r8.internal.t4:
+com.android.tools.r8.cf.code.CfInstruction -> com.android.tools.r8.internal.g4:
     1:1:void <init>():29:29 -> <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
@@ -3626,7 +3626,7 @@
     boolean isJump() -> r
     boolean isReturn() -> s
     1:3:java.lang.String toString():78:80 -> toString
-com.android.tools.r8.cf.code.CfInvoke -> com.android.tools.r8.internal.u4:
+com.android.tools.r8.cf.code.CfInvoke -> com.android.tools.r8.internal.h4:
     boolean $assertionsDisabled -> a
     com.android.tools.r8.graph.DexMethod method -> b
     int opcode -> c
@@ -3649,50 +3649,53 @@
     74:74:com.android.tools.r8.ir.code.Invoke$Type getInvokeType(com.android.tools.r8.graph.DexClassAndMethod):155:155 -> a
     75:75:com.android.tools.r8.ir.code.Invoke$Type getInvokeType(com.android.tools.r8.graph.DexClassAndMethod):150:150 -> a
     76:78:boolean isInvokeSuper(com.android.tools.r8.graph.DexType):168:170 -> a
-    79:133:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):191:245 -> a
-    134:181:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):194:241 -> a
-    182:188:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):224:230 -> a
-    189:198:com.android.tools.r8.cf.code.CfInvoke$MethodAndInvokeType com.android.tools.r8.cf.code.CfInvoke.transformInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CfSourceCode,com.android.tools.r8.graph.ProgramMethod):387:396 -> a
-    189:198:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):229 -> a
-    199:201: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):431:433 -> a
-    199:201:com.android.tools.r8.cf.code.CfInvoke$MethodAndInvokeType com.android.tools.r8.cf.code.CfInvoke.transformInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CfSourceCode,com.android.tools.r8.graph.ProgramMethod):397 -> a
-    199:201:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):229 -> a
-    202:225:com.android.tools.r8.cf.code.CfInvoke$MethodAndInvokeType com.android.tools.r8.cf.code.CfInvoke.transformInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CfSourceCode,com.android.tools.r8.graph.ProgramMethod):401:424 -> a
-    202:225:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):229 -> a
-    226:228:com.android.tools.r8.cf.code.CfInvoke$MethodAndInvokeType com.android.tools.r8.cf.code.CfInvoke.transformInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CfSourceCode,com.android.tools.r8.graph.ProgramMethod):423:425 -> a
-    226:228:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):229 -> a
-    229:229:com.android.tools.r8.cf.code.CfInvoke$MethodAndInvokeType com.android.tools.r8.cf.code.CfInvoke.transformInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CfSourceCode,com.android.tools.r8.graph.ProgramMethod):405:405 -> a
-    229:229:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):229 -> a
-    230:233:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):231:234 -> a
-    234:293:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):200:259 -> a
-    294:297:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):258:261 -> a
-    298:362:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):268:332 -> a
-    363:394:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):277:308 -> a
-    395:448:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):282:335 -> a
-    449:450: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):350:351 -> a
-    451:451:boolean com.android.tools.r8.graph.DexMethod.isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):266:266 -> a
-    451:451: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):351 -> a
-    452:454: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):352:354 -> a
-    455:456: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
-    455:456: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):354 -> a
-    457:458: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):356:357 -> a
-    459:459: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):363:363 -> a
+    79:133:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):187:241 -> a
+    134:181:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):190:237 -> a
+    182:188:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):220:226 -> a
+    189:198:com.android.tools.r8.cf.code.CfInvoke$MethodAndInvokeType com.android.tools.r8.cf.code.CfInvoke.transformInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CfSourceCode,com.android.tools.r8.graph.ProgramMethod):383:392 -> a
+    189:198:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):225 -> a
+    199:201: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):427:429 -> a
+    199:201:com.android.tools.r8.cf.code.CfInvoke$MethodAndInvokeType com.android.tools.r8.cf.code.CfInvoke.transformInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CfSourceCode,com.android.tools.r8.graph.ProgramMethod):393 -> a
+    199:201:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):225 -> a
+    202:225:com.android.tools.r8.cf.code.CfInvoke$MethodAndInvokeType com.android.tools.r8.cf.code.CfInvoke.transformInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CfSourceCode,com.android.tools.r8.graph.ProgramMethod):397:420 -> a
+    202:225:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):225 -> a
+    226:228:com.android.tools.r8.cf.code.CfInvoke$MethodAndInvokeType com.android.tools.r8.cf.code.CfInvoke.transformInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CfSourceCode,com.android.tools.r8.graph.ProgramMethod):419:421 -> a
+    226:228:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):225 -> a
+    229:229:com.android.tools.r8.cf.code.CfInvoke$MethodAndInvokeType com.android.tools.r8.cf.code.CfInvoke.transformInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CfSourceCode,com.android.tools.r8.graph.ProgramMethod):401:401 -> a
+    229:229:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):225 -> a
+    230:233:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):227:230 -> a
+    234:293:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):196:255 -> a
+    294:297:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):254:257 -> a
+    298:362:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):264:328 -> a
+    363:394:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):273:304 -> a
+    395:431:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):278:314 -> a
+    432:432:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    432:432:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):314 -> a
+    433:449:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):315:331 -> a
+    450:451: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):346:347 -> a
+    452:452:boolean com.android.tools.r8.graph.DexMethod.isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):261:261 -> a
+    452:452: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):347 -> a
+    453:455: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):348:350 -> a
+    456:457: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
+    456:457: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):350 -> a
+    458:459: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):352:353 -> a
+    460:460: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):359:359 -> a
     com.android.tools.r8.cf.code.CfInvoke asInvoke() -> g
     boolean canThrow() -> l
     1:1:int getCompareToId():63:63 -> n
     1:1:com.android.tools.r8.graph.DexMethod getMethod():74:74 -> t
     1:1:int getOpcode():78:78 -> u
     1:1:boolean isInterface():82:82 -> v
-    1:1:boolean isInvokeVirtual():178:178 -> w
-com.android.tools.r8.cf.code.CfInvoke$1 -> com.android.tools.r8.internal.u4$a:
-com.android.tools.r8.cf.code.CfInvoke$MethodAndInvokeType -> com.android.tools.r8.internal.u4$b:
+    1:1:boolean isInvokeVirtual():174:174 -> w
+com.android.tools.r8.cf.code.CfInvoke$1 -> com.android.tools.r8.internal.h4$a:
+com.android.tools.r8.cf.code.CfInvoke$MethodAndInvokeType -> com.android.tools.r8.internal.h4$b:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> b
     com.android.tools.r8.graph.DexMethod method -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.cf.code.CfInvoke$1):367:367 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):371:373 -> <init>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getInvokeType():381:381 -> a
-    1:1:com.android.tools.r8.graph.DexMethod getMethod():377:377 -> b
-com.android.tools.r8.cf.code.CfInvokeDynamic -> com.android.tools.r8.internal.v4:
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.cf.code.CfInvoke$1):363:363 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):367:369 -> <init>
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getInvokeType():377:377 -> a
+    1:1:com.android.tools.r8.graph.DexMethod getMethod():373:373 -> b
+com.android.tools.r8.cf.code.CfInvokeDynamic -> com.android.tools.r8.internal.i4:
     com.android.tools.r8.graph.DexCallSite callSite -> a
     1:2:void <init>(com.android.tools.r8.graph.DexCallSite):42:43 -> <init>
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):54:54 -> a
@@ -3724,7 +3727,7 @@
     boolean canThrow() -> l
     int getCompareToId() -> n
     1:1:com.android.tools.r8.graph.DexCallSite getCallSite():114:114 -> t
-com.android.tools.r8.cf.code.CfJsrRet -> com.android.tools.r8.internal.w4:
+com.android.tools.r8.cf.code.CfJsrRet -> com.android.tools.r8.internal.j4:
     int local -> a
     1:2:void <init>(int):35:36 -> <init>
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):47:47 -> a
@@ -3739,7 +3742,7 @@
     2:2:com.android.tools.r8.errors.CompilationError error():29 -> t
     3:3:com.android.tools.r8.errors.CompilationError error():29:29 -> t
     1:1:int getLocal():92:92 -> u
-com.android.tools.r8.cf.code.CfLabel -> com.android.tools.r8.internal.x4:
+com.android.tools.r8.cf.code.CfLabel -> com.android.tools.r8.internal.k4:
     com.android.tools.r8.org.objectweb.asm.Label label -> a
     1:3:void <init>():25:27 -> <init>
     void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode) -> a
@@ -3754,7 +3757,7 @@
     boolean emitsIR() -> m
     1:1:int getCompareToId():38:38 -> n
     1:4:com.android.tools.r8.org.objectweb.asm.Label getLabel():30:33 -> t
-com.android.tools.r8.cf.code.CfLoad -> com.android.tools.r8.internal.C4:
+com.android.tools.r8.cf.code.CfLoad -> com.android.tools.r8.internal.p4:
     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>
@@ -3778,10 +3781,10 @@
     1:13:int getLoadType():50:62 -> t
     1:1:int getLocalIndex():99:99 -> u
     1:1:com.android.tools.r8.ir.code.ValueType getType():95:95 -> v
-com.android.tools.r8.cf.code.CfLoad$1 -> com.android.tools.r8.internal.C4$a:
+com.android.tools.r8.cf.code.CfLoad$1 -> com.android.tools.r8.internal.p4$a:
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:void <clinit>():50:50 -> <clinit>
-com.android.tools.r8.cf.code.CfLogicalBinop -> com.android.tools.r8.internal.D4:
+com.android.tools.r8.cf.code.CfLogicalBinop -> com.android.tools.r8.internal.q4:
     com.android.tools.r8.ir.code.NumericType type -> d
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode opcode -> c
     boolean $assertionsDisabled -> a
@@ -3815,7 +3818,7 @@
     21:21:int getAsmOpcode():104:104 -> t
     1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getOpcode():67:67 -> u
     1:1:com.android.tools.r8.ir.code.NumericType getType():63:63 -> v
-com.android.tools.r8.cf.code.CfLogicalBinop$Opcode -> com.android.tools.r8.internal.D4$a:
+com.android.tools.r8.cf.code.CfLogicalBinop$Opcode -> com.android.tools.r8.internal.q4$a:
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode Shl -> a
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode[] $VALUES -> g
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode And -> d
@@ -3826,7 +3829,7 @@
     1:6:void <clinit>():32:37 -> <clinit>
     7:7:void <clinit>():31:31 -> <clinit>
     1:1:void <init>(java.lang.String,int):31:31 -> <init>
-com.android.tools.r8.cf.code.CfMonitor -> com.android.tools.r8.internal.E4:
+com.android.tools.r8.cf.code.CfMonitor -> com.android.tools.r8.internal.r4:
     com.android.tools.r8.ir.code.Monitor$Type type -> a
     1:2:void <init>(com.android.tools.r8.ir.code.Monitor$Type):32:33 -> <init>
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):48:48 -> a
@@ -3845,7 +3848,7 @@
     1:1:int com.android.tools.r8.cf.code.CfMonitor.getAsmOpcode():65:65 -> n
     1:1:int getCompareToId():42 -> n
     1:1:com.android.tools.r8.ir.code.Monitor$Type getType():37:37 -> t
-com.android.tools.r8.cf.code.CfMultiANewArray -> com.android.tools.r8.internal.F4:
+com.android.tools.r8.cf.code.CfMultiANewArray -> com.android.tools.r8.internal.s4:
     com.android.tools.r8.graph.DexType type -> b
     boolean $assertionsDisabled -> a
     int dimensions -> c
@@ -3871,7 +3874,7 @@
     int getCompareToId() -> n
     1:1:int getDimensions():49:49 -> t
     1:1:com.android.tools.r8.graph.DexType getType():45:45 -> u
-com.android.tools.r8.cf.code.CfNeg -> com.android.tools.r8.internal.H4:
+com.android.tools.r8.cf.code.CfNeg -> com.android.tools.r8.internal.u4:
     com.android.tools.r8.ir.code.NumericType type -> a
     1:2:void <init>(com.android.tools.r8.ir.code.NumericType):33:34 -> <init>
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):49:49 -> a
@@ -3888,14 +3891,14 @@
     1:1:int getCompareToId():43:43 -> n
     1:14:int getAsmOpcode():71:84 -> t
     1:1:com.android.tools.r8.ir.code.NumericType getType():38:38 -> u
-com.android.tools.r8.cf.code.CfNeg$1 -> com.android.tools.r8.internal.G4:
+com.android.tools.r8.cf.code.CfNeg$1 -> com.android.tools.r8.internal.t4:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():71:71 -> <clinit>
-com.android.tools.r8.cf.code.CfNew -> com.android.tools.r8.internal.I4:
+com.android.tools.r8.cf.code.CfNew -> com.android.tools.r8.internal.v4:
     com.android.tools.r8.graph.DexType type -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):33:34 -> <init>
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):49:49 -> a
-    2:2:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):63:63 -> a
+    2:2:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):68:68 -> a
     2:2:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):49 -> a
     3:4: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):62:63 -> a
     5:5:void print(com.android.tools.r8.cf.CfPrinter):68:68 -> a
@@ -3906,13 +3909,13 @@
     boolean canThrow() -> l
     int getCompareToId() -> n
     1:1:com.android.tools.r8.graph.DexType getType():38:38 -> t
-com.android.tools.r8.cf.code.CfNewArray -> com.android.tools.r8.internal.J4:
+com.android.tools.r8.cf.code.CfNewArray -> com.android.tools.r8.internal.w4:
     com.android.tools.r8.graph.DexType type -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():31:31 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexType):35:37 -> <init>
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):52:52 -> a
-    2:2:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):63:63 -> a
+    2:2:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):68:68 -> a
     2:2:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):52 -> 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):104:104 -> a
     4:22:int com.android.tools.r8.cf.code.CfNewArray.getPrimitiveTypeCode():56:74 -> a
@@ -3941,7 +3944,7 @@
     boolean canThrow() -> l
     1:1:int getCompareToId():46:46 -> n
     1:1:com.android.tools.r8.graph.DexType getType():41:41 -> t
-com.android.tools.r8.cf.code.CfNop -> com.android.tools.r8.internal.K4:
+com.android.tools.r8.cf.code.CfNop -> com.android.tools.r8.internal.x4:
     1:1:void <init>():25:25 -> <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
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):35:35 -> a
@@ -3951,7 +3954,7 @@
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):69:69 -> a
     boolean emitsIR() -> m
     int getCompareToId() -> n
-com.android.tools.r8.cf.code.CfNumberConversion -> com.android.tools.r8.internal.M4:
+com.android.tools.r8.cf.code.CfNumberConversion -> com.android.tools.r8.internal.z4:
     com.android.tools.r8.ir.code.NumericType to -> d
     com.android.tools.r8.ir.code.NumericType from -> c
     boolean $assertionsDisabled -> a
@@ -3979,10 +3982,10 @@
     111:119:int getAsmOpcode():100:108 -> t
     1:1:com.android.tools.r8.ir.code.NumericType getFromType():55:55 -> u
     1:1:com.android.tools.r8.ir.code.NumericType getToType():59:59 -> v
-com.android.tools.r8.cf.code.CfNumberConversion$1 -> com.android.tools.r8.internal.L4:
+com.android.tools.r8.cf.code.CfNumberConversion$1 -> com.android.tools.r8.internal.y4:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():83:83 -> <clinit>
-com.android.tools.r8.cf.code.CfPosition -> com.android.tools.r8.internal.O4:
+com.android.tools.r8.cf.code.CfPosition -> com.android.tools.r8.internal.B4:
     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):32:34 -> <init>
@@ -4002,7 +4005,7 @@
     1:1:int getCompareToId():39:39 -> n
     1:1:com.android.tools.r8.cf.code.CfLabel getLabel():76:76 -> t
     1:1:com.android.tools.r8.ir.code.Position getPosition():72:72 -> u
-com.android.tools.r8.cf.code.CfReturn -> com.android.tools.r8.internal.S4:
+com.android.tools.r8.cf.code.CfReturn -> com.android.tools.r8.internal.F4:
     com.android.tools.r8.ir.code.ValueType type -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():28:28 -> <clinit>
@@ -4019,10 +4022,10 @@
     boolean isJump() -> r
     1:13:int getOpcode():52:64 -> t
     1:1:com.android.tools.r8.ir.code.ValueType getType():37:37 -> u
-com.android.tools.r8.cf.code.CfReturn$1 -> com.android.tools.r8.internal.S4$a:
+com.android.tools.r8.cf.code.CfReturn$1 -> com.android.tools.r8.internal.F4$a:
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:void <clinit>():52:52 -> <clinit>
-com.android.tools.r8.cf.code.CfReturnVoid -> com.android.tools.r8.internal.T4:
+com.android.tools.r8.cf.code.CfReturnVoid -> com.android.tools.r8.internal.G4:
     1:1:void <init>():25:25 -> <init>
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):40:40 -> 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):53:53 -> a
@@ -4035,7 +4038,7 @@
     int getCompareToId() -> n
     boolean isJump() -> r
     boolean isReturn() -> s
-com.android.tools.r8.cf.code.CfStackInstruction -> com.android.tools.r8.internal.Z4:
+com.android.tools.r8.cf.code.CfStackInstruction -> com.android.tools.r8.internal.M4:
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode opcode -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():30:30 -> <clinit>
@@ -4255,10 +4258,10 @@
     boolean emitsIR() -> m
     1:1:int getCompareToId():87:87 -> n
     1:1:com.android.tools.r8.cf.code.CfStackInstruction$Opcode getOpcode():115:115 -> t
-com.android.tools.r8.cf.code.CfStackInstruction$1 -> com.android.tools.r8.internal.Z4$a:
+com.android.tools.r8.cf.code.CfStackInstruction$1 -> com.android.tools.r8.internal.M4$a:
     int[] $SwitchMap$com$android$tools$r8$cf$code$CfStackInstruction$Opcode -> a
     1:1:void <clinit>():120:120 -> <clinit>
-com.android.tools.r8.cf.code.CfStackInstruction$Opcode -> com.android.tools.r8.internal.Z4$b:
+com.android.tools.r8.cf.code.CfStackInstruction$Opcode -> com.android.tools.r8.internal.M4$b:
     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
@@ -4275,7 +4278,7 @@
     1:2:void <init>(java.lang.String,int,int):45:46 -> <init>
     1:1:int access$000(com.android.tools.r8.cf.code.CfStackInstruction$Opcode):32:32 -> a
     2:2:com.android.tools.r8.cf.code.CfStackInstruction$Opcode[] values():32:32 -> a
-com.android.tools.r8.cf.code.CfStore -> com.android.tools.r8.internal.k5:
+com.android.tools.r8.cf.code.CfStore -> com.android.tools.r8.internal.X4:
     com.android.tools.r8.ir.code.ValueType type -> b
     int var -> a
     1:3:void <init>(com.android.tools.r8.ir.code.ValueType,int):34:36 -> <init>
@@ -4300,53 +4303,53 @@
     1:1:int getLocalIndex():100:100 -> t
     1:13:int getStoreType():51:63 -> u
     1:1:com.android.tools.r8.ir.code.ValueType getType():96:96 -> v
-com.android.tools.r8.cf.code.CfStore$1 -> com.android.tools.r8.internal.k5$a:
+com.android.tools.r8.cf.code.CfStore$1 -> com.android.tools.r8.internal.X4$a:
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:void <clinit>():51:51 -> <clinit>
-com.android.tools.r8.cf.code.CfSwitch -> com.android.tools.r8.internal.l5:
+com.android.tools.r8.cf.code.CfSwitch -> com.android.tools.r8.internal.Y4:
     java.util.List targets -> e
     int[] keys -> d
     com.android.tools.r8.cf.code.CfSwitch$Kind kind -> b
     boolean $assertionsDisabled -> a
     com.android.tools.r8.cf.code.CfLabel defaultTarget -> c
-    1:1:void <clinit>():29:29 -> <clinit>
-    1:7:void <init>(com.android.tools.r8.cf.code.CfSwitch$Kind,com.android.tools.r8.cf.code.CfLabel,int[],java.util.List):38:44 -> <init>
-    1:2:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):55:56 -> a
-    3:3:void lambda$internalAcceptCompareTo$1(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):60:60 -> a
+    1:1:void <clinit>():30:30 -> <clinit>
+    1:7:void <init>(com.android.tools.r8.cf.code.CfSwitch$Kind,com.android.tools.r8.cf.code.CfLabel,int[],java.util.List):39:45 -> <init>
+    1:2:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):56:57 -> a
+    3:3:void lambda$internalAcceptCompareTo$1(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):61:61 -> a
     4:4:com.android.tools.r8.utils.structural.StructuralSpecification com.android.tools.r8.utils.structural.StructuralSpecification.withCustomItem(java.util.function.Function,com.android.tools.r8.utils.structural.StructuralAcceptor):43:43 -> a
-    4:4:void lambda$internalAcceptCompareTo$1(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):60 -> a
-    5:7:void lambda$internalAcceptCompareTo$1(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):60:62 -> a
-    8:8:int[] lambda$internalAcceptCompareTo$0(com.android.tools.r8.cf.code.CfSwitch):61:61 -> a
-    9:20: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:117 -> a
-    21: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):112:112 -> a
-    22:22:void print(com.android.tools.r8.cf.CfPrinter):124:124 -> a
-    23:28:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):129:134 -> a
-    29:29:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):140:140 -> a
+    4:4:void lambda$internalAcceptCompareTo$1(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):61 -> a
+    5:7:void lambda$internalAcceptCompareTo$1(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):61:63 -> a
+    8:8:int[] lambda$internalAcceptCompareTo$0(com.android.tools.r8.cf.code.CfSwitch):62:62 -> a
+    9:20: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):107:118 -> a
+    21: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):113:113 -> a
+    22:22:void print(com.android.tools.r8.cf.CfPrinter):125:125 -> a
+    23:28:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):130:135 -> a
+    29:29:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):141:141 -> a
     30:30:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():264:264 -> 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):140 -> 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):152:152 -> 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):141 -> 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):153:153 -> a
     32:33: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
-    32:33: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
-    34:38: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:157 -> a
-    1:1:int getCompareToId():49:49 -> n
+    32:33: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 -> a
+    34:38: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):154:158 -> a
+    1:1:int getCompareToId():50:50 -> n
     boolean isJump() -> r
-    1:1:com.android.tools.r8.cf.code.CfLabel getDefaultTarget():70:70 -> t
-    1:1:java.util.List getKeys():74:74 -> u
+    1:1:com.android.tools.r8.cf.code.CfLabel getDefaultTarget():71:71 -> t
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList getKeys():75:75 -> u
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>(int[]):135:135 -> u
-    2:2:java.util.List 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$1 -> com.android.tools.r8.internal.l5$a:
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList getKeys():75 -> u
+    1:1:com.android.tools.r8.cf.code.CfSwitch$Kind getKind():67:67 -> v
+    1:1:java.util.List getSwitchTargets():79:79 -> w
+com.android.tools.r8.cf.code.CfSwitch$1 -> com.android.tools.r8.internal.Y4$a:
     int[] $SwitchMap$com$android$tools$r8$cf$code$CfSwitch$Kind -> a
-    1:1:void <clinit>():110:110 -> <clinit>
-com.android.tools.r8.cf.code.CfSwitch$Kind -> com.android.tools.r8.internal.l5$b:
+    1:1:void <clinit>():111:111 -> <clinit>
+com.android.tools.r8.cf.code.CfSwitch$Kind -> com.android.tools.r8.internal.Y4$b:
     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>():31:31 -> <clinit>
-    1:1:void <init>(java.lang.String,int):31:31 -> <init>
-    1:1:com.android.tools.r8.cf.code.CfSwitch$Kind[] values():31:31 -> a
-com.android.tools.r8.cf.code.CfThrow -> com.android.tools.r8.internal.m5:
+    1:1:void <clinit>():32:32 -> <clinit>
+    1:1:void <init>(java.lang.String,int):32:32 -> <init>
+    1:1:com.android.tools.r8.cf.code.CfSwitch$Kind[] values():32:32 -> a
+com.android.tools.r8.cf.code.CfThrow -> com.android.tools.r8.internal.Z4:
     1:1:void <init>():26:26 -> <init>
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):41:41 -> 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):64:64 -> a
@@ -4362,7 +4365,7 @@
     boolean canThrow() -> l
     int getCompareToId() -> n
     boolean isJump() -> r
-com.android.tools.r8.cf.code.CfTryCatch -> com.android.tools.r8.internal.n5:
+com.android.tools.r8.cf.code.CfTryCatch -> com.android.tools.r8.internal.a5:
     java.util.List targets -> f
     java.util.List guards -> e
     boolean $assertionsDisabled -> a
@@ -4700,8 +4703,8 @@
     int getSize() -> w
 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.x3:
-com.android.tools.r8.code.CfOrDexInstruction -> com.android.tools.r8.internal.N4:
+com.android.tools.r8.code.BytecodeStream -> com.android.tools.r8.internal.k3:
+com.android.tools.r8.code.CfOrDexInstruction -> com.android.tools.r8.internal.A4:
     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):25:25 -> <init>
@@ -4935,7 +4938,7 @@
     11:11:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):103:103 -> a
     1:1:com.android.tools.r8.graph.DexString lambda$internalSubSpecify$0(com.android.tools.r8.code.Format21c):39:39 -> b
     2:2:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):78:78 -> b
-    com.android.tools.r8.code.ConstString asConstString() -> e
+    com.android.tools.r8.code.ConstString asConstString() -> f
     boolean canThrow() -> m
     java.lang.String getName() -> s
     int getOpcode() -> u
@@ -5068,8 +5071,9 @@
     java.lang.String getSmaliName() -> x
 com.android.tools.r8.code.DexCompareHelper -> com.android.tools.r8.code.f0:
     int DEX_ITEM_CONST_STRING_COMPARE_ID -> b
-    boolean $assertionsDisabled -> c
+    int HIGHEST_DEX_OPCODE -> c
     int INIT_CLASS_COMPARE_ID -> a
+    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():320:320 -> a
@@ -6071,9 +6075,9 @@
     11:11:void write16BitValue(int,java.nio.ShortBuffer):111:111 -> a
     11:11:void write16BitReference(com.android.tools.r8.graph.IndexedDexItem,java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):128 -> a
     12:20:java.lang.String formatSmaliString(java.lang.String):268:276 -> a
-    21:21:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):338:338 -> a
-    22:22:java.lang.String toSmaliString(com.android.tools.r8.code.Instruction):350:350 -> a
-    23:23:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.code.Instruction):362:362 -> a
+    21:21:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):335:335 -> a
+    22:22:java.lang.String toSmaliString(com.android.tools.r8.code.Instruction):347:347 -> a
+    23:23:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.code.Instruction):359:359 -> 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):73:74 -> b
@@ -6093,12 +6097,12 @@
     5:5:java.lang.String formatDecimalOffset(int):251:251 -> d
     5:5:java.lang.String formatRelativeOffset(int):255 -> d
     6:6:java.lang.String formatRelativeOffset(int):255:255 -> d
-    com.android.tools.r8.code.ConstString asConstString() -> e
     int makeByte(int,int) -> e
     1:2:int readSigned32BitValue(com.android.tools.r8.code.BytecodeStream):66:67 -> e
+    3:3:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():316:316 -> e
     1:1:boolean equals(java.lang.Object):303:303 -> equals
+    com.android.tools.r8.code.ConstString asConstString() -> f
     1:1:byte readSigned8BitValue(com.android.tools.r8.code.BytecodeStream):49:49 -> f
-    2:2:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():316:316 -> f
     com.android.tools.r8.code.ConstStringJumbo asConstStringJumbo() -> g
     1:1:void setOffset(int):141:141 -> g
     com.android.tools.r8.code.DexItemBasedConstString asDexItemBasedConstString() -> h
@@ -6113,7 +6117,7 @@
     com.android.tools.r8.graph.DexMethod getMethod() -> r
     java.lang.String getName() -> s
     1:1:int getOffset():137:137 -> t
-    1:1:java.lang.String toString():367:367 -> toString
+    1:1:java.lang.String toString():364:364 -> toString
     int getOpcode() -> u
     int getPayloadOffset() -> v
     int getSize() -> w
@@ -7849,8 +7853,10 @@
 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>
-    boolean isIntSwitch() -> D
-    1:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):46:49 -> a
+    1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):46:46 -> a
+    2:2:int com.android.tools.r8.code.Format31t.getPayloadOffset():58:58 -> a
+    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() -> s
     int getOpcode() -> u
@@ -8295,7 +8301,10 @@
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int):20:20 -> <init>
     boolean isIntSwitch() -> D
-    1:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):45:48 -> 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():58:58 -> 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() -> s
     int getOpcode() -> u
@@ -8660,7 +8669,42 @@
     1:1:void <clinit>():29:29 -> <clinit>
     1:1:void <init>():36:36 -> <init>
     java.lang.Object or(java.lang.Object) -> a
-com.android.tools.r8.com.google.common.base.CharMatcher -> com.android.tools.r8.internal.F5:
+com.android.tools.r8.com.google.common.base.Ascii -> com.android.tools.r8.internal.E1:
+    int com.android.tools.r8.com.google.common.primitives.Ints.saturatedCast(long) -> a
+    1:13:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):42:54 -> a
+    14:14:boolean com.android.tools.r8.ir.code.Instruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):606:606 -> a
+    14:14:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):55 -> a
+    15:15:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56:56 -> a
+    16:16:boolean com.android.tools.r8.ir.code.Instruction.isInvokeNewArray():0:0 -> a
+    16:16:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):62 -> a
+    17:17:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> a
+    17:17:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):63 -> a
+    18:18:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayFilledData():0:0 -> a
+    18:18:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):64 -> a
+    19:29:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):71:81 -> a
+    30:39:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):78:87 -> a
+    40:67:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):65:92 -> a
+    68:81:boolean com.android.tools.r8.ir.code.IRCode.controlFlowMayDependOnEnvironment(java.util.function.Consumer):301:314 -> a
+    68:81:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):92 -> a
+    82:95:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):93:106 -> a
+    96:114:com.android.tools.r8.com.google.gson.JsonElement com.android.tools.r8.com.google.gson.internal.Streams.parse(com.android.tools.r8.com.google.gson.stream.JsonReader):46:64 -> a
+    115:115:com.android.tools.r8.com.google.gson.JsonElement com.android.tools.r8.com.google.gson.internal.Streams.parse(com.android.tools.r8.com.google.gson.stream.JsonReader):62:62 -> a
+    116:116:com.android.tools.r8.com.google.gson.JsonElement com.android.tools.r8.com.google.gson.internal.Streams.parse(com.android.tools.r8.com.google.gson.stream.JsonReader):60:60 -> a
+    117:120:com.android.tools.r8.com.google.gson.JsonElement com.android.tools.r8.com.google.gson.internal.Streams.parse(com.android.tools.r8.com.google.gson.stream.JsonReader):55:58 -> a
+    121:129:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):50:58 -> a
+    130:145:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):55:70 -> a
+    146:146:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):68:68 -> a
+    147:169:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):61:83 -> a
+    170:170:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):80:80 -> a
+    171:200:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):76:105 -> a
+    201:201:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):103:103 -> a
+    202:230:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):90:118 -> a
+    231:231:boolean com.android.tools.r8.com.google.common.base.Objects.equal(java.lang.Object,java.lang.Object):52:52 -> a
+    232:251:java.lang.String com.android.tools.r8.com.google.common.base.Strings.repeat(java.lang.String,int):146:165 -> a
+    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.r5:
     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>
@@ -8686,7 +8730,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.t5:
+com.android.tools.r8.com.google.common.base.CharMatcher$Any -> com.android.tools.r8.internal.f5:
     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>
@@ -8696,27 +8740,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.u5:
+com.android.tools.r8.com.google.common.base.CharMatcher$Ascii -> com.android.tools.r8.internal.g5:
     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.v5:
+com.android.tools.r8.com.google.common.base.CharMatcher$Digit -> com.android.tools.r8.internal.h5:
     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.w5:
+com.android.tools.r8.com.google.common.base.CharMatcher$Invisible -> com.android.tools.r8.internal.i5:
     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.x5:
+com.android.tools.r8.com.google.common.base.CharMatcher$JavaIsoControl -> com.android.tools.r8.internal.j5:
     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.y5:
+com.android.tools.r8.com.google.common.base.CharMatcher$NamedFastMatcher -> com.android.tools.r8.internal.k5:
     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>
@@ -8731,7 +8775,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.z5:
+com.android.tools.r8.com.google.common.base.CharMatcher$Negated -> com.android.tools.r8.internal.l5:
     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
@@ -8742,9 +8786,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.A5:
+com.android.tools.r8.com.google.common.base.CharMatcher$NegatedFastMatcher -> com.android.tools.r8.internal.m5:
     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.B5:
+com.android.tools.r8.com.google.common.base.CharMatcher$None -> com.android.tools.r8.internal.n5:
     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>
@@ -8754,7 +8798,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.C5:
+com.android.tools.r8.com.google.common.base.CharMatcher$RangesMatcher -> com.android.tools.r8.internal.o5:
     char[] rangeStarts -> c
     char[] rangeEnds -> d
     java.lang.String description -> b
@@ -8766,24 +8810,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.D5:
+com.android.tools.r8.com.google.common.base.CharMatcher$SingleWidth -> com.android.tools.r8.internal.p5:
     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.E5:
+com.android.tools.r8.com.google.common.base.CharMatcher$Whitespace -> com.android.tools.r8.internal.q5:
     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.L5:
+com.android.tools.r8.com.google.common.base.Charsets -> com.android.tools.r8.internal.x5:
     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.T7:
+com.android.tools.r8.com.google.common.base.CommonPattern -> com.android.tools.r8.internal.v7:
     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.Db:
+com.android.tools.r8.com.google.common.base.Equivalence -> com.android.tools.r8.internal.Xa:
     1:1:void <init>():41:41 -> <init>
     boolean doEquivalent(java.lang.Object,java.lang.Object) -> a
     int doHash(java.lang.Object) -> a
@@ -8791,8 +8835,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.Cb:
-com.android.tools.r8.com.google.common.base.Equivalence$Wrapper -> com.android.tools.r8.internal.Db$a:
+com.android.tools.r8.com.google.common.base.Equivalence$1 -> com.android.tools.r8.internal.Wa:
+com.android.tools.r8.com.google.common.base.Equivalence$Wrapper -> com.android.tools.r8.internal.Xa$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>
@@ -8803,29 +8847,24 @@
     2:2:int com.android.tools.r8.com.google.common.base.Equivalence.hash(java.lang.Object):113:113 -> hashCode
     2:2: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.dd:
-com.android.tools.r8.com.google.common.base.JdkPattern -> com.android.tools.r8.internal.cj:
+com.android.tools.r8.com.google.common.base.Function -> com.android.tools.r8.internal.sc:
+com.android.tools.r8.com.google.common.base.JdkPattern -> com.android.tools.r8.internal.ki:
     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.bj:
+com.android.tools.r8.com.google.common.base.JdkPattern$JdkMatcher -> com.android.tools.r8.internal.ji:
     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.MoreObjects -> com.android.tools.r8.internal.pr:
-    1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    1:1:java.lang.Object firstNonNull(java.lang.Object,java.lang.Object):56 -> a
-com.android.tools.r8.com.google.common.base.Objects -> com.android.tools.r8.internal.lu:
-    1:1:boolean equal(java.lang.Object,java.lang.Object):52:52 -> a
-com.android.tools.r8.com.google.common.base.Optional -> com.android.tools.r8.internal.vu:
+com.android.tools.r8.com.google.common.base.Optional -> com.android.tools.r8.internal.pt:
     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.lv:
+com.android.tools.r8.com.google.common.base.Platform -> com.android.tools.r8.internal.eu:
     com.android.tools.r8.com.google.common.base.PatternCompiler patternCompiler -> b
     java.util.logging.Logger logger -> a
     1:2:void <clinit>():35:36 -> <clinit>
@@ -8840,80 +8879,86 @@
     11:11:com.android.tools.r8.com.google.common.base.CommonPattern compilePattern(java.lang.String):66:66 -> a
     12:12:com.android.tools.r8.com.google.common.base.CommonPattern com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler.compile(java.lang.String):98:98 -> a
     12:12: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.jv:
-com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler -> com.android.tools.r8.internal.kv:
+com.android.tools.r8.com.google.common.base.Platform$1 -> com.android.tools.r8.internal.cu:
+com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler -> com.android.tools.r8.internal.du:
     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.sv:
-    1:1:void checkArgument(boolean):121:121 -> a
-    2:2:void checkArgument(boolean,java.lang.Object):135:135 -> a
-    3:3:void checkArgument(boolean,java.lang.String,char):170:170 -> a
-    4:4:void checkArgument(boolean,java.lang.String,int):181:181 -> a
-    5:5:void checkArgument(boolean,java.lang.String,long):192:192 -> a
-    6:6:void checkArgument(boolean,java.lang.String,java.lang.Object):204:204 -> a
-    7:7:void checkArgument(boolean,java.lang.String,int,int):276:276 -> a
-    8:8:java.lang.Object checkNotNull(java.lang.Object):787:787 -> a
-    9:9:java.lang.Object checkNotNull(java.lang.Object,java.lang.Object):805:805 -> a
-    10:10:int com.android.tools.r8.com.google.common.base.Preconditions.checkElementIndex(int,int,java.lang.String):1196:1196 -> a
-    10:10:int checkElementIndex(int,int):1178 -> a
-    11:11:java.lang.String com.android.tools.r8.com.google.common.base.Preconditions.badElementIndex(int,int,java.lang.String):1207:1207 -> a
-    11:11:int com.android.tools.r8.com.google.common.base.Preconditions.checkElementIndex(int,int,java.lang.String):1196 -> a
-    11:11:int checkElementIndex(int,int):1178 -> a
-    12:12:java.lang.String com.android.tools.r8.com.google.common.base.Preconditions.badElementIndex(int,int,java.lang.String):1205:1205 -> a
-    12:12:int com.android.tools.r8.com.google.common.base.Preconditions.checkElementIndex(int,int,java.lang.String):1196 -> a
-    12:12:int checkElementIndex(int,int):1178 -> a
-    13:13:java.lang.String com.android.tools.r8.com.google.common.base.Preconditions.badElementIndex(int,int,java.lang.String):1203:1203 -> a
-    13:13:int com.android.tools.r8.com.google.common.base.Preconditions.checkElementIndex(int,int,java.lang.String):1196 -> a
-    13:13:int checkElementIndex(int,int):1178 -> a
-    14:14:int com.android.tools.r8.com.google.common.base.Preconditions.checkElementIndex(int,int,java.lang.String):1196:1196 -> a
-    14:14:int checkElementIndex(int,int):1178 -> a
-    15:19:java.lang.String badPositionIndex(int,int,java.lang.String):1248:1252 -> a
-    20:20:java.lang.String badPositionIndex(int,int,java.lang.String):1250:1250 -> a
-    21:21:void checkPositionIndexes(int,int,int):1271:1271 -> a
-    22:22:java.lang.String com.android.tools.r8.com.google.common.base.Preconditions.badPositionIndexes(int,int,int):1283:1283 -> a
-    22:22:void checkPositionIndexes(int,int,int):1271 -> a
-    23:23:java.lang.String com.android.tools.r8.com.google.common.base.Preconditions.badPositionIndexes(int,int,int):1280:1280 -> a
-    23:23:void checkPositionIndexes(int,int,int):1271 -> a
-    24:24:java.lang.String com.android.tools.r8.com.google.common.base.Preconditions.badPositionIndexes(int,int,int):1277:1277 -> a
-    24:24:void checkPositionIndexes(int,int,int):1271 -> a
-    25:25:void checkPositionIndexes(int,int,int):1271:1271 -> a
-    26:54:java.lang.String format(java.lang.String,java.lang.Object[]):1298:1326 -> a
-    1:1:void checkState(boolean):443:443 -> b
-    2:2:void checkState(boolean,java.lang.Object):459:459 -> b
-    3:3:void checkState(boolean,java.lang.String,int):509:509 -> b
-    4:4:int com.android.tools.r8.com.google.common.base.Preconditions.checkPositionIndex(int,int,java.lang.String):1241:1241 -> b
-    4:4:int checkPositionIndex(int,int):1223 -> b
-com.android.tools.r8.com.google.common.base.Predicate -> com.android.tools.r8.internal.tv:
+com.android.tools.r8.com.google.common.base.Preconditions -> com.android.tools.r8.internal.lu:
+    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
+    8:8:void checkArgument(boolean):121:121 -> a
+    9:9:void checkArgument(boolean,java.lang.Object):135:135 -> a
+    10:10:com.android.tools.r8.com.google.common.base.Predicate com.android.tools.r8.com.google.common.base.Predicates.or(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):156:156 -> a
+    11:12:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    11:12:com.android.tools.r8.com.google.common.base.Predicate com.android.tools.r8.com.google.common.base.Predicates.or(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):156 -> a
+    13:13:java.util.List com.android.tools.r8.com.google.common.base.Predicates.asList(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):722:722 -> a
+    13:13:com.android.tools.r8.com.google.common.base.Predicate com.android.tools.r8.com.google.common.base.Predicates.or(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):156 -> a
+    14:14:com.android.tools.r8.com.google.common.base.Predicate com.android.tools.r8.com.google.common.base.Predicates.or(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):156:156 -> a
+    15:15:void checkArgument(boolean,java.lang.String,char):170:170 -> a
+    16:16:void checkArgument(boolean,java.lang.String,int):181:181 -> a
+    17:17:void checkArgument(boolean,java.lang.String,long):192:192 -> a
+    18:18:void checkArgument(boolean,java.lang.String,java.lang.Object):204:204 -> a
+    19:19:void checkArgument(boolean,java.lang.String,int,int):276:276 -> a
+    20:20:java.lang.Object checkNotNull(java.lang.Object):787:787 -> a
+    21:21:java.lang.Object checkNotNull(java.lang.Object,java.lang.Object):805:805 -> a
+    22:22:int com.android.tools.r8.com.google.common.base.Preconditions.checkElementIndex(int,int,java.lang.String):1196:1196 -> a
+    22:22:int checkElementIndex(int,int):1178 -> a
+    23:23:java.lang.String com.android.tools.r8.com.google.common.base.Preconditions.badElementIndex(int,int,java.lang.String):1207:1207 -> a
+    23:23:int com.android.tools.r8.com.google.common.base.Preconditions.checkElementIndex(int,int,java.lang.String):1196 -> a
+    23:23:int checkElementIndex(int,int):1178 -> a
+    24:24:java.lang.String com.android.tools.r8.com.google.common.base.Preconditions.badElementIndex(int,int,java.lang.String):1205:1205 -> a
+    24:24:int com.android.tools.r8.com.google.common.base.Preconditions.checkElementIndex(int,int,java.lang.String):1196 -> a
+    24:24:int checkElementIndex(int,int):1178 -> a
+    25:25:java.lang.String com.android.tools.r8.com.google.common.base.Preconditions.badElementIndex(int,int,java.lang.String):1203:1203 -> a
+    25:25:int com.android.tools.r8.com.google.common.base.Preconditions.checkElementIndex(int,int,java.lang.String):1196 -> a
+    25:25:int checkElementIndex(int,int):1178 -> a
+    26:26:int com.android.tools.r8.com.google.common.base.Preconditions.checkElementIndex(int,int,java.lang.String):1196:1196 -> a
+    26:26:int checkElementIndex(int,int):1178 -> a
+    27:31:java.lang.String badPositionIndex(int,int,java.lang.String):1248:1252 -> a
+    32:32:java.lang.String badPositionIndex(int,int,java.lang.String):1250:1250 -> a
+    33:33:void checkPositionIndexes(int,int,int):1271:1271 -> a
+    34:34:java.lang.String com.android.tools.r8.com.google.common.base.Preconditions.badPositionIndexes(int,int,int):1283:1283 -> a
+    34:34:void checkPositionIndexes(int,int,int):1271 -> a
+    35:35:java.lang.String com.android.tools.r8.com.google.common.base.Preconditions.badPositionIndexes(int,int,int):1280:1280 -> a
+    35:35:void checkPositionIndexes(int,int,int):1271 -> a
+    36:36:java.lang.String com.android.tools.r8.com.google.common.base.Preconditions.badPositionIndexes(int,int,int):1277:1277 -> a
+    36:36:void checkPositionIndexes(int,int,int):1271 -> a
+    37:37:void checkPositionIndexes(int,int,int):1271:1271 -> a
+    38:66:java.lang.String format(java.lang.String,java.lang.Object[]):1298:1326 -> a
+    1:1:com.android.tools.r8.com.google.common.base.Predicate com.android.tools.r8.com.google.common.base.Predicates.alwaysTrue():54:54 -> b
+    2:2:void checkState(boolean):443:443 -> b
+    3:3:void checkState(boolean,java.lang.Object):459:459 -> b
+    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.mu:
     1:1:boolean test(java.lang.Object):80:80 -> test
-com.android.tools.r8.com.google.common.base.Predicates -> com.android.tools.r8.internal.Cv:
-    1:1:com.android.tools.r8.com.google.common.base.Predicate alwaysFalse():62:62 -> a
-    2:2:com.android.tools.r8.com.google.common.base.Predicate not(com.android.tools.r8.com.google.common.base.Predicate):88:88 -> a
-    3:3:com.android.tools.r8.com.google.common.base.Predicate or(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):156:156 -> a
-    4:5:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    4:5:com.android.tools.r8.com.google.common.base.Predicate or(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):156 -> a
-    6:6:java.util.List com.android.tools.r8.com.google.common.base.Predicates.asList(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):722:722 -> a
-    6:6:com.android.tools.r8.com.google.common.base.Predicate or(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):156 -> a
-    7:7:com.android.tools.r8.com.google.common.base.Predicate or(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):156:156 -> a
-    1:1:com.android.tools.r8.com.google.common.base.Predicate alwaysTrue():54:54 -> b
-com.android.tools.r8.com.google.common.base.Predicates$1 -> com.android.tools.r8.internal.wv:
-com.android.tools.r8.com.google.common.base.Predicates$NotPredicate -> com.android.tools.r8.internal.xv:
+com.android.tools.r8.com.google.common.base.Predicates$1 -> com.android.tools.r8.internal.ou:
+com.android.tools.r8.com.google.common.base.Predicates$NotPredicate -> com.android.tools.r8.internal.pu:
     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.Av:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate -> com.android.tools.r8.internal.uu:
+    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
     com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate ALWAYS_TRUE -> a
-    1:13:void <clinit>():283:295 -> <clinit>
+    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.yv:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$1 -> com.android.tools.r8.internal.qu:
     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.zv:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$2 -> com.android.tools.r8.internal.ru:
     1:1:void <init>(java.lang.String,int):295:295 -> <init>
-com.android.tools.r8.com.google.common.base.Predicates$OrPredicate -> com.android.tools.r8.internal.Bv:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$3 -> com.android.tools.r8.internal.su:
+    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.tu:
+    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.vu:
     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>
@@ -8924,7 +8969,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.DC:
+com.android.tools.r8.com.google.common.base.Splitter -> com.android.tools.r8.internal.oB:
     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
@@ -8944,29 +8989,24 @@
     12:12:void com.android.tools.r8.com.google.common.base.Splitter.<init>(com.android.tools.r8.com.google.common.base.Splitter$Strategy):100:100 -> a
     12:12: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
     12:12: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.CC:
+com.android.tools.r8.com.google.common.base.Splitter$3 -> com.android.tools.r8.internal.nB:
     1:1:void <init>(com.android.tools.r8.com.google.common.base.CommonPattern):219:219 -> <init>
-com.android.tools.r8.com.google.common.base.Strings -> com.android.tools.r8.internal.MD:
-    1:20:java.lang.String repeat(java.lang.String,int):146:165 -> a
-    21:21:java.lang.String repeat(java.lang.String,int):155:155 -> a
-com.android.tools.r8.com.google.common.base.Supplier -> com.android.tools.r8.internal.dE:
-com.android.tools.r8.com.google.common.base.Suppliers -> com.android.tools.r8.internal.gE:
-    1:5:com.android.tools.r8.com.google.common.base.Supplier memoize(com.android.tools.r8.com.google.common.base.Supplier):97:101 -> a
-com.android.tools.r8.com.google.common.base.Suppliers$MemoizingSupplier -> com.android.tools.r8.internal.eE:
+com.android.tools.r8.com.google.common.base.Supplier -> com.android.tools.r8.internal.QC:
+com.android.tools.r8.com.google.common.base.Suppliers$MemoizingSupplier -> com.android.tools.r8.internal.RC:
     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.fE:
+com.android.tools.r8.com.google.common.base.Suppliers$NonSerializableMemoizingSupplier -> com.android.tools.r8.internal.SC:
     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.EE:
+com.android.tools.r8.com.google.common.base.Throwables -> com.android.tools.r8.internal.xD:
     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>
@@ -8988,7 +9028,7 @@
     12:12:void <clinit>():460 -> <clinit>
     13:13:java.lang.Object com.android.tools.r8.com.google.common.base.Throwables.getJLA():486:486 -> <clinit>
     13:13:void <clinit>():452 -> <clinit>
-com.android.tools.r8.com.google.common.collect.AbstractIndexedListIterator -> com.android.tools.r8.internal.q:
+com.android.tools.r8.com.google.common.collect.AbstractIndexedListIterator -> com.android.tools.r8.internal.p:
     int position -> b
     int size -> a
     1:1:void <init>(int):52:52 -> <init>
@@ -9002,19 +9042,19 @@
     1:4:java.lang.Object previous():97:100 -> previous
     5:5:java.lang.Object previous():98:98 -> previous
     1:1:int previousIndex():105:105 -> previousIndex
-com.android.tools.r8.com.google.common.collect.AbstractIterator -> com.android.tools.r8.internal.H:
+com.android.tools.r8.com.google.common.collect.AbstractIterator -> com.android.tools.r8.internal.G:
     java.lang.Object next -> b
     com.android.tools.r8.com.google.common.collect.AbstractIterator$State state -> a
     1:1:void <init>():68:68 -> <init>
     2:2:void <init>():65:65 -> <init>
-    java.lang.Object computeNext() -> f
+    java.lang.Object computeNext() -> e
     1:2:boolean hasNext():132:133 -> hasNext
     3:6:boolean com.android.tools.r8.com.google.common.collect.AbstractIterator.tryToComputeNext():144:147 -> hasNext
     3:6:boolean hasNext():140 -> hasNext
     1:1:java.lang.Object endOfData():125:125 -> k
     1:6:java.lang.Object next():156:161 -> next
     7:7:java.lang.Object next():157:157 -> next
-com.android.tools.r8.com.google.common.collect.AbstractIterator$State -> com.android.tools.r8.internal.G:
+com.android.tools.r8.com.google.common.collect.AbstractIterator$State -> com.android.tools.r8.internal.F:
     com.android.tools.r8.com.google.common.collect.AbstractIterator$State[] $VALUES -> e
     com.android.tools.r8.com.google.common.collect.AbstractIterator$State DONE -> c
     com.android.tools.r8.com.google.common.collect.AbstractIterator$State NOT_READY -> b
@@ -9191,16 +9231,16 @@
     9:18:java.util.Map$Entry pollAsMapEntry(java.util.Iterator):1583 -> a
     19:19:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps.immutableEntry(java.lang.Object,java.lang.Object):1421:1421 -> a
     19:19:java.util.Map$Entry pollAsMapEntry(java.util.Iterator):1583 -> a
-    20:20:java.util.NavigableSet com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$NavigableAsMap.createKeySet():1598:1598 -> a
-    20:20:java.util.SortedSet createKeySet():1498 -> a
+    1:1:java.util.NavigableSet com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$NavigableAsMap.createKeySet():1598:1598 -> b
+    1:1:java.util.SortedSet createKeySet():1498 -> b
     1:2:java.util.Map$Entry ceilingEntry(java.lang.Object):1533:1534 -> ceilingEntry
     1:1:java.lang.Object ceilingKey(java.lang.Object):1539:1539 -> ceilingKey
     1:1:java.util.NavigableSet descendingKeySet():1608:1608 -> descendingKeySet
     1:1:java.util.NavigableMap descendingMap():1588:1588 -> descendingMap
-    1:1:java.util.SortedSet keySet():1498:1498 -> f
     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.SortedSet keySet():1498:1498 -> g
     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
@@ -9267,10 +9307,10 @@
     java.util.SortedSet sortedKeySet -> e
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> f
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.util.SortedMap):1444:1445 -> <init>
-    1:1:java.util.SortedSet createKeySet():1494:1494 -> a
+    1:1:java.util.SortedSet createKeySet():1494:1494 -> b
     1:1:java.util.Comparator comparator():1454:1454 -> comparator
-    1:2:java.util.SortedSet keySet():1488:1489 -> f
     1:1:java.lang.Object firstKey():1459:1459 -> firstKey
+    1:2:java.util.SortedSet keySet():1488:1489 -> g
     1:1:java.util.SortedMap headMap(java.lang.Object):1469:1469 -> headMap
     1:1:java.util.SortedMap sortedMap():1449:1449 -> j
     1:1:java.util.Set keySet():1442:1442 -> keySet
@@ -9327,7 +9367,7 @@
     2:5:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection):466:469 -> <init>
     6:6:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection,java.util.Iterator):472:472 -> <init>
     7:14:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection,java.util.Iterator):466:473 -> <init>
-    1:3:void validateIterator():481:483 -> f
+    1:3:void validateIterator():481:483 -> e
     1:2:boolean hasNext():489:490 -> hasNext
     1:2:java.lang.Object next():495:496 -> next
     1:3:void remove():501:503 -> remove
@@ -9434,13 +9474,13 @@
     1:1:java.util.Iterator descendingIterator():756:756 -> descendingIterator
     1:1:java.util.NavigableSet descendingSet():751:751 -> descendingSet
     1:1:java.util.SortedSet getSortedSetDelegate():703:703 -> e
-    1:1:java.util.Collection com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection.getDelegate():448:448 -> f
-    1:1:java.util.SortedSet com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedSortedSet.getSortedSetDelegate():655 -> f
-    1:1:java.util.NavigableSet getSortedSetDelegate():712 -> f
-    2:2:java.util.SortedSet com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedSortedSet.getSortedSetDelegate():655:655 -> f
-    2:2:java.util.NavigableSet getSortedSetDelegate():712 -> f
-    3:3:java.util.NavigableSet getSortedSetDelegate():712:712 -> f
     1:1:java.lang.Object floor(java.lang.Object):722:722 -> floor
+    1:1:java.util.Collection com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection.getDelegate():448:448 -> g
+    1:1:java.util.SortedSet com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedSortedSet.getSortedSetDelegate():655 -> g
+    1:1:java.util.NavigableSet getSortedSetDelegate():712 -> g
+    2:2:java.util.SortedSet com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedSortedSet.getSortedSetDelegate():655:655 -> g
+    2:2:java.util.NavigableSet getSortedSetDelegate():712 -> g
+    3:3:java.util.NavigableSet getSortedSetDelegate():712:712 -> g
     1:1:java.util.NavigableSet headSet(java.lang.Object,boolean):768:768 -> headSet
     1:1:java.lang.Object higher(java.lang.Object):732:732 -> higher
     1:1:java.lang.Object lower(java.lang.Object):717:717 -> lower
@@ -9634,7 +9674,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.Multiset multiset():197:197 -> a
     1:1:java.util.Iterator iterator():202:202 -> iterator
     1:1:int size():207:207 -> size
-com.android.tools.r8.com.google.common.collect.ArrayListMultimap -> com.android.tools.r8.internal.x1:
+com.android.tools.r8.com.google.common.collect.ArrayListMultimap -> com.android.tools.r8.internal.w1:
     int expectedValuesPerKey -> g
     1:1:void <init>():112:112 -> <init>
     2:2:void com.android.tools.r8.com.google.common.collect.ArrayListMultimapGwtSerializationDependencies.<init>(java.util.Map):36:36 -> <init>
@@ -9649,10 +9689,10 @@
     1:2:boolean remove(java.lang.Object,java.lang.Object):65 -> remove
     1:1:java.lang.String com.android.tools.r8.com.google.common.collect.AbstractMultimap.toString():274:274 -> toString
     1:1:java.lang.String toString():65 -> toString
-com.android.tools.r8.com.google.common.collect.BiMap -> com.android.tools.r8.internal.m2:
+com.android.tools.r8.com.google.common.collect.BiMap -> com.android.tools.r8.internal.h2:
     java.lang.Object forcePut(java.lang.Object,java.lang.Object) -> a
-    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.p3:
+    com.android.tools.r8.com.google.common.collect.BiMap inverse() -> f
+com.android.tools.r8.com.google.common.collect.ByFunctionOrdering -> com.android.tools.r8.internal.c3:
     com.android.tools.r8.com.google.common.base.Function function -> a
     com.android.tools.r8.com.google.common.collect.Ordering ordering -> b
     1:3:void <init>(com.android.tools.r8.com.google.common.base.Function,com.android.tools.r8.com.google.common.collect.Ordering):36:38 -> <init>
@@ -9662,28 +9702,11 @@
     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.A7:
+com.android.tools.r8.com.google.common.collect.CollectCollectors -> com.android.tools.r8.internal.l7:
     java.util.stream.Collector TO_IMMUTABLE_SET -> a
     1:25:void <clinit>():44:68 -> <clinit>
     1:1:java.util.stream.Collector toImmutableSet():75:75 -> a
-com.android.tools.r8.com.google.common.collect.CollectPreconditions -> com.android.tools.r8.internal.B7:
-    1:1:void checkEntryNotNull(java.lang.Object,java.lang.Object):34:34 -> a
-    2:2:void checkEntryNotNull(java.lang.Object,java.lang.Object):32:32 -> a
-    3:3:int checkNonnegative(int,java.lang.String):41:41 -> a
-com.android.tools.r8.com.google.common.collect.CollectSpliterators -> com.android.tools.r8.internal.G7:
-    1:46:java.util.Spliterator indexed(int,int,java.util.function.IntFunction,java.util.Comparator):49:94 -> a
-    47:50:java.util.Spliterator flatMap(java.util.Spliterator,java.util.function.Function,int,long):201:204 -> a
-    51:51:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    51:51:java.util.Spliterator flatMap(java.util.Spliterator,java.util.function.Function,int,long):207 -> a
-    52:52:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    52:52:java.util.Spliterator flatMap(java.util.Spliterator,java.util.function.Function,int,long):208 -> a
-    53:53:java.util.Spliterator flatMap(java.util.Spliterator,java.util.function.Function,int,long):287:287 -> a
-    54:54:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    54:54:java.util.Spliterator map(java.util.Spliterator,java.util.function.Function):103 -> a
-    55:55:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    55:55:java.util.Spliterator map(java.util.Spliterator,java.util.function.Function):104 -> a
-    56:56:java.util.Spliterator map(java.util.Spliterator,java.util.function.Function):105:105 -> a
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$1 -> com.android.tools.r8.internal.C7:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1 -> com.android.tools.r8.internal.m7:
     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>
@@ -9699,7 +9722,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.D7:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1FlatMapSpliterator -> com.android.tools.r8.internal.n7:
     long estimatedSize -> d
     java.util.function.Function val$function -> e
     java.util.Spliterator from -> b
@@ -9713,7 +9736,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.E7:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1Splitr -> com.android.tools.r8.internal.o7:
     java.util.function.Predicate val$predicate -> c
     java.lang.Object holder -> a
     java.util.Spliterator val$fromSpliterator -> b
@@ -9729,7 +9752,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.F7:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1WithCharacteristics -> com.android.tools.r8.internal.p7:
     java.util.Comparator val$comparator -> c
     java.util.Spliterator delegate -> a
     int val$extraCharacteristics -> b
@@ -9740,14 +9763,226 @@
     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.ComparatorOrdering -> com.android.tools.r8.internal.U7:
+com.android.tools.r8.com.google.common.collect.Collections2 -> com.android.tools.r8.internal.s7:
+    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
+    3:3:int com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkNonnegative(int,java.lang.String):41:41 -> a
+    4:49:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.indexed(int,int,java.util.function.IntFunction,java.util.Comparator):49:94 -> a
+    50:51:int com.android.tools.r8.com.google.common.collect.Hashing.closedTableSize(int,double):62:63 -> a
+    52:52:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList():88:88 -> a
+    52:52:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.util.Iterator):164 -> a
+    53:53:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.util.Iterator):165:165 -> a
+    54:54:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator com.android.tools.r8.com.google.common.collect.Iterators.emptyListIterator():90:90 -> a
+    54:54:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.emptyIterator():78 -> a
+    55:56:boolean com.android.tools.r8.com.google.common.collect.Iterables.contains(java.lang.Iterable,java.lang.Object):138:139 -> a
+    57:57:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    57:57:boolean com.android.tools.r8.com.google.common.collect.Collections2.safeContains(java.util.Collection,java.lang.Object):107 -> a
+    57:57:boolean com.android.tools.r8.com.google.common.collect.Iterables.contains(java.lang.Iterable,java.lang.Object):140 -> a
+    58:58:boolean com.android.tools.r8.com.google.common.collect.Collections2.safeContains(java.util.Collection,java.lang.Object):109:109 -> a
+    58:58:boolean com.android.tools.r8.com.google.common.collect.Iterables.contains(java.lang.Iterable,java.lang.Object):140 -> a
+    59:59:boolean com.android.tools.r8.com.google.common.collect.Iterables.contains(java.lang.Iterable,java.lang.Object):142:142 -> a
+    60:64:java.util.stream.Stream com.android.tools.r8.com.google.common.collect.Streams.concat(java.util.stream.Stream[]):148:152 -> a
+    65:65: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
+    65:65:java.util.stream.Stream com.android.tools.r8.com.google.common.collect.Streams.concat(java.util.stream.Stream[]):153 -> a
+    66:71:java.util.stream.Stream com.android.tools.r8.com.google.common.collect.Streams.concat(java.util.stream.Stream[]):154:159 -> a
+    72:72:java.util.stream.Stream com.android.tools.r8.com.google.common.collect.Streams.concat(java.util.stream.Stream[]):158:158 -> a
+    73:73:java.util.stream.Stream com.android.tools.r8.com.google.common.collect.Streams.concat(java.util.stream.Stream[]):157:157 -> a
+    74:81:boolean com.android.tools.r8.com.google.common.collect.Iterators.contains(java.util.Iterator,java.lang.Object):180:187 -> a
+    82:85:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.flatMap(java.util.Spliterator,java.util.function.Function,int,long):201:204 -> a
+    86:86:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    86:86:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.flatMap(java.util.Spliterator,java.util.function.Function,int,long):207 -> a
+    87:87:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    87:87:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.flatMap(java.util.Spliterator,java.util.function.Function,int,long):208 -> a
+    88:88:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.flatMap(java.util.Spliterator,java.util.function.Function,int,long):287:287 -> a
+    89:91:boolean com.android.tools.r8.com.google.common.collect.Iterators.removeAll(java.util.Iterator,java.util.Collection):208:210 -> a
+    92:92:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.checkElementsNotNull(java.lang.Object[]):219:219 -> a
+    93:93:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.checkElementsNotNull(java.lang.Object[],int):225:225 -> a
+    93:93:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.checkElementsNotNull(java.lang.Object[]):219 -> a
+    94:94:java.lang.Object com.android.tools.r8.com.google.common.collect.ObjectArrays.checkElementNotNull(java.lang.Object,int):235:235 -> a
+    95:95:com.android.tools.r8.com.google.common.collect.FluentIterable com.android.tools.r8.com.google.common.collect.FluentIterable.concat(java.lang.Iterable):294:294 -> a
+    95:95:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable):503 -> a
+    96:96:int com.android.tools.r8.com.google.common.collect.Maps.capacity(int):309:309 -> a
+    97:97:boolean com.android.tools.r8.com.google.common.collect.Iterables.addAll(java.util.Collection,java.lang.Iterable):331:331 -> a
+    98:98:java.util.Collection com.android.tools.r8.com.google.common.collect.Collections2.cast(java.lang.Iterable):377:377 -> a
+    98:98:boolean com.android.tools.r8.com.google.common.collect.Iterables.addAll(java.util.Collection,java.lang.Iterable):332 -> a
+    99:99:boolean com.android.tools.r8.com.google.common.collect.Iterables.addAll(java.util.Collection,java.lang.Iterable):333:333 -> a
+    100:100:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    100:100:boolean com.android.tools.r8.com.google.common.collect.Iterables.addAll(java.util.Collection,java.lang.Iterable):335 -> a
+    101:101:boolean com.android.tools.r8.com.google.common.collect.Iterables.addAll(java.util.Collection,java.lang.Iterable):335:335 -> a
+    102:102:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
+    103:103: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
+    104:104:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    104:104: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
+    104:104: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
+    105:107: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
+    105:107: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
+    108:108: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
+    109:109:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    109:109: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
+    109:109: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 -> a
+    110:110:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    110:110: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):744 -> a
+    110:110: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 -> a
+    111:113: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):745:747 -> a
+    111:113: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 -> a
+    114:114:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    114:114:boolean com.android.tools.r8.com.google.common.collect.Iterators.addAll(java.util.Collection,java.util.Iterator):369 -> a
+    115:115:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    115:115:boolean com.android.tools.r8.com.google.common.collect.Iterators.addAll(java.util.Collection,java.util.Iterator):370 -> a
+    116:117:boolean com.android.tools.r8.com.google.common.collect.Iterators.addAll(java.util.Collection,java.util.Iterator):372:373 -> a
+    118:118:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    118:118:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.concat(java.util.Iterator,java.util.Iterator):501 -> a
+    119:119:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    119:119:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.concat(java.util.Iterator,java.util.Iterator):502 -> a
+    120:120:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.concat(java.util.Iterator,java.util.Iterator):503:503 -> a
+    121:121:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.consumingForArray(java.lang.Object[]):471:471 -> a
+    121:121:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.concat(java.util.Iterator,java.util.Iterator):503 -> a
+    122:122:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.concat(java.util.Iterator):578:578 -> a
+    122:122:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.concat(java.util.Iterator,java.util.Iterator):503 -> a
+    123:123:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    123:123:boolean com.android.tools.r8.com.google.common.collect.SortedIterables.hasSameComparator(java.util.Comparator,java.lang.Iterable):37 -> a
+    124:124:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    124:124:boolean com.android.tools.r8.com.google.common.collect.SortedIterables.hasSameComparator(java.util.Comparator,java.lang.Iterable):38 -> a
+    125:126:boolean com.android.tools.r8.com.google.common.collect.SortedIterables.hasSameComparator(java.util.Comparator,java.lang.Iterable):40:41 -> a
+    127:129:java.util.Comparator com.android.tools.r8.com.google.common.collect.SortedIterables.comparator(java.util.SortedSet):53:55 -> a
+    127:129:boolean com.android.tools.r8.com.google.common.collect.SortedIterables.hasSameComparator(java.util.Comparator,java.lang.Iterable):41 -> a
+    130:135:boolean com.android.tools.r8.com.google.common.collect.SortedIterables.hasSameComparator(java.util.Comparator,java.lang.Iterable):42:47 -> a
+    136:136:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    136:136:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.limit(java.util.Iterator,int):950 -> a
+    137:138:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.limit(java.util.Iterator,int):951:952 -> a
+    139:139:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    139:139:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.map(java.util.Spliterator,java.util.function.Function):103 -> a
+    140:140:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    140:140:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.map(java.util.Spliterator,java.util.function.Function):104 -> a
+    141:141:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.map(java.util.Spliterator,java.util.function.Function):105:105 -> a
+    142:142:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    142:142:java.util.stream.Stream com.android.tools.r8.com.google.common.collect.Streams.mapWithIndex(java.util.stream.Stream,com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex):342 -> a
+    143:143:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    143:143:java.util.stream.Stream com.android.tools.r8.com.google.common.collect.Streams.mapWithIndex(java.util.stream.Stream,com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex):343 -> a
+    144:152:java.util.stream.Stream com.android.tools.r8.com.google.common.collect.Streams.mapWithIndex(java.util.stream.Stream,com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex):344:352 -> a
+    153:200:java.util.stream.Stream com.android.tools.r8.com.google.common.collect.Streams.mapWithIndex(java.util.stream.Stream,com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex):349:396 -> a
+    201:201:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    201:201:boolean com.android.tools.r8.com.google.common.collect.Sets.removeAllImpl(java.util.Set,java.util.Collection):1987 -> a
+    202:215:boolean com.android.tools.r8.com.google.common.collect.Sets.removeAllImpl(java.util.Set,java.util.Collection):1988:2001 -> a
+    216:216:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    216:216:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps.safeGet(java.util.Map,java.lang.Object):3704 -> a
+    217:217:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps.safeGet(java.util.Map,java.lang.Object):3706:3706 -> a
+    218:218:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    218:218:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.transform(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):720 -> a
+    219:219:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    219:219:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.transform(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):721 -> a
+    220:220:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.transform(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):722:722 -> a
+    221:221:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    221:221:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.transform(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):816 -> a
+    222:222:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.transform(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):817:817 -> a
+    223:223:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    223:223:java.util.stream.Stream com.android.tools.r8.com.google.common.collect.Streams.zip(java.util.stream.Stream,java.util.stream.Stream,java.util.function.BiFunction):235 -> a
+    224:224:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    224:224:java.util.stream.Stream com.android.tools.r8.com.google.common.collect.Streams.zip(java.util.stream.Stream,java.util.stream.Stream,java.util.function.BiFunction):236 -> a
+    225:225:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    225:225:java.util.stream.Stream com.android.tools.r8.com.google.common.collect.Streams.zip(java.util.stream.Stream,java.util.stream.Stream,java.util.function.BiFunction):237 -> a
+    226:237:java.util.stream.Stream com.android.tools.r8.com.google.common.collect.Streams.zip(java.util.stream.Stream,java.util.stream.Stream,java.util.function.BiFunction):238:249 -> a
+    238:238:java.util.stream.Stream com.android.tools.r8.com.google.common.collect.Streams.zip(java.util.stream.Stream,java.util.stream.Stream,java.util.function.BiFunction):247:247 -> a
+    239:246:java.util.List com.android.tools.r8.com.google.common.collect.Lists.reverse(java.util.List):840:847 -> a
+    247:259:boolean com.android.tools.r8.com.google.common.collect.Multisets.equalsImpl(com.android.tools.r8.com.google.common.collect.Multiset,java.lang.Object):880:892 -> a
+    260:263:com.android.tools.r8.com.google.common.collect.Sets$SetView com.android.tools.r8.com.google.common.collect.Sets.difference(java.util.Set,java.util.Set):911:914 -> a
+    264:281:boolean com.android.tools.r8.com.google.common.collect.Lists.equalsImpl(java.util.List,java.lang.Object):1017:1034 -> a
+    282:292:boolean com.android.tools.r8.com.google.common.collect.Iterators.elementsEqual(java.util.Iterator,java.util.Iterator):274:284 -> a
+    282:292:boolean com.android.tools.r8.com.google.common.collect.Lists.equalsImpl(java.util.List,java.lang.Object):1034 -> a
+    293:298:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator com.android.tools.r8.com.google.common.collect.Iterators.forArray(java.lang.Object[],int,int,int):1085:1090 -> a
+    299:299:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator com.android.tools.r8.com.google.common.collect.Iterators.emptyListIterator():90:90 -> a
+    299:299:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator com.android.tools.r8.com.google.common.collect.Iterators.forArray(java.lang.Object[],int,int,int):1092 -> a
+    300:300:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator com.android.tools.r8.com.google.common.collect.Iterators.forArray(java.lang.Object[],int,int,int):1094:1094 -> a
+    301:301:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.singletonIterator(java.lang.Object):1104:1104 -> a
+    302:302:java.util.Spliterator com.android.tools.r8.com.google.common.collect.Multisets.lambda$spliteratorImpl$2(com.android.tools.r8.com.google.common.collect.Multiset$Entry):1126:1126 -> a
+    303:305:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.Multisets.copyHighestCountFirst(com.android.tools.r8.com.google.common.collect.Multiset):1159:1161 -> a
+    306:306:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.ImmutableMultiset.copyFromEntries(java.util.Collection):216:216 -> a
+    306:306:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.Multisets.copyHighestCountFirst(com.android.tools.r8.com.google.common.collect.Multiset):1161 -> a
+    307:307:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.ImmutableMultiset.of():101:101 -> a
+    307:307:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.ImmutableMultiset.copyFromEntries(java.util.Collection):217 -> a
+    307:307:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.Multisets.copyHighestCountFirst(com.android.tools.r8.com.google.common.collect.Multiset):1161 -> a
+    308:308:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.ImmutableMultiset.copyFromEntries(java.util.Collection):219:219 -> a
+    308:308:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.Multisets.copyHighestCountFirst(com.android.tools.r8.com.google.common.collect.Multiset):1161 -> a
+    309:310:int com.android.tools.r8.com.google.common.collect.Sets.hashCodeImpl(java.util.Set):1770:1771 -> a
+    311:315:boolean com.android.tools.r8.com.google.common.collect.Sets.equalsImpl(java.util.Set,java.lang.Object):1786:1790 -> a
+    316:319:java.util.NavigableSet com.android.tools.r8.com.google.common.collect.Sets.unmodifiableNavigableSet(java.util.NavigableSet):1817:1820 -> a
+    320:321:boolean com.android.tools.r8.com.google.common.collect.Sets.removeAllImpl(java.util.Set,java.util.Iterator):1980:1981 -> a
+    322:327:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.Maps.indexMap(java.util.Collection):4375:4380 -> a
+    322:327:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.combinations(java.util.Set,int):1668 -> a
+    328:331:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.combinations(java.util.Set,int):1669:1672 -> a
+    332:332:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():74:74 -> a
+    332:332:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.combinations(java.util.Set,int):1672 -> a
+    333:333:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of(java.lang.Object):83:83 -> a
+    333:333:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.combinations(java.util.Set,int):1672 -> a
+    334:335:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.combinations(java.util.Set,int):1673:1674 -> a
+    336:336:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of(java.lang.Object):83:83 -> a
+    336:336:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.combinations(java.util.Set,int):1674 -> a
+    337:337:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.combinations(java.util.Set,int):1676:1676 -> a
+    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: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
+    4:18:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.getOnlyElement(java.util.Iterator):314:328 -> c
+    4:18:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getOnlyElement(java.lang.Iterable):266 -> c
+    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.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
+    3:3:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSet(java.lang.Object[]):235 -> d
+    4:4:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSet(java.lang.Object[]):236:236 -> d
+    5:5:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> d
+    5:5:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Iterable):146 -> d
+    6:6:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Iterable):148:148 -> d
+    7:7:java.util.Collection com.android.tools.r8.com.google.common.collect.Collections2.cast(java.lang.Iterable):377:377 -> d
+    7:7:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Iterable):149 -> d
+    8:9:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Iterable):149:150 -> d
+    10:10:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> d
+    10:10:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.unmodifiableIterator(java.util.Iterator):131 -> d
+    11:16:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.unmodifiableIterator(java.util.Iterator):132:137 -> d
+    1:3:int com.android.tools.r8.com.google.common.collect.Iterables.size(java.lang.Iterable):126:128 -> e
+    4:8:int com.android.tools.r8.com.google.common.collect.Iterators.size(java.util.Iterator):168:172 -> e
+    4:8:int com.android.tools.r8.com.google.common.collect.Iterables.size(java.lang.Iterable):128 -> e
+    9:9:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():511:511 -> e
+    1:3:java.util.stream.Stream com.android.tools.r8.com.google.common.collect.Streams.stream(java.lang.Iterable):62:64 -> f
+    4:4:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():511:511 -> f
+    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.w7:
     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.E8:
+com.android.tools.r8.com.google.common.collect.Count -> com.android.tools.r8.internal.f8:
     int value -> a
     1:2:void <init>(int):30:31 -> <init>
     1:1:int get():35:35 -> a
@@ -9758,11 +9993,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.Ia:
+com.android.tools.r8.com.google.common.collect.EmptyImmutableListMultimap -> com.android.tools.r8.internal.da:
     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.Pc:
+com.android.tools.r8.com.google.common.collect.FluentIterable -> com.android.tools.r8.internal.fc:
     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
@@ -9780,18 +10015,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.Nc:
+com.android.tools.r8.com.google.common.collect.FluentIterable$2 -> com.android.tools.r8.internal.dc:
     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.Mc:
+com.android.tools.r8.com.google.common.collect.FluentIterable$2$1 -> com.android.tools.r8.internal.cc:
     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.Oc:
+com.android.tools.r8.com.google.common.collect.FluentIterable$3 -> com.android.tools.r8.internal.ec:
     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
@@ -9801,7 +10036,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.Vc:
+com.android.tools.r8.com.google.common.collect.ForwardingCollection -> com.android.tools.r8.internal.kc:
     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
@@ -9821,7 +10056,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.Wc:
+com.android.tools.r8.com.google.common.collect.ForwardingSortedSet -> com.android.tools.r8.internal.lc:
     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
@@ -9836,7 +10071,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.Gd:
+com.android.tools.r8.com.google.common.collect.HashBiMap -> com.android.tools.r8.internal.Uc:
     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
@@ -9875,24 +10110,24 @@
     136:136:com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry seekByKey(java.lang.Object,int):224:224 -> a
     137:137:java.lang.Object forcePut(java.lang.Object,java.lang.Object):268:268 -> a
     138:167:java.lang.Object put(java.lang.Object,java.lang.Object,boolean):272:301 -> a
-    168:168:java.util.Iterator entryIterator():474:474 -> a
     1:1:int access$100(com.android.tools.r8.com.google.common.collect.HashBiMap):58:58 -> b
     2:2:com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry access$400(com.android.tools.r8.com.google.common.collect.HashBiMap,java.lang.Object,int):58:58 -> b
     3:6:com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry seekByValue(java.lang.Object,int):233:236 -> b
     7:7:com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry seekByValue(java.lang.Object,int):235:235 -> b
+    8:8:java.util.Iterator entryIterator():474:474 -> b
     1:1:int access$700(com.android.tools.r8.com.google.common.collect.HashBiMap):58:58 -> c
     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.HashBiMap com.android.tools.r8.com.google.common.collect.HashBiMap.create(int):75:75 -> f
-    1:1:com.android.tools.r8.com.google.common.collect.HashBiMap create():65 -> f
+    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
     6:6:void forEach(java.util.function.BiConsumer):527:527 -> forEach
+    1:1:com.android.tools.r8.com.google.common.collect.HashBiMap com.android.tools.r8.com.google.common.collect.HashBiMap.create(int):75:75 -> g
+    1:1:com.android.tools.r8.com.google.common.collect.HashBiMap create():65 -> g
     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
@@ -9917,19 +10152,19 @@
     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
     2:2:java.util.Set values():469:469 -> values
-com.android.tools.r8.com.google.common.collect.HashBiMap$1 -> com.android.tools.r8.internal.Cd:
+com.android.tools.r8.com.google.common.collect.HashBiMap$1 -> com.android.tools.r8.internal.Qc:
     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.Cd$a:
+com.android.tools.r8.com.google.common.collect.HashBiMap$1$MapEntry -> com.android.tools.r8.internal.Qc$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.Dd:
+com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry -> com.android.tools.r8.internal.Rc:
     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
@@ -9937,21 +10172,21 @@
     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.Gd$a:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse -> com.android.tools.r8.internal.Uc$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>
     1:1:java.lang.Object forcePut(java.lang.Object,java.lang.Object):584:584 -> a
-    2:2:java.util.Iterator entryIterator():645:645 -> a
-    3:3:void lambda$forEach$0(java.util.function.BiConsumer,java.lang.Object,java.lang.Object):693:693 -> a
+    2:2:void lambda$forEach$0(java.util.function.BiConsumer,java.lang.Object,java.lang.Object):693:693 -> a
+    1:1:java.util.Iterator entryIterator():645:645 -> b
     1:1:com.android.tools.r8.com.google.common.collect.BiMap com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse.forward():553:553 -> clear
     1:1:void clear():563 -> clear
     2:2:void clear():563:563 -> clear
     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 -> e
-    1:1:com.android.tools.r8.com.google.common.collect.BiMap inverse():602 -> e
+    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: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
@@ -9981,27 +10216,27 @@
     3:3:com.android.tools.r8.com.google.common.collect.BiMap com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse.forward():553:553 -> values
     3:3:java.util.Set values():640 -> values
     4:4:java.util.Set values():640:640 -> values
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1 -> com.android.tools.r8.internal.Ed:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1 -> com.android.tools.r8.internal.Sc:
     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.Ed$a:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1$InverseEntry -> com.android.tools.r8.internal.Sc$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.Gd$a$a:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet -> com.android.tools.r8.internal.Uc$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.Fd:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet$1 -> com.android.tools.r8.internal.Tc:
     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.Gd$b:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Itr -> com.android.tools.r8.internal.Uc$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
@@ -10017,15 +10252,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.Gd$c:
+com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet -> com.android.tools.r8.internal.Uc$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.Hd:
+com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet$1 -> com.android.tools.r8.internal.Vc:
     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.Od:
+com.android.tools.r8.com.google.common.collect.HashMultiset -> com.android.tools.r8.internal.cd:
     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
@@ -10044,21 +10279,17 @@
     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.Hashing -> com.android.tools.r8.internal.Sd:
-    1:1:int smear(int):50:50 -> a
-    2:2:int smearedHash(java.lang.Object):54:54 -> a
-    3:4:int closedTableSize(int,double):62:63 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableAsList -> com.android.tools.r8.internal.we:
+com.android.tools.r8.com.google.common.collect.ImmutableAsList -> com.android.tools.r8.internal.Id:
     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() -> h
     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.xe:
+com.android.tools.r8.com.google.common.collect.ImmutableBiMap -> com.android.tools.r8.internal.Jd:
     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 -> e
+    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 -> 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
@@ -10068,7 +10299,7 @@
     1:1:java.util.Collection values():36 -> values
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableBiMap.values():358:358 -> values
     2:2:java.util.Set values():36 -> values
-com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder -> com.android.tools.r8.internal.xe$a:
+com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder -> com.android.tools.r8.internal.Jd$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
@@ -10098,9 +10329,9 @@
     34:34:com.android.tools.r8.com.google.common.collect.ImmutableBiMap build():257 -> b
     35:35:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.ImmutableBiMap.of():66:66 -> b
     35:35: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.ye:
+com.android.tools.r8.com.google.common.collect.ImmutableBiMapFauxverideShim -> com.android.tools.r8.internal.Kd:
     1:1:void <init>():32:32 -> <init>
-com.android.tools.r8.com.google.common.collect.ImmutableCollection -> com.android.tools.r8.internal.Be:
+com.android.tools.r8.com.google.common.collect.ImmutableCollection -> com.android.tools.r8.internal.Nd:
     java.lang.Object[] EMPTY_ARRAY -> a
     1:1:void <clinit>():181:181 -> <clinit>
     1:1:void <init>():168:168 -> <init>
@@ -10132,7 +10363,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.ze:
+com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder -> com.android.tools.r8.internal.Ld:
     java.lang.Object[] contents -> a
     int size -> b
     1:4:void <init>(int):459:462 -> <init>
@@ -10148,19 +10379,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.Ae:
+com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder -> com.android.tools.r8.internal.Md:
     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.De:
+com.android.tools.r8.com.google.common.collect.ImmutableEntry -> com.android.tools.r8.internal.Pd:
     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.Ee:
+com.android.tools.r8.com.google.common.collect.ImmutableEnumMap -> com.android.tools.r8.internal.Qd:
     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>
@@ -10176,9 +10407,9 @@
     1:1:java.util.Set com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.entrySet():445:445 -> entrySet
     1:1:java.util.Set com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.entrySet():0 -> entrySet
     1:4:boolean equals(java.lang.Object):86:89 -> equals
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.createEntrySet():474:474 -> f
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.createEntrySet():0 -> f
     1:1:void forEach(java.util.function.BiConsumer):103:103 -> forEach
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.createEntrySet():474:474 -> g
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.createEntrySet():0 -> g
     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.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
@@ -10195,7 +10426,7 @@
     1:1:int size():68:68 -> size
     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.Fe:
+com.android.tools.r8.com.google.common.collect.ImmutableEnumSet -> com.android.tools.r8.internal.Rd:
     java.util.EnumSet delegate -> d
     int hashCode -> e
     1:2:void <init>(java.util.EnumSet):58:59 -> <init>
@@ -10216,7 +10447,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.Ke:
+com.android.tools.r8.com.google.common.collect.ImmutableList -> com.android.tools.r8.internal.Wd:
     int $r8$clinit -> b
     1:1:void <init>():377:377 -> <init>
     com.android.tools.r8.com.google.common.collect.ImmutableList asList() -> a
@@ -10320,11 +10551,11 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList of():81:81 -> e
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList subListUnchecked(int,int):454:454 -> e
     1:1:boolean equals(java.lang.Object):663:663 -> equals
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableList reverse():598:598 -> 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.Consumer):403 -> forEach
     2:4:void forEach(java.util.function.Consumer):404:406 -> forEach
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator listIterator(int):393:393 -> g
+    2:2:com.android.tools.r8.com.google.common.collect.ImmutableList reverse():598:598 -> g
     1:3:int hashCode():669:671 -> hashCode
     1:10:int com.android.tools.r8.com.google.common.collect.Lists.indexOfRandomAccess(java.util.List,java.lang.Object):1069:1078 -> indexOf
     1:10:int com.android.tools.r8.com.google.common.collect.Lists.indexOfImpl(java.util.List,java.lang.Object):1056 -> indexOf
@@ -10343,11 +10574,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.Je:
+com.android.tools.r8.com.google.common.collect.ImmutableList$1 -> com.android.tools.r8.internal.Vd:
     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.Ke$a:
+com.android.tools.r8.com.google.common.collect.ImmutableList$Builder -> com.android.tools.r8.internal.Wd$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
@@ -10357,7 +10588,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.Le:
+com.android.tools.r8.com.google.common.collect.ImmutableList$ReverseImmutableList -> com.android.tools.r8.internal.Xd:
     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
@@ -10369,7 +10600,7 @@
     4:4:int com.android.tools.r8.com.google.common.collect.ImmutableList$ReverseImmutableList.reversePosition(int):613 -> d
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableList subList(int,int):641 -> d
     5:5:com.android.tools.r8.com.google.common.collect.ImmutableList subList(int,int):641:641 -> d
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableList reverse():618:618 -> f
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableList reverse():618:618 -> g
     1:1:int com.android.tools.r8.com.google.common.collect.ImmutableList$ReverseImmutableList.size():652:652 -> get
     1:1:java.lang.Object get(int):646 -> get
     2:3:java.lang.Object get(int):646:647 -> get
@@ -10390,7 +10621,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.Ke$b:
+com.android.tools.r8.com.google.common.collect.ImmutableList$SubList -> com.android.tools.r8.internal.Wd$b:
     com.android.tools.r8.com.google.common.collect.ImmutableList this$0 -> e
     int length -> d
     int offset -> c
@@ -10407,14 +10638,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.Ne:
+com.android.tools.r8.com.google.common.collect.ImmutableListMultimap -> com.android.tools.r8.internal.Zd:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,int):391:391 -> <init>
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableListMultimap.get(java.lang.Object):405:406 -> get
     1:2:java.util.Collection get(java.lang.Object):52 -> get
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():81:81 -> get
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableListMultimap.get(java.lang.Object):406 -> get
     3:3:java.util.Collection get(java.lang.Object):52 -> get
-com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder -> com.android.tools.r8.internal.Me:
+com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder -> com.android.tools.r8.internal.Yd:
     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
@@ -10450,7 +10681,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.Pe:
+com.android.tools.r8.com.google.common.collect.ImmutableMap -> com.android.tools.r8.internal.be:
     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
@@ -10460,38 +10691,38 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object):132:132 -> a
     2:2:com.android.tools.r8.com.google.common.collect.RegularImmutableMap com.android.tools.r8.com.google.common.collect.RegularImmutableMap.fromEntries(java.util.Map$Entry[]):54:54 -> a
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableMap of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object):132 -> a
-    3:3:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder builder():184:184 -> a
-    4:4:void com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder.<init>():234:234 -> a
-    4:4:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder builder():184 -> a
-    5:5:void checkNoConflict(boolean,java.lang.String,java.util.Map$Entry,java.util.Map$Entry):190:190 -> a
-    6:14:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):392:400 -> a
-    15:19:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap.copyOfEnumMap(java.util.EnumMap):436:440 -> a
-    15:19:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):400 -> a
-    20:20:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403:403 -> a
-    21:21:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap.copyOf(java.lang.Iterable):418:418 -> a
-    21:21:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
-    22:24:java.util.Collection com.android.tools.r8.com.google.common.collect.Iterables.castOrCopyToCollection(java.lang.Iterable):318:320 -> a
-    22:24:java.lang.Object[] com.android.tools.r8.com.google.common.collect.Iterables.toArray(java.lang.Iterable,java.lang.Object[]):297 -> a
-    22:24:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap.copyOf(java.lang.Iterable):418 -> a
-    22:24:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
-    25:25:java.lang.Object[] com.android.tools.r8.com.google.common.collect.Iterables.toArray(java.lang.Iterable,java.lang.Object[]):298:298 -> a
-    25:25:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap.copyOf(java.lang.Iterable):418 -> a
-    25:25:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
-    26:38:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap.copyOf(java.lang.Iterable):418:430 -> a
-    26:38:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
-    39:39:com.android.tools.r8.com.google.common.collect.RegularImmutableMap com.android.tools.r8.com.google.common.collect.RegularImmutableMap.fromEntries(java.util.Map$Entry[]):54:54 -> a
-    39:39:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap.copyOf(java.lang.Iterable):430 -> a
-    39:39:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
-    40:41:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap.copyOf(java.lang.Iterable):423:424 -> a
-    40:41:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
-    42:42:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.ImmutableBiMap.of(java.lang.Object,java.lang.Object):73:73 -> a
-    42:42:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap.of(java.lang.Object,java.lang.Object):123 -> a
-    42:42:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap.copyOf(java.lang.Iterable):424 -> a
-    42:42:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
-    43:43:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap.of():113:113 -> a
-    43:43:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap.copyOf(java.lang.Iterable):421 -> a
-    43:43:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
+    3:3:void checkNoConflict(boolean,java.lang.String,java.util.Map$Entry,java.util.Map$Entry):190:190 -> a
+    4:12:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):392:400 -> a
+    13:17:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap.copyOfEnumMap(java.util.EnumMap):436:440 -> a
+    13:17:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):400 -> a
+    18:18:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403:403 -> a
+    19:19:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap.copyOf(java.lang.Iterable):418:418 -> a
+    19:19:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
+    20:22:java.util.Collection com.android.tools.r8.com.google.common.collect.Iterables.castOrCopyToCollection(java.lang.Iterable):318:320 -> a
+    20:22:java.lang.Object[] com.android.tools.r8.com.google.common.collect.Iterables.toArray(java.lang.Iterable,java.lang.Object[]):297 -> a
+    20:22:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap.copyOf(java.lang.Iterable):418 -> a
+    20:22:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
+    23:23:java.lang.Object[] com.android.tools.r8.com.google.common.collect.Iterables.toArray(java.lang.Iterable,java.lang.Object[]):298:298 -> a
+    23:23:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap.copyOf(java.lang.Iterable):418 -> a
+    23:23:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
+    24:36:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap.copyOf(java.lang.Iterable):418:430 -> a
+    24:36:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
+    37:37:com.android.tools.r8.com.google.common.collect.RegularImmutableMap com.android.tools.r8.com.google.common.collect.RegularImmutableMap.fromEntries(java.util.Map$Entry[]):54:54 -> a
+    37:37:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap.copyOf(java.lang.Iterable):430 -> a
+    37:37:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
+    38:39:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap.copyOf(java.lang.Iterable):423:424 -> a
+    38:39:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
+    40:40:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.ImmutableBiMap.of(java.lang.Object,java.lang.Object):73:73 -> a
+    40:40:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap.of(java.lang.Object,java.lang.Object):123 -> a
+    40:40:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap.copyOf(java.lang.Iterable):424 -> a
+    40:40:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
+    41:41:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap.of():113:113 -> a
+    41:41:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap.copyOf(java.lang.Iterable):421 -> a
+    41:41:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
     1:2:java.util.Map$Entry entryOf(java.lang.Object,java.lang.Object):175:176 -> b
+    3:3:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder builder():184:184 -> b
+    4:4:void com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder.<init>():234:234 -> b
+    4:4:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder builder():184 -> b
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.ImmutableBiMap.of(java.lang.Object,java.lang.Object):73:73 -> c
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap of(java.lang.Object,java.lang.Object):123 -> c
     1:1:void clear():642:642 -> clear
@@ -10503,7 +10734,7 @@
     1:1:java.util.Set entrySet():60:60 -> entrySet
     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
-    com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet() -> f
+    com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet() -> g
     1:1:java.lang.Object getOrDefault(java.lang.Object,java.lang.Object):666:666 -> getOrDefault
     1:1:int hashCode():842:842 -> hashCode
     1:1:boolean isEmpty():647:647 -> isEmpty
@@ -10534,12 +10765,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.Oe:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$1 -> com.android.tools.r8.internal.ae:
     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.Pe$a:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder -> com.android.tools.r8.internal.be$a:
     java.util.Map$Entry[] entries -> b
     int size -> c
     java.util.Comparator valueComparator -> a
@@ -10563,38 +10794,38 @@
     46:46:com.android.tools.r8.com.google.common.collect.ImmutableMap build():371 -> a
     47:47:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap.of():113:113 -> a
     47:47:com.android.tools.r8.com.google.common.collect.ImmutableMap build():369 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap$1EntrySetImpl -> com.android.tools.r8.internal.Qe:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap$1EntrySetImpl -> com.android.tools.r8.internal.ce:
     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.Te:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntry -> com.android.tools.r8.internal.fe:
     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.Re:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableBiMapEntry -> com.android.tools.r8.internal.de:
     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.Se:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableMapEntry -> com.android.tools.r8.internal.ee:
     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.Ve:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet -> com.android.tools.r8.internal.he:
     1:1:void <init>():77:77 -> <init>
     1:1:boolean isPartialView():98:98 -> b
     1:4:boolean contains(java.lang.Object):88:91 -> contains
-    1:1:boolean isHashCodeFast():104:104 -> f
-    2:2:boolean com.android.tools.r8.com.google.common.collect.ImmutableMap.isHashCodeFast():0:0 -> f
-    2:2:boolean isHashCodeFast():104 -> f
+    1:1:boolean isHashCodeFast():104:104 -> g
+    2:2:boolean com.android.tools.r8.com.google.common.collect.ImmutableMap.isHashCodeFast():0:0 -> g
+    2:2:boolean isHashCodeFast():104 -> g
     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.Ue:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet$RegularEntrySet -> com.android.tools.r8.internal.ge:
     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>
@@ -10609,7 +10840,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.We:
+com.android.tools.r8.com.google.common.collect.ImmutableMapKeySet -> com.android.tools.r8.internal.ie:
     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
@@ -10624,7 +10855,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.Ze:
+com.android.tools.r8.com.google.common.collect.ImmutableMapValues -> com.android.tools.r8.internal.le:
     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
@@ -10642,18 +10873,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.Xe:
+com.android.tools.r8.com.google.common.collect.ImmutableMapValues$1 -> com.android.tools.r8.internal.je:
     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.Ye:
+com.android.tools.r8.com.google.common.collect.ImmutableMapValues$2 -> com.android.tools.r8.internal.ke:
     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 -> h
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap -> com.android.tools.r8.internal.df:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap -> com.android.tools.r8.internal.pe:
     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>
@@ -10692,13 +10924,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.af:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$1 -> com.android.tools.r8.internal.me:
     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.bf:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder -> com.android.tools.r8.internal.ne:
     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.cf:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$EntryCollection -> com.android.tools.r8.internal.oe:
     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
@@ -10711,10 +10943,11 @@
     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.df$a:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Itr -> com.android.tools.r8.internal.pe$a:
     java.util.Iterator valueIterator -> c
     java.util.Iterator mapIterator -> a
     java.lang.Object key -> b
+    com.android.tools.r8.com.google.common.collect.ImmutableMultimap this$0 -> d
     1:4:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultimap):570:573 -> <init>
     5:5:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultimap,com.android.tools.r8.com.google.common.collect.ImmutableMultimap$1):570:570 -> <init>
     1:1:boolean hasNext():579:579 -> hasNext
@@ -10723,7 +10956,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.df$b:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Keys -> com.android.tools.r8.internal.pe$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
@@ -10745,7 +10978,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.ff:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset -> com.android.tools.r8.internal.re:
     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
@@ -10773,14 +11006,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.ef:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset$1 -> com.android.tools.r8.internal.qe:
     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.ff$a:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset$EntrySet -> com.android.tools.r8.internal.re$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>
@@ -10790,9 +11023,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.gf:
+com.android.tools.r8.com.google.common.collect.ImmutableMultisetGwtSerializationDependencies -> com.android.tools.r8.internal.se:
     1:1:void <init>():40:40 -> <init>
-com.android.tools.r8.com.google.common.collect.ImmutableSet -> com.android.tools.r8.internal.hf:
+com.android.tools.r8.com.google.common.collect.ImmutableSet -> com.android.tools.r8.internal.te:
     int $r8$clinit -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList asList -> c
     1:1:void <init>():332:332 -> <init>
@@ -10820,12 +11053,12 @@
     2:2:void com.android.tools.r8.com.google.common.collect.RegularImmutableAsList.<init>(com.android.tools.r8.com.google.common.collect.ImmutableCollection,java.lang.Object[]):41:41 -> e
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList createAsList():373 -> e
     1:7:boolean equals(java.lang.Object):343:349 -> equals
-    boolean isHashCodeFast() -> f
+    boolean isHashCodeFast() -> g
     1:9:int chooseTableSize(int):229:237 -> g
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet of():74:74 -> h
     1:1:int hashCode():354:354 -> hashCode
     1:1:java.util.stream.Collector toImmutableSet():65:65 -> i
-com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder -> com.android.tools.r8.internal.hf$a:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder -> com.android.tools.r8.internal.te$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
@@ -10834,7 +11067,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.jf:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed -> com.android.tools.r8.internal.ve:
     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
@@ -10844,13 +11077,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.if:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed$1 -> com.android.tools.r8.internal.ue:
     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 -> h
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():400 -> h
-com.android.tools.r8.com.google.common.collect.ImmutableSortedAsList -> com.android.tools.r8.internal.kf:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedAsList -> com.android.tools.r8.internal.we:
     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
@@ -10870,7 +11103,7 @@
     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.mf:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedSet -> com.android.tools.r8.internal.ye:
     com.android.tools.r8.com.google.common.collect.ImmutableSortedSet descendingSet -> e
     java.util.Comparator comparator -> d
     1:1:void com.android.tools.r8.com.google.common.collect.ImmutableSortedSetFauxverideShim.<init>():39:39 -> <init>
@@ -10922,7 +11155,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.lf:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder -> com.android.tools.r8.internal.xe:
     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
@@ -10952,65 +11185,12 @@
     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.Iterables -> com.android.tools.r8.internal.Ki:
-    1:2:boolean contains(java.lang.Iterable,java.lang.Object):138:139 -> a
-    3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    3:3:boolean com.android.tools.r8.com.google.common.collect.Collections2.safeContains(java.util.Collection,java.lang.Object):107 -> a
-    3:3:boolean contains(java.lang.Iterable,java.lang.Object):140 -> a
-    4:4:boolean com.android.tools.r8.com.google.common.collect.Collections2.safeContains(java.util.Collection,java.lang.Object):109:109 -> a
-    4:4:boolean contains(java.lang.Iterable,java.lang.Object):140 -> a
-    5:5:boolean contains(java.lang.Iterable,java.lang.Object):142:142 -> a
-    6:6:com.android.tools.r8.com.google.common.collect.FluentIterable com.android.tools.r8.com.google.common.collect.FluentIterable.concat(java.lang.Iterable):294:294 -> a
-    6:6:java.lang.Iterable concat(java.lang.Iterable):503 -> a
-    7:7:boolean addAll(java.util.Collection,java.lang.Iterable):331:331 -> a
-    8:8:java.util.Collection com.android.tools.r8.com.google.common.collect.Collections2.cast(java.lang.Iterable):377:377 -> a
-    8:8:boolean addAll(java.util.Collection,java.lang.Iterable):332 -> a
-    9:9:boolean addAll(java.util.Collection,java.lang.Iterable):333:333 -> a
-    10:10:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    10:10:boolean addAll(java.util.Collection,java.lang.Iterable):335 -> a
-    11:11:boolean addAll(java.util.Collection,java.lang.Iterable):335:335 -> a
-    12:12:java.lang.Iterable concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    13:13:boolean all(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):637:637 -> a
-    14:14:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    14:14: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
-    14:14:boolean all(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):637 -> a
-    15:17: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
-    15:17:boolean all(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):637 -> a
-    18:18:java.lang.Object find(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate,java.lang.Object):669:669 -> a
-    19:19:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    19:19: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
-    19:19:java.lang.Object find(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate,java.lang.Object):669 -> a
-    20:20:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    20:20: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):744 -> a
-    20:20:java.lang.Object find(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate,java.lang.Object):669 -> a
-    21:23: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):745:747 -> a
-    21:23:java.lang.Object find(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate,java.lang.Object):669 -> a
-    24:24:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    24:24:java.lang.Iterable transform(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):720 -> a
-    25:25:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    25:25:java.lang.Iterable transform(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):721 -> a
-    26:26:java.lang.Iterable transform(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):722:722 -> a
-    1:1:java.lang.Object getOnlyElement(java.lang.Iterable):266:266 -> b
-    2:16:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.getOnlyElement(java.util.Iterator):314:328 -> b
-    2:16:java.lang.Object getOnlyElement(java.lang.Iterable):266 -> b
-    17:17:boolean any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):627:627 -> b
-    18:21: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
-    18:21: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
-    18:21:boolean any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):627 -> b
-    1:3:int size(java.lang.Iterable):126:128 -> c
-    4:8:int com.android.tools.r8.com.google.common.collect.Iterators.size(java.util.Iterator):168:172 -> c
-    4:8:int size(java.lang.Iterable):128 -> c
-    9:9:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> c
-    9:9:java.lang.Iterable filter(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):573 -> c
-    10:10:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> c
-    10:10:java.lang.Iterable filter(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):574 -> c
-    11:11:java.lang.Iterable filter(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):575:575 -> c
-com.android.tools.r8.com.google.common.collect.Iterables$10 -> com.android.tools.r8.internal.Hi:
+com.android.tools.r8.com.google.common.collect.Iterables$10 -> com.android.tools.r8.internal.Sh:
     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.Ii:
+com.android.tools.r8.com.google.common.collect.Iterables$4 -> com.android.tools.r8.internal.Th:
     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>
@@ -11036,7 +11216,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.Ji:
+com.android.tools.r8.com.google.common.collect.Iterables$5 -> com.android.tools.r8.internal.Uh:
     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>
@@ -11046,73 +11226,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 -> com.android.tools.r8.internal.Xi:
-    1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator com.android.tools.r8.com.google.common.collect.Iterators.emptyListIterator():90:90 -> a
-    1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator emptyIterator():78 -> a
-    2:9:boolean contains(java.util.Iterator,java.lang.Object):180:187 -> a
-    10:12:boolean removeAll(java.util.Iterator,java.util.Collection):208:210 -> a
-    13:13:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    13:13:boolean addAll(java.util.Collection,java.util.Iterator):369 -> a
-    14:14:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    14:14:boolean addAll(java.util.Collection,java.util.Iterator):370 -> a
-    15:16:boolean addAll(java.util.Collection,java.util.Iterator):372:373 -> a
-    17:17:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    17:17:java.util.Iterator concat(java.util.Iterator,java.util.Iterator):501 -> a
-    18:18:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    18:18:java.util.Iterator concat(java.util.Iterator,java.util.Iterator):502 -> a
-    19:19:java.util.Iterator concat(java.util.Iterator,java.util.Iterator):503:503 -> a
-    20:20:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.consumingForArray(java.lang.Object[]):471:471 -> a
-    20:20:java.util.Iterator concat(java.util.Iterator,java.util.Iterator):503 -> a
-    21:21:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.concat(java.util.Iterator):578:578 -> a
-    21:21:java.util.Iterator concat(java.util.Iterator,java.util.Iterator):503 -> a
-    22:22:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    22:22:java.util.Iterator cycle(java.lang.Iterable):410 -> a
-    23:23:java.util.Iterator cycle(java.lang.Iterable):411:411 -> a
-    24:24:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    24:24:java.util.Iterator limit(java.util.Iterator,int):950 -> a
-    25:26:java.util.Iterator limit(java.util.Iterator,int):951:952 -> a
-    27:27:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    27:27:java.util.Iterator transform(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):816 -> a
-    28:28:java.util.Iterator transform(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):817:817 -> a
-    29:31:java.lang.Object pollNext(java.util.Iterator):1017:1019 -> a
-    32:32:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator forArray(java.lang.Object[]):1054:1054 -> a
-    33:38:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator forArray(java.lang.Object[],int,int,int):1085:1090 -> a
-    39:39:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator com.android.tools.r8.com.google.common.collect.Iterators.emptyListIterator():90:90 -> a
-    39:39:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator forArray(java.lang.Object[],int,int,int):1092 -> a
-    40:40:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator forArray(java.lang.Object[],int,int,int):1094:1094 -> a
-    41:41:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator singletonIterator(java.lang.Object):1104:1104 -> a
-    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.UnmodifiableIterator unmodifiableIterator(java.util.Iterator):131 -> b
-    2:7:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator unmodifiableIterator(java.util.Iterator):132:137 -> b
-com.android.tools.r8.com.google.common.collect.Iterators$1 -> com.android.tools.r8.internal.Ni:
+com.android.tools.r8.com.google.common.collect.Iterators$1 -> com.android.tools.r8.internal.Xh:
     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.Oi:
+com.android.tools.r8.com.google.common.collect.Iterators$2 -> com.android.tools.r8.internal.Yh:
     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.Pi:
+com.android.tools.r8.com.google.common.collect.Iterators$3 -> com.android.tools.r8.internal.Zh:
     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.Qi:
+com.android.tools.r8.com.google.common.collect.Iterators$5 -> com.android.tools.r8.internal.ai:
     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 -> f
-com.android.tools.r8.com.google.common.collect.Iterators$6 -> com.android.tools.r8.internal.Ri:
+    1:7:java.lang.Object computeNext():662:668 -> e
+com.android.tools.r8.com.google.common.collect.Iterators$6 -> com.android.tools.r8.internal.bi:
     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.Si:
+com.android.tools.r8.com.google.common.collect.Iterators$7 -> com.android.tools.r8.internal.ci:
     java.util.Iterator val$iterator -> c
     int val$limitSize -> b
     int count -> a
@@ -11121,21 +11263,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.Ti:
+com.android.tools.r8.com.google.common.collect.Iterators$9 -> com.android.tools.r8.internal.di:
     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.Ui:
+com.android.tools.r8.com.google.common.collect.Iterators$ArrayItr -> com.android.tools.r8.internal.ei:
     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.Vi:
+com.android.tools.r8.com.google.common.collect.Iterators$ConcatenatedIterator -> com.android.tools.r8.internal.fi:
     java.util.Deque metaIterators -> d
     java.util.Iterator topMetaIterator -> c
     java.util.Iterator iterator -> b
@@ -11155,37 +11297,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.Wi:
+com.android.tools.r8.com.google.common.collect.Iterators$EmptyModifiableIterator -> com.android.tools.r8.internal.gi:
     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.Ro:
-com.android.tools.r8.com.google.common.collect.Lists -> com.android.tools.r8.internal.Wo:
-    1:1:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList():88:88 -> a
-    1:1:java.util.ArrayList newArrayList(java.util.Iterator):164 -> a
-    2:2:java.util.ArrayList newArrayList(java.util.Iterator):165:165 -> a
-    3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    3:3:java.util.ArrayList newArrayList(java.lang.Iterable):146 -> a
-    4:4:java.util.ArrayList newArrayList(java.lang.Iterable):148:148 -> a
-    5:5:java.util.Collection com.android.tools.r8.com.google.common.collect.Collections2.cast(java.lang.Iterable):377:377 -> a
-    5:5:java.util.ArrayList newArrayList(java.lang.Iterable):149 -> a
-    6:7:java.util.ArrayList newArrayList(java.lang.Iterable):149:150 -> a
-    8:8:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    8:8:java.util.ArrayList newArrayList(java.lang.Object[]):112 -> a
-    9:9:java.util.ArrayList newArrayList(java.lang.Object[]):114:114 -> a
-    10:13:int com.android.tools.r8.com.google.common.collect.Lists.computeArrayListCapacity(int):122:125 -> a
-    10:13:java.util.ArrayList newArrayList(java.lang.Object[]):114 -> a
-    14:15:java.util.ArrayList newArrayList(java.lang.Object[]):115:116 -> a
-    16:23:java.util.List reverse(java.util.List):840:847 -> a
-    24:41:boolean equalsImpl(java.util.List,java.lang.Object):1017:1034 -> a
-    42:52:boolean com.android.tools.r8.com.google.common.collect.Iterators.elementsEqual(java.util.Iterator,java.util.Iterator):274:284 -> a
-    42:52:boolean equalsImpl(java.util.List,java.lang.Object):1034 -> a
-com.android.tools.r8.com.google.common.collect.Lists$RandomAccessReverseList -> com.android.tools.r8.internal.To:
+com.android.tools.r8.com.google.common.collect.ListMultimap -> com.android.tools.r8.internal.Vn:
+com.android.tools.r8.com.google.common.collect.Lists$RandomAccessReverseList -> com.android.tools.r8.internal.Xn:
     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.Vo:
+com.android.tools.r8.com.google.common.collect.Lists$ReverseList -> com.android.tools.r8.internal.Zn:
     java.util.List forwardList -> a
     1:2:void <init>(java.util.List):854:855 -> <init>
     1:1:java.util.List getForwardList():859:859 -> a
@@ -11246,7 +11368,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.Uo:
+com.android.tools.r8.com.google.common.collect.Lists$ReverseList$1 -> com.android.tools.r8.internal.Yn:
     com.android.tools.r8.com.google.common.collect.Lists$ReverseList this$0 -> c
     java.util.ListIterator val$forwardIterator -> b
     boolean canRemoveOrSet -> a
@@ -11269,21 +11391,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 -> com.android.tools.r8.internal.dq:
-    1:1:java.util.HashMap newHashMap():283:283 -> a
-    2:2:int capacity(int):309:309 -> a
-    3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    3:3:java.lang.Object safeGet(java.util.Map,java.lang.Object):3704 -> a
-    4:4:java.lang.Object safeGet(java.util.Map,java.lang.Object):3706:3706 -> a
-    1:1:java.util.HashMap newHashMapWithExpectedSize(int):300:300 -> b
-    2:2:java.util.IdentityHashMap newIdentityHashMap():511:511 -> b
-com.android.tools.r8.com.google.common.collect.Maps$1 -> com.android.tools.r8.internal.Rp:
-com.android.tools.r8.com.google.common.collect.Maps$5 -> com.android.tools.r8.internal.Sp:
+com.android.tools.r8.com.google.common.collect.Maps$1 -> com.android.tools.r8.internal.So:
+com.android.tools.r8.com.google.common.collect.Maps$5 -> com.android.tools.r8.internal.To:
     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.Tp:
+com.android.tools.r8.com.google.common.collect.Maps$6 -> com.android.tools.r8.internal.Uo:
     java.util.Iterator val$entryIterator -> a
     1:1:void <init>(java.util.Iterator):1462:1462 -> <init>
     1:1:boolean hasNext():1465:1465 -> hasNext
@@ -11296,23 +11410,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.Wp:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction -> com.android.tools.r8.internal.Xo:
     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.Up:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$1 -> com.android.tools.r8.internal.Vo:
     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.Vp:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$2 -> com.android.tools.r8.internal.Wo:
     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.Xp:
+com.android.tools.r8.com.google.common.collect.Maps$EntrySet -> com.android.tools.r8.internal.Yo:
     1:1:void <init>():4112:4112 -> <init>
     java.util.Map map() -> a
     1:1:void clear():4122:4122 -> clear
@@ -11331,11 +11445,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.Zp:
+com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap -> com.android.tools.r8.internal.ap:
     1:1:void <init>():3653:3653 -> <init>
-    java.util.Iterator entryIterator() -> a
+    java.util.Iterator entryIterator() -> b
     1:1:java.util.Set entrySet():3666:3666 -> entrySet
-com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap$1 -> com.android.tools.r8.internal.Yp:
+com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap$1 -> com.android.tools.r8.internal.Zo:
     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
@@ -11348,7 +11462,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.aq:
+com.android.tools.r8.com.google.common.collect.Maps$KeySet -> com.android.tools.r8.internal.bp:
     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
@@ -11383,7 +11497,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.bq:
+com.android.tools.r8.com.google.common.collect.Maps$Values -> com.android.tools.r8.internal.cp:
     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
@@ -11439,7 +11553,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.cq:
+com.android.tools.r8.com.google.common.collect.Maps$ViewCachingAbstractMap -> com.android.tools.r8.internal.dp:
     java.util.Collection values -> b
     java.util.Set entrySet -> a
     1:1:void <init>():3612:3612 -> <init>
@@ -11451,31 +11565,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.yr:
+com.android.tools.r8.com.google.common.collect.Multimap -> com.android.tools.r8.internal.vq:
     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.zr:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$2 -> com.android.tools.r8.internal.wq:
     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.Ar:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$ArrayListSupplier -> com.android.tools.r8.internal.xq:
     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.Br:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$ListMultimapBuilder -> com.android.tools.r8.internal.yq:
     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.Dr:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys -> com.android.tools.r8.internal.Aq:
     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.Cr:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys$1 -> com.android.tools.r8.internal.zq:
     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>
@@ -11488,12 +11602,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.Er:
+com.android.tools.r8.com.google.common.collect.Multimaps$CustomListMultimap -> com.android.tools.r8.internal.Bq:
     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.Fr:
+com.android.tools.r8.com.google.common.collect.Multimaps$Entries -> com.android.tools.r8.internal.Cq:
     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
@@ -11511,7 +11625,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.Ir:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys -> com.android.tools.r8.internal.Fq:
     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
@@ -11533,17 +11647,17 @@
     3:3:java.util.Iterator iterator():1744 -> iterator
     1:1:java.util.Set elementSet():1786:1786 -> j
     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.Hr:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1 -> com.android.tools.r8.internal.Eq:
     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.Gr:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1$1 -> com.android.tools.r8.internal.Dq:
     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.Ir$a:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$KeysEntrySet -> com.android.tools.r8.internal.Fq$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
@@ -11556,7 +11670,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.Jr:
+com.android.tools.r8.com.google.common.collect.Multiset -> com.android.tools.r8.internal.Gq:
     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
@@ -11572,35 +11686,22 @@
     2:3:void forEach(java.util.function.Consumer):491:492 -> forEach
     java.util.Set elementSet() -> j
     1:1:java.util.Spliterator spliterator():504:504 -> spliterator
-com.android.tools.r8.com.google.common.collect.Multiset$Entry -> com.android.tools.r8.internal.Jr$a:
+com.android.tools.r8.com.google.common.collect.Multiset$Entry -> com.android.tools.r8.internal.Gq$a:
     int getCount() -> a
     java.lang.Object getElement() -> b
-com.android.tools.r8.com.google.common.collect.Multisets -> com.android.tools.r8.internal.Qr:
-    1:13:boolean equalsImpl(com.android.tools.r8.com.google.common.collect.Multiset,java.lang.Object):880:892 -> a
-    14:14:java.util.Spliterator lambda$spliteratorImpl$2(com.android.tools.r8.com.google.common.collect.Multiset$Entry):1126:1126 -> a
-    15:17:com.android.tools.r8.com.google.common.collect.ImmutableMultiset copyHighestCountFirst(com.android.tools.r8.com.google.common.collect.Multiset):1159:1161 -> a
-    18:18:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.ImmutableMultiset.copyFromEntries(java.util.Collection):216:216 -> a
-    18:18:com.android.tools.r8.com.google.common.collect.ImmutableMultiset copyHighestCountFirst(com.android.tools.r8.com.google.common.collect.Multiset):1161 -> a
-    19:19:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.ImmutableMultiset.of():101:101 -> a
-    19:19:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.ImmutableMultiset.copyFromEntries(java.util.Collection):217 -> a
-    19:19:com.android.tools.r8.com.google.common.collect.ImmutableMultiset copyHighestCountFirst(com.android.tools.r8.com.google.common.collect.Multiset):1161 -> a
-    20:20:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.ImmutableMultiset.copyFromEntries(java.util.Collection):219:219 -> a
-    20:20:com.android.tools.r8.com.google.common.collect.ImmutableMultiset copyHighestCountFirst(com.android.tools.r8.com.google.common.collect.Multiset):1161 -> a
-    1:8:java.util.Spliterator spliteratorImpl(com.android.tools.r8.com.google.common.collect.Multiset):1123:1130 -> b
-    9:9:java.util.Spliterator spliteratorImpl(com.android.tools.r8.com.google.common.collect.Multiset):1124:1124 -> b
-com.android.tools.r8.com.google.common.collect.Multisets$AbstractEntry -> com.android.tools.r8.internal.Kr:
+com.android.tools.r8.com.google.common.collect.Multisets$AbstractEntry -> com.android.tools.r8.internal.Hq:
     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.Lr:
+com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount -> com.android.tools.r8.internal.Iq:
     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.Nr:
+com.android.tools.r8.com.google.common.collect.Multisets$ElementSet -> com.android.tools.r8.internal.Kq:
     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
@@ -11630,25 +11731,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.Mr:
+com.android.tools.r8.com.google.common.collect.Multisets$ElementSet$1 -> com.android.tools.r8.internal.Jq:
     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.Or:
+com.android.tools.r8.com.google.common.collect.Multisets$EntrySet -> com.android.tools.r8.internal.Lq:
     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.Pr:
+com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry -> com.android.tools.r8.internal.Mq:
     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.cs:
+com.android.tools.r8.com.google.common.collect.NaturalOrdering -> com.android.tools.r8.internal.Wq:
     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>
@@ -11661,16 +11762,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.ObjectArrays -> com.android.tools.r8.internal.Ot:
-    1:1:java.lang.Object[] checkElementsNotNull(java.lang.Object[]):219:219 -> a
-    2:2:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.checkElementsNotNull(java.lang.Object[],int):225:225 -> a
-    2:2:java.lang.Object[] checkElementsNotNull(java.lang.Object[]):219 -> a
-    3:3:java.lang.Object checkElementNotNull(java.lang.Object,int):235:235 -> a
-com.android.tools.r8.com.google.common.collect.Ordering -> com.android.tools.r8.internal.Bu:
+com.android.tools.r8.com.google.common.collect.Ordering -> com.android.tools.r8.internal.ut:
     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.Hz:
+com.android.tools.r8.com.google.common.collect.RegularImmutableAsList -> com.android.tools.r8.internal.ty:
     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>
@@ -11682,7 +11778,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList delegateList():50:50 -> i
     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.Kz:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap -> com.android.tools.r8.internal.wy:
     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
@@ -11721,13 +11817,13 @@
     1:1:int access$200(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap):43:43 -> b
     1:1:int access$300(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap):43:43 -> c
     1:1:java.util.Map$Entry[] access$400(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap):43:43 -> d
-    1:2:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():144:145 -> f
-    3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():74:74 -> f
-    3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():145 -> f
-    4:4:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():145:145 -> 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):156 -> forEach
     2:3:void forEach(java.util.function.BiConsumer):157:158 -> forEach
+    1:2:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():144:145 -> g
+    3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():74:74 -> g
+    3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():145 -> g
+    4:4:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():145:145 -> g
     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 createKeySet():151:151 -> j
@@ -11737,18 +11833,18 @@
     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
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$1 -> com.android.tools.r8.internal.Iz:
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse -> com.android.tools.r8.internal.Kz$a:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$1 -> com.android.tools.r8.internal.uy:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse -> com.android.tools.r8.internal.wy$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 -> e
-    1:1:com.android.tools.r8.com.google.common.collect.BiMap inverse():195 -> e
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():236:236 -> 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 -> f
+    1:1:com.android.tools.r8.com.google.common.collect.BiMap inverse():195 -> 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):209 -> forEach
     2:2:void forEach(java.util.function.BiConsumer):210:210 -> forEach
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():236:236 -> g
     1:5:java.lang.Object get(java.lang.Object):215:219 -> get
     6:6:java.lang.Object com.android.tools.r8.com.google.common.collect.ImmutableEntry.getValue():45:45 -> get
     6:6:java.lang.Object get(java.lang.Object):222 -> get
@@ -11762,18 +11858,18 @@
     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
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet -> com.android.tools.r8.internal.Kz$a$a:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet -> com.android.tools.r8.internal.wy$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
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList createAsList():268:268 -> e
-    boolean isHashCodeFast() -> f
     1:1:void forEach(java.util.function.Consumer):263:263 -> forEach
+    boolean isHashCodeFast() -> g
     1:1:int hashCode():253:253 -> hashCode
     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.Jz:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1 -> com.android.tools.r8.internal.vy:
     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
@@ -11782,7 +11878,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 -> h
-com.android.tools.r8.com.google.common.collect.RegularImmutableList -> com.android.tools.r8.internal.Lz:
+com.android.tools.r8.com.google.common.collect.RegularImmutableList -> com.android.tools.r8.internal.xy:
     java.lang.Object[] array -> d
     com.android.tools.r8.com.google.common.collect.ImmutableList EMPTY -> c
     1:1:void <clinit>():31:31 -> <clinit>
@@ -11795,7 +11891,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.Oz:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap -> com.android.tools.r8.internal.Ay:
     java.util.Map$Entry[] entries -> f
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry[] table -> g
     int mask -> h
@@ -11825,16 +11921,16 @@
     37:37:java.lang.Object com.android.tools.r8.com.google.common.collect.ImmutableEntry.getValue():45:45 -> a
     37:37:java.lang.Object get(java.lang.Object,com.android.tools.r8.com.google.common.collect.ImmutableMapEntry[],int):143 -> a
     38:38:java.lang.Object get(java.lang.Object,com.android.tools.r8.com.google.common.collect.ImmutableMapEntry[],int):133:133 -> a
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():169:169 -> 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):151 -> forEach
     2:3:void forEach(java.util.function.BiConsumer):152:153 -> forEach
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():169:169 -> g
     1:1:java.lang.Object get(java.lang.Object):122:122 -> get
     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.Mz:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap$KeySet -> com.android.tools.r8.internal.yy:
     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
@@ -11843,13 +11939,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.Nz:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap$Values -> com.android.tools.r8.internal.zy:
     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.Qz:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset -> com.android.tools.r8.internal.Cy:
     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
@@ -11871,8 +11967,8 @@
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset.elementSet():140:141 -> j
     1:2:java.util.Set elementSet():34 -> j
     1:1:int size():135:135 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$1 -> com.android.tools.r8.internal.Pz:
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$ElementSet -> com.android.tools.r8.internal.Qz$a:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$1 -> com.android.tools.r8.internal.By:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$ElementSet -> com.android.tools.r8.internal.Cy$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>
@@ -11882,11 +11978,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.Rz:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$NonTerminalEntry -> com.android.tools.r8.internal.Dy:
     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.Sz:
+com.android.tools.r8.com.google.common.collect.RegularImmutableSet -> com.android.tools.r8.internal.Ey:
     java.lang.Object[] elements -> e
     int hashCode -> h
     int mask -> g
@@ -11904,13 +12000,13 @@
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableList createAsList():90:90 -> e
     4:4:void com.android.tools.r8.com.google.common.collect.RegularImmutableAsList.<init>(com.android.tools.r8.com.google.common.collect.ImmutableCollection,java.lang.Object[]):41:41 -> e
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableList createAsList():90 -> e
-    boolean isHashCodeFast() -> f
+    boolean isHashCodeFast() -> g
     1:1:int hashCode():100:100 -> hashCode
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.RegularImmutableSet.iterator():74:74 -> iterator
     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.Tz:
+com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet -> com.android.tools.r8.internal.Fy:
     com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet NATURAL_EMPTY_SET -> f
     com.android.tools.r8.com.google.common.collect.ImmutableList elements -> g
     1:1:void <clinit>():44:44 -> <clinit>
@@ -12025,39 +12121,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 -> com.android.tools.r8.internal.LB:
-    1:1:java.util.HashSet newHashSet(java.lang.Object[]):235:235 -> a
-    2:2:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSetWithExpectedSize(int):253:253 -> a
-    2:2:java.util.HashSet newHashSet(java.lang.Object[]):235 -> a
-    3:3:java.util.HashSet newHashSet(java.lang.Object[]):236:236 -> a
-    4:4:java.util.Set newConcurrentHashSet():310:310 -> a
-    5:5:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    5:5:boolean removeAllImpl(java.util.Set,java.util.Collection):1987 -> a
-    6:19:boolean removeAllImpl(java.util.Set,java.util.Collection):1988:2001 -> a
-    20:23:com.android.tools.r8.com.google.common.collect.Sets$SetView difference(java.util.Set,java.util.Set):911:914 -> a
-    24:25:int hashCodeImpl(java.util.Set):1770:1771 -> a
-    26:30:boolean equalsImpl(java.util.Set,java.lang.Object):1786:1790 -> a
-    31:34:java.util.NavigableSet unmodifiableNavigableSet(java.util.NavigableSet):1817:1820 -> a
-    35:36:boolean removeAllImpl(java.util.Set,java.util.Iterator):1980:1981 -> a
-    37:42:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.Maps.indexMap(java.util.Collection):4375:4380 -> a
-    37:42:java.util.Set combinations(java.util.Set,int):1668 -> a
-    43:46:java.util.Set combinations(java.util.Set,int):1669:1672 -> a
-    47:47:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():74:74 -> a
-    47:47:java.util.Set combinations(java.util.Set,int):1672 -> a
-    48:48:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of(java.lang.Object):83:83 -> a
-    48:48:java.util.Set combinations(java.util.Set,int):1672 -> a
-    49:50:java.util.Set combinations(java.util.Set,int):1673:1674 -> a
-    51:51:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of(java.lang.Object):83:83 -> a
-    51:51:java.util.Set combinations(java.util.Set,int):1674 -> a
-    52:52:java.util.Set combinations(java.util.Set,int):1676:1676 -> a
-    1:1:java.util.HashSet newHashSet():218:218 -> b
-    2:5:com.android.tools.r8.com.google.common.collect.Sets$SetView intersection(java.util.Set,java.util.Set):839:842 -> b
-    1:1:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():511:511 -> c
-    1:1:java.util.Set newIdentityHashSet():466 -> c
-    2:2:java.util.Set newIdentityHashSet():466:466 -> c
-    3:6:com.android.tools.r8.com.google.common.collect.Sets$SetView union(java.util.Set,java.util.Set):741:744 -> c
-    1:1:java.util.LinkedHashSet newLinkedHashSet():347:347 -> d
-com.android.tools.r8.com.google.common.collect.Sets$1 -> com.android.tools.r8.internal.BB:
+com.android.tools.r8.com.google.common.collect.Sets$1 -> com.android.tools.r8.internal.nA:
     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>
@@ -12069,13 +12133,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.AB:
+com.android.tools.r8.com.google.common.collect.Sets$1$1 -> com.android.tools.r8.internal.mA:
     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 -> f
-com.android.tools.r8.com.google.common.collect.Sets$2 -> com.android.tools.r8.internal.DB:
+    1:10:java.lang.Object computeNext():769:778 -> e
+com.android.tools.r8.com.google.common.collect.Sets$2 -> com.android.tools.r8.internal.pA:
     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>
@@ -12087,12 +12151,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.CB:
+com.android.tools.r8.com.google.common.collect.Sets$2$1 -> com.android.tools.r8.internal.oA:
     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 -> f
-com.android.tools.r8.com.google.common.collect.Sets$3 -> com.android.tools.r8.internal.FB:
+    1:7:java.lang.Object computeNext():850:856 -> e
+com.android.tools.r8.com.google.common.collect.Sets$3 -> com.android.tools.r8.internal.rA:
     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>
@@ -12105,12 +12169,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.EB:
+com.android.tools.r8.com.google.common.collect.Sets$3$1 -> com.android.tools.r8.internal.qA:
     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 -> f
-com.android.tools.r8.com.google.common.collect.Sets$5 -> com.android.tools.r8.internal.JB:
+    1:7:java.lang.Object computeNext():921:927 -> e
+com.android.tools.r8.com.google.common.collect.Sets$5 -> com.android.tools.r8.internal.vA:
     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>
@@ -12118,31 +12182,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.IB:
+com.android.tools.r8.com.google.common.collect.Sets$5$1 -> com.android.tools.r8.internal.uA:
     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 -> f
-    1:29:java.lang.Object computeNext():1688 -> f
-com.android.tools.r8.com.google.common.collect.Sets$5$1$1 -> com.android.tools.r8.internal.HB:
+    1:29:java.util.Set com.android.tools.r8.com.google.common.collect.Sets$5$1.computeNext():1693:1721 -> e
+    1:29:java.lang.Object computeNext():1688 -> e
+com.android.tools.r8.com.google.common.collect.Sets$5$1$1 -> com.android.tools.r8.internal.tA:
     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.GB:
+com.android.tools.r8.com.google.common.collect.Sets$5$1$1$1 -> com.android.tools.r8.internal.sA:
     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 -> f
-com.android.tools.r8.com.google.common.collect.Sets$ImprovedAbstractSet -> com.android.tools.r8.internal.KB:
+    1:5:java.lang.Object computeNext():1735:1739 -> e
+com.android.tools.r8.com.google.common.collect.Sets$ImprovedAbstractSet -> com.android.tools.r8.internal.wA:
     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.LB$a:
+com.android.tools.r8.com.google.common.collect.Sets$SetView -> com.android.tools.r8.internal.xA:
     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
@@ -12152,7 +12216,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.MB:
+com.android.tools.r8.com.google.common.collect.Sets$UnmodifiableNavigableSet -> com.android.tools.r8.internal.yA:
     java.util.SortedSet unmodifiableDelegate -> b
     java.util.NavigableSet delegate -> a
     com.android.tools.r8.com.google.common.collect.Sets$UnmodifiableNavigableSet descendingSet -> c
@@ -12179,7 +12243,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.lC:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableBiMap -> com.android.tools.r8.internal.XA:
     java.lang.Object singleValue -> f
     com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse -> g
     java.lang.Object singleKey -> e
@@ -12187,24 +12251,24 @@
     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 -> e
-    1:3:com.android.tools.r8.com.google.common.collect.BiMap inverse():34 -> e
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():85:85 -> f
-    2:2:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps.immutableEntry(java.lang.Object,java.lang.Object):1421:1421 -> f
-    2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():85 -> f
-    3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():85:85 -> f
-    4:4:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of(java.lang.Object):83:83 -> f
-    4:4:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():85 -> f
+    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: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:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():85:85 -> g
+    2:2:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps.immutableEntry(java.lang.Object,java.lang.Object):1421:1421 -> g
+    2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():85 -> g
+    3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():85:85 -> g
+    4:4:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of(java.lang.Object):83:83 -> g
+    4:4:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():85 -> g
     1:1:java.lang.Object get(java.lang.Object):55:55 -> get
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():90:90 -> j
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of(java.lang.Object):83:83 -> j
     2:2: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.mC:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableList -> com.android.tools.r8.internal.YA:
     java.lang.Object element -> c
     1:2:void <init>(java.lang.Object):37:38 -> <init>
     boolean isPartialView() -> b
@@ -12219,7 +12283,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.nC:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableSet -> com.android.tools.r8.internal.ZA:
     java.lang.Object element -> d
     int cachedHashCode -> e
     1:2:void <init>(java.lang.Object):44:45 -> <init>
@@ -12233,64 +12297,31 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList createAsList():71:71 -> e
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of(java.lang.Object):93:93 -> e
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList createAsList():71 -> e
-    1:1:boolean isHashCodeFast():97:97 -> f
+    1:1:boolean isHashCodeFast():97:97 -> g
     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.uC:
-com.android.tools.r8.com.google.common.collect.SortedIterables -> com.android.tools.r8.internal.vC:
-    1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    1:1:boolean hasSameComparator(java.util.Comparator,java.lang.Iterable):37 -> a
-    2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    2:2:boolean hasSameComparator(java.util.Comparator,java.lang.Iterable):38 -> a
-    3:4:boolean hasSameComparator(java.util.Comparator,java.lang.Iterable):40:41 -> a
-    5:7:java.util.Comparator com.android.tools.r8.com.google.common.collect.SortedIterables.comparator(java.util.SortedSet):53:55 -> a
-    5:7:boolean hasSameComparator(java.util.Comparator,java.lang.Iterable):41 -> a
-    8:13:boolean hasSameComparator(java.util.Comparator,java.lang.Iterable):42:47 -> a
-com.android.tools.r8.com.google.common.collect.Streams -> com.android.tools.r8.internal.pD:
-    java.util.Spliterator lambda$concat$0(java.util.Spliterator) -> a
-    1:3:java.util.stream.Stream stream(java.lang.Iterable):62:64 -> a
-    4:4:java.util.stream.Stream stream(java.util.Iterator):82:82 -> a
-    5:9:java.util.stream.Stream concat(java.util.stream.Stream[]):148:152 -> a
-    10:10: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
-    10:10:java.util.stream.Stream concat(java.util.stream.Stream[]):153 -> a
-    11:16:java.util.stream.Stream concat(java.util.stream.Stream[]):154:159 -> a
-    17:17:java.util.stream.Stream concat(java.util.stream.Stream[]):158:158 -> a
-    18:18:java.util.stream.Stream concat(java.util.stream.Stream[]):157:157 -> a
-    19:19:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    19:19:java.util.stream.Stream mapWithIndex(java.util.stream.Stream,com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex):342 -> a
-    20:20:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    20:20:java.util.stream.Stream mapWithIndex(java.util.stream.Stream,com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex):343 -> a
-    21:29:java.util.stream.Stream mapWithIndex(java.util.stream.Stream,com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex):344:352 -> a
-    30:77:java.util.stream.Stream mapWithIndex(java.util.stream.Stream,com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex):349:396 -> a
-    78:78:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    78:78:java.util.stream.Stream zip(java.util.stream.Stream,java.util.stream.Stream,java.util.function.BiFunction):235 -> a
-    79:79:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    79:79:java.util.stream.Stream zip(java.util.stream.Stream,java.util.stream.Stream,java.util.function.BiFunction):236 -> a
-    80:80:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    80:80:java.util.stream.Stream zip(java.util.stream.Stream,java.util.stream.Stream,java.util.function.BiFunction):237 -> a
-    81:92:java.util.stream.Stream zip(java.util.stream.Stream,java.util.stream.Stream,java.util.function.BiFunction):238:249 -> a
-    93:93:java.util.stream.Stream zip(java.util.stream.Stream,java.util.stream.Stream,java.util.function.BiFunction):247:247 -> a
-com.android.tools.r8.com.google.common.collect.Streams$1 -> com.android.tools.r8.internal.jD:
+com.android.tools.r8.com.google.common.collect.SortedIterable -> com.android.tools.r8.internal.gB:
+com.android.tools.r8.com.google.common.collect.Streams$1 -> com.android.tools.r8.internal.ZB:
     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.kD:
+com.android.tools.r8.com.google.common.collect.Streams$1Splitr -> com.android.tools.r8.internal.aC:
     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.lD:
+com.android.tools.r8.com.google.common.collect.Streams$2 -> com.android.tools.r8.internal.bC:
     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.nD:
+com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex -> com.android.tools.r8.internal.cC:
     java.lang.Object apply(java.lang.Object,long) -> a
-com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator -> com.android.tools.r8.internal.oD:
+com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator -> com.android.tools.r8.internal.dC:
     long index -> b
     java.util.Spliterator fromSpliterator -> a
     1:3:void <init>(java.util.Spliterator,long):419:421 -> <init>
@@ -12304,24 +12335,24 @@
     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.aF:
+com.android.tools.r8.com.google.common.collect.TransformedIterator -> com.android.tools.r8.internal.TD:
     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.YF:
+com.android.tools.r8.com.google.common.collect.UnmodifiableIterator -> com.android.tools.r8.internal.oF:
     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.ZF:
+com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator -> com.android.tools.r8.internal.pF:
     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
-com.android.tools.r8.com.google.common.hash.AbstractHashFunction -> com.android.tools.r8.internal.o:
+com.android.tools.r8.com.google.common.hash.AbstractHashFunction -> com.android.tools.r8.internal.n:
     1:1:void <init>():28:28 -> <init>
     1:1:com.android.tools.r8.com.google.common.hash.HashCode hashString(java.lang.CharSequence,java.nio.charset.Charset):42:42 -> a
-com.android.tools.r8.com.google.common.hash.AbstractHasher -> com.android.tools.r8.internal.p:
+com.android.tools.r8.com.google.common.hash.AbstractHasher -> com.android.tools.r8.internal.o:
     1:1:void <init>():29:29 -> <init>
     com.android.tools.r8.com.google.common.hash.Hasher putBytes(byte[],int,int) -> a
     com.android.tools.r8.com.google.common.hash.Hasher putInt(int) -> a
@@ -12331,7 +12362,7 @@
     3:3:com.android.tools.r8.com.google.common.hash.Hasher putFloat(float):42:42 -> a
     4:4:com.android.tools.r8.com.google.common.hash.Hasher putString(java.lang.CharSequence,java.nio.charset.Charset):55:55 -> a
     5:5: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.Kd:
+com.android.tools.r8.com.google.common.hash.HashCode -> com.android.tools.r8.internal.Yc:
     char[] hexDigits -> a
     int $r8$clinit -> b
     1:1:void <clinit>():429:429 -> <clinit>
@@ -12344,7 +12375,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.Id:
+com.android.tools.r8.com.google.common.hash.HashCode$BytesHashCode -> com.android.tools.r8.internal.Wc:
     byte[] bytes -> c
     1:2:void <init>(byte[]):262:263 -> <init>
     1:1:byte[] asBytes():273:273 -> a
@@ -12352,17 +12383,17 @@
     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.Jd:
+com.android.tools.r8.com.google.common.hash.HashCode$IntHashCode -> com.android.tools.r8.internal.Xc:
     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.Nd:
+com.android.tools.r8.com.google.common.hash.HashFunction -> com.android.tools.r8.internal.bd:
     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.Pd:
+com.android.tools.r8.com.google.common.hash.Hasher -> com.android.tools.r8.internal.dd:
     com.android.tools.r8.com.google.common.hash.HashCode hash() -> a
     com.android.tools.r8.com.google.common.hash.Hasher putBoolean(boolean) -> a
     com.android.tools.r8.com.google.common.hash.Hasher putByte(byte) -> a
@@ -12371,16 +12402,15 @@
     com.android.tools.r8.com.google.common.hash.Hasher putInt(int) -> a
     com.android.tools.r8.com.google.common.hash.Hasher putLong(long) -> 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.Qd:
+com.android.tools.r8.com.google.common.hash.Hashing -> com.android.tools.r8.internal.fd:
     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_128():133:133 -> a
-    1:1:com.android.tools.r8.com.google.common.hash.HashFunction murmur3_32():111:111 -> b
-    1:1:com.android.tools.r8.com.google.common.hash.HashFunction sha256():200:200 -> c
-com.android.tools.r8.com.google.common.hash.Hashing$Sha256Holder -> com.android.tools.r8.internal.Rd:
+    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.ed:
     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.Dq:
+com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction -> com.android.tools.r8.internal.Cp:
     java.security.MessageDigest prototype -> a
     int bytes -> b
     boolean supportsClone -> c
@@ -12395,8 +12425,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.Bq:
-com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$MessageDigestHasher -> com.android.tools.r8.internal.Cq:
+com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$1 -> com.android.tools.r8.internal.Ap:
+com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$MessageDigestHasher -> com.android.tools.r8.internal.Bp:
     java.security.MessageDigest digest -> b
     java.nio.ByteBuffer com.android.tools.r8.com.google.common.hash.AbstractByteHasher.scratch -> a
     int bytes -> c
@@ -12438,86 +12468,7 @@
     1:3:com.android.tools.r8.com.google.common.hash.Hasher com.android.tools.r8.com.google.common.hash.AbstractByteHasher.update(int):102:104 -> b
     4:5:void update(byte[],int,int):138:139 -> b
     6:6:void checkNotDone():149:149 -> b
-com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction -> com.android.tools.r8.internal.Sr:
-    com.android.tools.r8.com.google.common.hash.HashFunction MURMUR3_128 -> a
-    1:3:void <clinit>():43:45 -> <clinit>
-    1:1:void <init>(int):51:51 -> <init>
-    1:1:com.android.tools.r8.com.google.common.hash.Hasher newHasher():62:62 -> a
-    1:3:boolean equals(java.lang.Object):72:74 -> equals
-    1:1:int hashCode():81:81 -> hashCode
-    1:1:java.lang.String toString():67:67 -> toString
-com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction$Murmur3_128Hasher -> com.android.tools.r8.internal.Rr:
-    long h2 -> e
-    int length -> f
-    long h1 -> d
-    int com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.bufferSize -> b
-    java.nio.ByteBuffer com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.buffer -> a
-    int com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.chunkSize -> c
-    1:9:void com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.<init>(int,int):62:70 -> <init>
-    1:9:void com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.<init>(int):50 -> <init>
-    1:9:void <init>(int):93 -> <init>
-    10:12:void <init>(int):94:96 -> <init>
-    1:1:com.android.tools.r8.com.google.common.hash.Hasher com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.putBytes(byte[],int,int):97:97 -> a
-    1:1:com.android.tools.r8.com.google.common.hash.Hasher com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.putBytes(byte[],int,int):0 -> a
-    2:3:void process(java.nio.ByteBuffer):101:102 -> a
-    4:4:void com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction$Murmur3_128Hasher.bmix64(long,long):108:108 -> a
-    4:4:void process(java.nio.ByteBuffer):103 -> a
-    5:5:long com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction$Murmur3_128Hasher.mixK1(long):199:199 -> a
-    5:5:void com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction$Murmur3_128Hasher.bmix64(long,long):108 -> a
-    5:5:void process(java.nio.ByteBuffer):103 -> a
-    6:10:void com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction$Murmur3_128Hasher.bmix64(long,long):108:112 -> a
-    6:10:void process(java.nio.ByteBuffer):103 -> a
-    11:11:long com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction$Murmur3_128Hasher.mixK2(long):206:206 -> a
-    11:11:void com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction$Murmur3_128Hasher.bmix64(long,long):114 -> a
-    11:11:void process(java.nio.ByteBuffer):103 -> a
-    12:16:void com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction$Murmur3_128Hasher.bmix64(long,long):114:118 -> a
-    12:16:void process(java.nio.ByteBuffer):103 -> a
-    17:17:void process(java.nio.ByteBuffer):104:104 -> a
-    18:19:com.android.tools.r8.com.google.common.hash.Hasher com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.putByte(byte):148:149 -> a
-    18:19:com.android.tools.r8.com.google.common.hash.Hasher com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.putByte(byte):0 -> a
-    20:21:com.android.tools.r8.com.google.common.hash.Hasher com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.putInt(int):169:170 -> a
-    20:21:com.android.tools.r8.com.google.common.hash.Hasher com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.putInt(int):0 -> a
-    22:23:com.android.tools.r8.com.google.common.hash.Hasher com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.putLong(long):176:177 -> a
-    22:23:com.android.tools.r8.com.google.common.hash.Hasher com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.putLong(long):0 -> a
-    24:27:com.android.tools.r8.com.google.common.hash.HashCode com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.hash():183:186 -> a
-    24:27:com.android.tools.r8.com.google.common.hash.HashCode com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.hash():0 -> a
-    28:63:void com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction$Murmur3_128Hasher.processRemaining(java.nio.ByteBuffer):125:160 -> a
-    28:63:com.android.tools.r8.com.google.common.hash.HashCode com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.hash():186 -> a
-    28:63:com.android.tools.r8.com.google.common.hash.HashCode com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.hash():0 -> a
-    64:98:void com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction$Murmur3_128Hasher.processRemaining(java.nio.ByteBuffer):128:162 -> a
-    64:98:com.android.tools.r8.com.google.common.hash.HashCode com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.hash():186 -> a
-    64:98:com.android.tools.r8.com.google.common.hash.HashCode com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.hash():0 -> a
-    99:99:long com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction$Murmur3_128Hasher.mixK1(long):199:199 -> a
-    99:99:void com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction$Murmur3_128Hasher.processRemaining(java.nio.ByteBuffer):162 -> a
-    99:99:com.android.tools.r8.com.google.common.hash.HashCode com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.hash():186 -> a
-    99:99:com.android.tools.r8.com.google.common.hash.HashCode com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.hash():0 -> a
-    100:101:void com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction$Murmur3_128Hasher.processRemaining(java.nio.ByteBuffer):162:163 -> a
-    100:101:com.android.tools.r8.com.google.common.hash.HashCode com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.hash():186 -> a
-    100:101:com.android.tools.r8.com.google.common.hash.HashCode com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.hash():0 -> a
-    102:102:long com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction$Murmur3_128Hasher.mixK2(long):206:206 -> a
-    102:102:void com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction$Murmur3_128Hasher.processRemaining(java.nio.ByteBuffer):163 -> a
-    102:102:com.android.tools.r8.com.google.common.hash.HashCode com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.hash():186 -> a
-    102:102:com.android.tools.r8.com.google.common.hash.HashCode com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.hash():0 -> a
-    103:103:void com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction$Murmur3_128Hasher.processRemaining(java.nio.ByteBuffer):163:163 -> a
-    103:103:com.android.tools.r8.com.google.common.hash.HashCode com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.hash():186 -> a
-    103:103:com.android.tools.r8.com.google.common.hash.HashCode com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.hash():0 -> a
-    104:104:com.android.tools.r8.com.google.common.hash.HashCode com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.hash():187:187 -> a
-    104:104:com.android.tools.r8.com.google.common.hash.HashCode com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.hash():0 -> a
-    105:122:com.android.tools.r8.com.google.common.hash.HashCode com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction$Murmur3_128Hasher.makeHash():168:185 -> a
-    105:122:com.android.tools.r8.com.google.common.hash.HashCode com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.hash():189 -> a
-    105:122:com.android.tools.r8.com.google.common.hash.HashCode com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.hash():0 -> a
-    123:123:com.android.tools.r8.com.google.common.hash.HashCode com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction$Murmur3_128Hasher.makeHash():180:180 -> a
-    123:123:com.android.tools.r8.com.google.common.hash.HashCode com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.hash():189 -> a
-    123:123:com.android.tools.r8.com.google.common.hash.HashCode com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.hash():0 -> a
-    124:124:com.android.tools.r8.com.google.common.hash.HashCode com.android.tools.r8.com.google.common.hash.HashCode.fromBytesNoCopy(byte[]):256:256 -> a
-    124:124:com.android.tools.r8.com.google.common.hash.HashCode com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction$Murmur3_128Hasher.makeHash():180 -> a
-    124:124:com.android.tools.r8.com.google.common.hash.HashCode com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.hash():189 -> a
-    124:124:com.android.tools.r8.com.google.common.hash.HashCode com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.hash():0 -> a
-    long fmix64(long) -> b
-    1:20:com.android.tools.r8.com.google.common.hash.Hasher com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.putBytesInternal(java.nio.ByteBuffer):113:132 -> b
-    21:27:void com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.munch():208:214 -> b
-    1:3:void com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.munchIfFull():201:203 -> c
-com.android.tools.r8.com.google.common.hash.Murmur3_32HashFunction -> com.android.tools.r8.internal.Ur:
+com.android.tools.r8.com.google.common.hash.Murmur3_32HashFunction -> com.android.tools.r8.internal.Oq:
     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>
@@ -12549,7 +12500,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.Tr:
+com.android.tools.r8.com.google.common.hash.Murmur3_32HashFunction$Murmur3_32Hasher -> com.android.tools.r8.internal.Nq:
     long buffer -> b
     boolean isDone -> e
     int length -> d
@@ -12571,7 +12522,7 @@
     55:55:com.android.tools.r8.com.google.common.hash.Hasher com.android.tools.r8.com.google.common.hash.AbstractHasher.putString(java.lang.CharSequence,java.nio.charset.Charset) -> a
     55:55:com.android.tools.r8.com.google.common.hash.Hasher putString(java.lang.CharSequence,java.nio.charset.Charset):378 -> a
     56:59:com.android.tools.r8.com.google.common.hash.HashCode hash():384:387 -> a
-com.android.tools.r8.com.google.common.io.BaseEncoding -> com.android.tools.r8.internal.c2:
+com.android.tools.r8.com.google.common.io.BaseEncoding -> com.android.tools.r8.internal.X1:
     com.android.tools.r8.com.google.common.io.BaseEncoding BASE64_URL -> a
     1:45:void <clinit>():315:359 -> <clinit>
     46:46:void com.android.tools.r8.com.google.common.io.BaseEncoding$StandardBaseEncoding.<init>(java.lang.String,java.lang.String,java.lang.Character):563:563 -> <clinit>
@@ -12594,7 +12545,7 @@
     12:12:java.lang.String encode(byte[]):144 -> a
     13:13:com.android.tools.r8.com.google.common.io.BaseEncoding base64Url():355:355 -> a
     com.android.tools.r8.com.google.common.io.BaseEncoding omitPadding() -> b
-com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet -> com.android.tools.r8.internal.Y1:
+com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet -> com.android.tools.r8.internal.T1:
     char[] chars -> c
     int charsPerChunk -> f
     byte[] decodabet -> h
@@ -12611,19 +12562,19 @@
     1:3:boolean equals(java.lang.Object):543:545 -> equals
     1:1:int hashCode():552:552 -> hashCode
     1:1:java.lang.String toString():538:538 -> toString
-com.android.tools.r8.com.google.common.io.BaseEncoding$Base16Encoding -> com.android.tools.r8.internal.Z1:
+com.android.tools.r8.com.google.common.io.BaseEncoding$Base16Encoding -> com.android.tools.r8.internal.U1:
     char[] encoding -> d
     1:1:void <init>(java.lang.String,java.lang.String):847:847 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet):851:851 -> <init>
     3:14:void <init>(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet):844:855 -> <init>
     1:5:void encodeTo(java.lang.Appendable,byte[],int,int):862:866 -> a
     6:6:com.android.tools.r8.com.google.common.io.BaseEncoding newInstance(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet,java.lang.Character):886:886 -> a
-com.android.tools.r8.com.google.common.io.BaseEncoding$Base64Encoding -> com.android.tools.r8.internal.a2:
+com.android.tools.r8.com.google.common.io.BaseEncoding$Base64Encoding -> com.android.tools.r8.internal.V1:
     1:1:void <init>(java.lang.String,java.lang.String,java.lang.Character):892:892 -> <init>
     2:3:void <init>(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet,java.lang.Character):896:897 -> <init>
     1:11:void encodeTo(java.lang.Appendable,byte[],int,int):903:913 -> a
     12:12:com.android.tools.r8.com.google.common.io.BaseEncoding newInstance(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet,java.lang.Character):943:943 -> a
-com.android.tools.r8.com.google.common.io.BaseEncoding$StandardBaseEncoding -> com.android.tools.r8.internal.b2:
+com.android.tools.r8.com.google.common.io.BaseEncoding$StandardBaseEncoding -> com.android.tools.r8.internal.W1:
     java.lang.Character paddingChar -> c
     com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet alphabet -> b
     1:4:void <init>(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet,java.lang.Character):566:569 -> <init>
@@ -12638,7 +12589,7 @@
     2:2:int com.android.tools.r8.com.google.common.base.Objects.hashCode(java.lang.Object[]):76:76 -> hashCode
     2:2:int hashCode():839 -> hashCode
     1:10:java.lang.String toString():815:824 -> toString
-com.android.tools.r8.com.google.common.io.ByteStreams -> com.android.tools.r8.internal.r3:
+com.android.tools.r8.com.google.common.io.ByteStreams -> com.android.tools.r8.internal.e3:
     java.io.OutputStream NULL_OUTPUT_STREAM -> a
     1:1:void <clinit>():594:594 -> <clinit>
     1:3:byte[] toByteArray(java.io.InputStream):165:167 -> a
@@ -12647,13 +12598,13 @@
     5:5:byte[] com.android.tools.r8.com.google.common.io.ByteStreams.createBuffer():56:56 -> a
     5:5:long copy(java.io.InputStream,java.io.OutputStream):103 -> a
     6:10:long copy(java.io.InputStream,java.io.OutputStream):106:110 -> a
-com.android.tools.r8.com.google.common.io.ByteStreams$1 -> com.android.tools.r8.internal.q3:
+com.android.tools.r8.com.google.common.io.ByteStreams$1 -> com.android.tools.r8.internal.d3:
     1:1:void <init>():595:595 -> <init>
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> write
     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.G5:
+com.android.tools.r8.com.google.common.io.CharSequenceReader -> com.android.tools.r8.internal.s5:
     java.lang.CharSequence seq -> a
     int pos -> b
     int mark -> c
@@ -12671,12 +12622,12 @@
     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.J5:
+com.android.tools.r8.com.google.common.io.CharSource -> com.android.tools.r8.internal.v5:
     1:1:void <init>():76:76 -> <init>
     1:2:java.io.BufferedReader openBufferedStream():113:114 -> a
     3:3:com.android.tools.r8.com.google.common.io.CharSource wrap(java.lang.CharSequence):479:479 -> a
     java.io.Reader openStream() -> b
-com.android.tools.r8.com.google.common.io.CharSource$CharSequenceCharSource -> com.android.tools.r8.internal.H5:
+com.android.tools.r8.com.google.common.io.CharSource$CharSequenceCharSource -> com.android.tools.r8.internal.t5:
     java.lang.CharSequence seq -> a
     1:1:void <clinit>():525:525 -> <clinit>
     1:2:void <init>(java.lang.CharSequence):529:530 -> <init>
@@ -12688,13 +12639,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.I5:
+com.android.tools.r8.com.google.common.io.CharSource$StringCharSource -> com.android.tools.r8.internal.u5:
     1:1:void <init>(java.lang.String):630:630 -> <init>
     1:1:java.io.Reader openStream():635:635 -> b
-com.android.tools.r8.com.google.common.io.Closeables -> com.android.tools.r8.internal.l7:
+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.p7:
+com.android.tools.r8.com.google.common.io.Closer -> com.android.tools.r8.internal.a7:
     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
@@ -12727,12 +12678,12 @@
     24:24:void com.android.tools.r8.com.google.common.base.Throwables.propagateIfInstanceOf(java.lang.Throwable,java.lang.Class):104 -> close
     24:24:void com.android.tools.r8.com.google.common.base.Throwables.propagateIfPossible(java.lang.Throwable,java.lang.Class):184 -> close
     24:24:void close():227 -> close
-com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor -> com.android.tools.r8.internal.m7:
+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.n7:
+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>
@@ -12743,9 +12694,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.o7:
+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.Dh:
+com.android.tools.r8.com.google.common.math.IntMath -> com.android.tools.r8.internal.Pg:
     int[] biggestBinomials -> a
     1:1:void <clinit>():675:675 -> <clinit>
     boolean isPowerOfTwo(int) -> a
@@ -12765,14 +12716,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.Ch:
+com.android.tools.r8.com.google.common.math.IntMath$1 -> com.android.tools.r8.internal.Og:
     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.jq:
+com.android.tools.r8.com.google.common.math.MathPreconditions -> com.android.tools.r8.internal.gp:
     1:1:int checkNonNegative(java.lang.String,int):53:53 -> a
-com.android.tools.r8.com.google.common.primitives.Ints -> com.android.tools.r8.internal.ji:
-    int saturatedCast(long) -> a
-com.android.tools.r8.com.google.gson.JsonArray -> com.android.tools.r8.internal.dj:
+com.android.tools.r8.com.google.gson.JsonArray -> com.android.tools.r8.internal.li:
     java.util.List elements -> a
     1:2:void <init>():39:40 -> <init>
     1:1:void add(java.lang.Number):76:76 -> a
@@ -12782,12 +12731,12 @@
     1:4:int getAsInt():310:313 -> b
     1:4:long getAsLong():294:297 -> e
     1:1:boolean equals(java.lang.Object):366:366 -> equals
-    1:4:java.lang.String getAsString():212:215 -> f
     1:1:com.android.tools.r8.com.google.gson.JsonElement get(int):183:183 -> g
+    2:5:java.lang.String getAsString():212:215 -> g
     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.ej:
+com.android.tools.r8.com.google.gson.JsonElement -> com.android.tools.r8.internal.mi:
     1:1:void <init>():33:33 -> <init>
     1:1:boolean getAsBoolean():152:152 -> a
     1:1:int getAsInt():243:243 -> b
@@ -12798,20 +12747,20 @@
     1:1:com.android.tools.r8.com.google.gson.JsonObject getAsJsonObject():87 -> d
     2:4:com.android.tools.r8.com.google.gson.JsonObject getAsJsonObject():88:90 -> d
     1:1:long getAsLong():230:230 -> e
-    1:1:java.lang.String getAsString():191:191 -> f
+    1:1:java.lang.String getAsString():191:191 -> g
     1:3:java.lang.String toString():321:323 -> toString
     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.fj:
+com.android.tools.r8.com.google.gson.JsonIOException -> com.android.tools.r8.internal.ni:
     1:1:void <init>(java.lang.Throwable):43:43 -> <init>
-com.android.tools.r8.com.google.gson.JsonNull -> com.android.tools.r8.internal.gj:
+com.android.tools.r8.com.google.gson.JsonNull -> com.android.tools.r8.internal.oi:
     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.hj:
+com.android.tools.r8.com.google.gson.JsonObject -> com.android.tools.r8.internal.pi:
     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
@@ -12830,11 +12779,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.ij:
+com.android.tools.r8.com.google.gson.JsonParseException -> com.android.tools.r8.internal.qi:
     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.jj:
+com.android.tools.r8.com.google.gson.JsonParser -> com.android.tools.r8.internal.ri:
     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:4:com.android.tools.r8.com.google.gson.JsonElement com.android.tools.r8.com.google.gson.JsonParser.parse(java.io.Reader):58:60 -> a
@@ -12851,7 +12800,7 @@
     18:27:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):81:90 -> a
     28:28:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):88:88 -> a
     29:33: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.kj:
+com.android.tools.r8.com.google.gson.JsonPrimitive -> com.android.tools.r8.internal.si:
     java.lang.Class[] PRIMITIVE_TYPES -> a
     java.lang.Object value -> b
     1:1:void <clinit>():35:35 -> <clinit>
@@ -12878,26 +12827,32 @@
     1:1:long getAsLong():238 -> e
     2:2:long getAsLong():238:238 -> e
     1:18:boolean equals(java.lang.Object):309:326 -> equals
-    1:1:boolean com.android.tools.r8.com.google.gson.JsonPrimitive.isNumber():146:146 -> f
-    1:1:java.lang.String getAsString():176 -> f
-    2:2:java.lang.String getAsString():177:177 -> f
-    3:3:boolean com.android.tools.r8.com.google.gson.JsonPrimitive.isBoolean():112:112 -> f
-    3:3:java.lang.String getAsString():178 -> f
-    4:4:java.lang.Boolean com.android.tools.r8.com.google.gson.JsonPrimitive.getAsBooleanWrapper():122:122 -> f
-    4:4:java.lang.String getAsString():179 -> f
-    5:7:java.lang.String getAsString():179:181 -> f
+    1:1:boolean com.android.tools.r8.com.google.gson.JsonPrimitive.isNumber():146:146 -> g
+    1:1:java.lang.String getAsString():176 -> g
+    2:2:java.lang.String getAsString():177:177 -> g
+    3:3:boolean com.android.tools.r8.com.google.gson.JsonPrimitive.isBoolean():112:112 -> g
+    3:3:java.lang.String getAsString():178 -> g
+    4:4:java.lang.Boolean com.android.tools.r8.com.google.gson.JsonPrimitive.getAsBooleanWrapper():122:122 -> g
+    4:4:java.lang.String getAsString():179 -> g
+    5:7:java.lang.String getAsString():179:181 -> g
     1:1:java.lang.Number getAsNumber():157:157 -> h
     1:13:int hashCode():289:301 -> hashCode
     1:1:boolean isBoolean():112:112 -> i
     1:1:boolean isNumber():146:146 -> k
-com.android.tools.r8.com.google.gson.JsonSyntaxException -> com.android.tools.r8.internal.mj:
+com.android.tools.r8.com.google.gson.JsonSyntaxException -> com.android.tools.r8.internal.ui:
     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.pF:
+com.android.tools.r8.com.google.gson.TypeAdapter -> com.android.tools.r8.internal.jE:
     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
-com.android.tools.r8.com.google.gson.internal.LazilyParsedNumber -> com.android.tools.r8.internal.bo:
+    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.iE:
+    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.gn:
     java.lang.String value -> a
     1:2:void <init>(java.lang.String):30:31 -> <init>
     1:1:double doubleValue():63:63 -> doubleValue
@@ -12907,7 +12862,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.Oo:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap -> com.android.tools.r8.internal.Sn:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node root -> d
     int modCount -> f
     java.util.Comparator comparator -> c
@@ -12950,12 +12905,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.Mo:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$1 -> com.android.tools.r8.internal.Qn:
     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.Oo$a:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet -> com.android.tools.r8.internal.Sn$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
@@ -12963,11 +12918,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.No:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet$1 -> com.android.tools.r8.internal.Rn:
     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.Oo$b:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet -> com.android.tools.r8.internal.Sn$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
@@ -12979,23 +12934,23 @@
     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.Po:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet$1 -> com.android.tools.r8.internal.Tn:
     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.Oo$c:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$LinkedTreeMapIterator -> com.android.tools.r8.internal.Sn$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
     int expectedModCount -> c
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap):531:531 -> <init>
     2:4:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap):527:529 -> <init>
-    1:9:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node nextNode():539:547 -> f
-    10:10:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node nextNode():544:544 -> f
-    11:11:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node nextNode():541:541 -> f
+    1:9:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node nextNode():539:547 -> e
+    10:10:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node nextNode():544:544 -> e
+    11:11:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node nextNode():541:541 -> e
     1:1:boolean hasNext():535:535 -> hasNext
     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.Qo:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node -> com.android.tools.r8.internal.Un:
     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
@@ -13012,15 +12967,146 @@
     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.Streams -> com.android.tools.r8.internal.mD:
-    1:19:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):46:64 -> a
-    20:20:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):62:62 -> a
-    21:21:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):60:60 -> a
-    22:25:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):55:58 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters -> com.android.tools.r8.internal.rF:
-    com.android.tools.r8.com.google.gson.TypeAdapter JSON_ELEMENT -> a
-    1:1:void <clinit>():714:714 -> <clinit>
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$29 -> com.android.tools.r8.internal.qF:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters -> com.android.tools.r8.internal.GE:
+    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
+    com.android.tools.r8.com.google.gson.TypeAdapter CHARACTER -> k
+    com.android.tools.r8.com.google.gson.TypeAdapter URI -> p
+    com.android.tools.r8.com.google.gson.TypeAdapter INET_ADDRESS -> q
+    com.android.tools.r8.com.google.gson.TypeAdapter STRING_BUFFER -> n
+    com.android.tools.r8.com.google.gson.TypeAdapter URL -> o
+    com.android.tools.r8.com.google.gson.TypeAdapter BYTE -> d
+    com.android.tools.r8.com.google.gson.TypeAdapter SHORT -> e
+    com.android.tools.r8.com.google.gson.TypeAdapter BIT_SET -> b
+    com.android.tools.r8.com.google.gson.TypeAdapter BOOLEAN -> c
+    com.android.tools.r8.com.google.gson.TypeAdapter ATOMIC_BOOLEAN -> h
+    com.android.tools.r8.com.google.gson.TypeAdapter ATOMIC_INTEGER_ARRAY -> i
+    com.android.tools.r8.com.google.gson.TypeAdapter INTEGER -> f
+    com.android.tools.r8.com.google.gson.TypeAdapter ATOMIC_INTEGER -> g
+    com.android.tools.r8.com.google.gson.TypeAdapter CLASS -> a
+    com.android.tools.r8.com.google.gson.TypeAdapter CALENDAR -> t
+    com.android.tools.r8.com.google.gson.TypeAdapter LOCALE -> u
+    com.android.tools.r8.com.google.gson.TypeAdapter UUID -> r
+    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.pE:
+    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.kE:
+    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.lE:
+    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
+    2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):362 -> a
+    3:11:java.lang.Number com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$14.read(com.android.tools.r8.com.google.gson.stream.JsonReader):365:373 -> a
+    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.mE:
+    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
+    2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):384 -> a
+    3:11:java.lang.Character com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$15.read(com.android.tools.r8.com.google.gson.stream.JsonReader):387:395 -> a
+    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.nE:
+    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.oE:
+    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.zE:
+    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
+    2:11:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):92 -> a
+    12:40:java.util.BitSet com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$2.read(com.android.tools.r8.com.google.gson.stream.JsonReader):94:122 -> a
+    12:40:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):92 -> a
+    41:41:java.util.BitSet com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$2.read(com.android.tools.r8.com.google.gson.stream.JsonReader):110:110 -> a
+    41:41:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):92 -> a
+    42:63:java.util.BitSet com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$2.read(com.android.tools.r8.com.google.gson.stream.JsonReader):107:128 -> a
+    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.qE:
+    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.rE:
+    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.sE:
+    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.tE:
+    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.uE:
+    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.vE:
+    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.wE:
+    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.xE:
+    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.yE:
     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
@@ -13046,7 +13132,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.stream.JsonReader -> com.android.tools.r8.internal.lj:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$3 -> com.android.tools.r8.internal.AE:
+    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.BE:
+    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.CE:
+    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.DE:
+    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.EE:
+    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.FE:
+    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.ti:
     char[] NON_EXECUTE_PREFIX -> a
     long peekedLong -> j
     int stackSize -> n
@@ -13121,25 +13249,29 @@
     18:36:java.lang.String locationString():1451 -> i
     37:37:java.lang.String locationString():1451:1451 -> i
     1:14:boolean nextBoolean():840:853 -> j
-    1:16:java.lang.String nextName():777:792 -> k
-    17:17:java.lang.String nextName():789:789 -> k
-    1:9:void nextNull():864:872 -> l
-    1:24:java.lang.String nextString():805:828 -> m
-    25:25:java.lang.String nextString():825:825 -> m
-    1:52:java.lang.String nextUnquotedValue():1032:1083 -> n
-    1:35:com.android.tools.r8.com.google.gson.stream.JsonToken peek():423:457 -> o
-    36:36:com.android.tools.r8.com.google.gson.stream.JsonToken peek():455:455 -> o
-    37:37:com.android.tools.r8.com.google.gson.stream.JsonToken peek():453:453 -> o
-    38:48:com.android.tools.r8.com.google.gson.stream.JsonToken peek():440:450 -> o
-    49:49:com.android.tools.r8.com.google.gson.stream.JsonToken peek():445:445 -> o
-    50:50:com.android.tools.r8.com.google.gson.stream.JsonToken peek():443:443 -> o
-    51:51:com.android.tools.r8.com.google.gson.stream.JsonToken peek():436:436 -> o
-    52:52:com.android.tools.r8.com.google.gson.stream.JsonToken peek():434:434 -> o
-    53:53:com.android.tools.r8.com.google.gson.stream.JsonToken peek():432:432 -> o
-    54:54:com.android.tools.r8.com.google.gson.stream.JsonToken peek():430:430 -> o
-    1:5:void skipToEndOfLine():1411:1415 -> p
+    1:13:int nextInt():1155:1167 -> k
+    14:39:int nextInt():1164:1189 -> k
+    40:64:int nextInt():1176:1200 -> k
+    65:65:int nextInt():1196:1196 -> k
+    1:16:java.lang.String nextName():777:792 -> l
+    17:17:java.lang.String nextName():789:789 -> l
+    1:9:void nextNull():864:872 -> m
+    1:24:java.lang.String nextString():805:828 -> n
+    25:25:java.lang.String nextString():825:825 -> n
+    1:52:java.lang.String nextUnquotedValue():1032:1083 -> o
+    1:35:com.android.tools.r8.com.google.gson.stream.JsonToken peek():423:457 -> p
+    36:36:com.android.tools.r8.com.google.gson.stream.JsonToken peek():455:455 -> p
+    37:37:com.android.tools.r8.com.google.gson.stream.JsonToken peek():453:453 -> p
+    38:48:com.android.tools.r8.com.google.gson.stream.JsonToken peek():440:450 -> p
+    49:49:com.android.tools.r8.com.google.gson.stream.JsonToken peek():445:445 -> p
+    50:50:com.android.tools.r8.com.google.gson.stream.JsonToken peek():443:443 -> p
+    51:51:com.android.tools.r8.com.google.gson.stream.JsonToken peek():436:436 -> p
+    52:52:com.android.tools.r8.com.google.gson.stream.JsonToken peek():434:434 -> p
+    53:53:com.android.tools.r8.com.google.gson.stream.JsonToken peek():432:432 -> p
+    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.nj:
+com.android.tools.r8.com.google.gson.stream.JsonToken -> com.android.tools.r8.internal.vi:
     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
@@ -13154,15 +13286,16 @@
     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.oj:
-    java.lang.String deferredName -> g
-    int[] stack -> c
-    boolean lenient -> f
-    java.io.Writer out -> b
-    int stackSize -> d
-    boolean serializeNulls -> h
+com.android.tools.r8.com.google.gson.stream.JsonWriter -> com.android.tools.r8.internal.wi:
+    java.lang.String separator -> f
+    java.lang.String deferredName -> h
+    boolean serializeNulls -> i
+    int[] stack -> d
+    boolean lenient -> g
+    java.io.Writer out -> c
+    int stackSize -> e
     java.lang.String[] REPLACEMENT_CHARS -> a
-    java.lang.String separator -> e
+    java.lang.String[] HTML_SAFE_REPLACEMENT_CHARS -> b
     1:17:void <clinit>():145:161 -> <clinit>
     1:1:void <init>(java.io.Writer):197:197 -> <init>
     2:36:void <init>(java.io.Writer):167:201 -> <init>
@@ -13174,11 +13307,13 @@
     29:29:com.android.tools.r8.com.google.gson.stream.JsonWriter name(java.lang.String):393:393 -> a
     30:30:com.android.tools.r8.com.google.gson.stream.JsonWriter name(java.lang.String):390:390 -> a
     31:31:com.android.tools.r8.com.google.gson.stream.JsonWriter name(java.lang.String):387:387 -> a
-    32:42:com.android.tools.r8.com.google.gson.stream.JsonWriter value(java.lang.Number):524:534 -> a
-    43:70:void beforeValue():629:656 -> a
-    71:92:void beforeValue():631:652 -> a
-    93:93:void beforeValue():646:646 -> a
-    94:94:void beforeValue():641:641 -> a
+    32:36:com.android.tools.r8.com.google.gson.stream.JsonWriter value(java.lang.Boolean):478:482 -> a
+    37:39:com.android.tools.r8.com.google.gson.stream.JsonWriter value(long):509:511 -> a
+    40:50:com.android.tools.r8.com.google.gson.stream.JsonWriter value(java.lang.Number):524:534 -> a
+    51:78:void beforeValue():629:656 -> a
+    79:100:void beforeValue():631:652 -> a
+    101:101:void beforeValue():646:646 -> a
+    102:102:void beforeValue():641:641 -> a
     1:1:com.android.tools.r8.com.google.gson.stream.JsonWriter beginArray():287:287 -> b
     2:4:com.android.tools.r8.com.google.gson.stream.JsonWriter com.android.tools.r8.com.google.gson.stream.JsonWriter.open(int,java.lang.String):325:327 -> b
     2:4:com.android.tools.r8.com.google.gson.stream.JsonWriter beginArray():288 -> b
@@ -13204,7 +13339,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.Pp:
+com.android.tools.r8.com.google.gson.stream.MalformedJsonException -> com.android.tools.r8.internal.Ro:
     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
@@ -13286,7 +13421,7 @@
     61:61:com.android.tools.r8.graph.LazyLoadedDexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver,boolean):138 -> a
     62:92:com.android.tools.r8.graph.LazyLoadedDexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver,boolean):140:170 -> a
     93:93:com.android.tools.r8.graph.LazyLoadedDexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver,boolean):166:166 -> a
-    94:94:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):221:221 -> a
+    94:94:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):210:210 -> a
     94:94:com.android.tools.r8.graph.LazyLoadedDexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver,boolean):164 -> a
     95:99:com.android.tools.r8.graph.LazyLoadedDexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver,boolean):164:168 -> a
     100:110:com.android.tools.r8.shaking.MainDexClasses readMainDexClasses(com.android.tools.r8.graph.DexApplication):202:212 -> a
@@ -13345,10 +13480,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):162:162 -> <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):179:190 -> <init>
     1:1:java.util.List distribute(java.util.concurrent.ExecutorService):197:197 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():439:439 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():446:446 -> a
     2:2:java.util.List distribute(java.util.concurrent.ExecutorService):197 -> a
     3:3:java.util.List distribute(java.util.concurrent.ExecutorService):198:198 -> a
-    4:4:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():455:455 -> a
+    4:4:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():462:462 -> a
     4:4:java.util.List distribute(java.util.concurrent.ExecutorService):199 -> a
     5:14:java.util.List distribute(java.util.concurrent.ExecutorService):199:208 -> a
     15:16:void encodeChecksums(java.lang.Iterable):218:219 -> a
@@ -13360,12 +13495,12 @@
     30:30:com.android.tools.r8.utils.Timing lambda$write$2(com.android.tools.r8.dex.VirtualFile):295:295 -> a
     31:40:void writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing):318:327 -> a
     31:40:com.android.tools.r8.utils.Timing lambda$write$2(com.android.tools.r8.dex.VirtualFile):296 -> a
-    41:41:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():455:455 -> a
+    41:41:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():462:462 -> a
     41:41:void writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing):327 -> a
     41:41:com.android.tools.r8.utils.Timing lambda$write$2(com.android.tools.r8.dex.VirtualFile):296 -> a
     42:48:void writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing):330:336 -> a
     42:48:com.android.tools.r8.utils.Timing lambda$write$2(com.android.tools.r8.dex.VirtualFile):296 -> a
-    49:49:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():451:451 -> a
+    49:49:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():458:458 -> a
     49:49:void writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing):336 -> a
     49:49:com.android.tools.r8.utils.Timing lambda$write$2(com.android.tools.r8.dex.VirtualFile):296 -> a
     50:58:void writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing):340:348 -> a
@@ -13401,7 +13536,7 @@
     240:256:void insertAttributeAnnotations():482 -> a
     257:263:void insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):522:528 -> a
     257:263:void insertAttributeAnnotations():482 -> a
-    264:273:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.createInnerClassAnnotation(com.android.tools.r8.graph.DexString,int,com.android.tools.r8.graph.DexItemFactory):163:172 -> a
+    264:273:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.createInnerClassAnnotation(com.android.tools.r8.graph.DexString,int,com.android.tools.r8.graph.DexItemFactory):161:170 -> a
     264:273:void insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):526 -> a
     264:273:void insertAttributeAnnotations():482 -> a
     274:282:void insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):525:533 -> a
@@ -13460,10 +13595,10 @@
     1:45:void write(java.util.concurrent.ExecutorService):234:278 -> c
     46:51:void write(java.util.concurrent.ExecutorService):276:281 -> c
     52:60:void write(java.util.concurrent.ExecutorService):279:287 -> c
-    61:62:int com.android.tools.r8.utils.ThreadUtils.getNumberOfThreads(java.util.concurrent.ExecutorService):186:187 -> c
+    61:62:int com.android.tools.r8.utils.ThreadUtils.getNumberOfThreads(java.util.concurrent.ExecutorService):180:181 -> c
     61:62:void write(java.util.concurrent.ExecutorService):290 -> c
     63:78:void write(java.util.concurrent.ExecutorService):290:305 -> c
-    79:79:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():408:408 -> c
+    79:79:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():415:415 -> c
     79:79:void write(java.util.concurrent.ExecutorService):305 -> c
     80:88:void write(java.util.concurrent.ExecutorService):305:313 -> c
 com.android.tools.r8.dex.ApplicationWriter$1 -> com.android.tools.r8.dex.b$a:
@@ -13506,7 +13641,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.j7:
+com.android.tools.r8.dex.ClassesChecksum -> com.android.tools.r8.internal.U6:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap dictionary -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
@@ -13535,7 +13670,7 @@
     2:2:boolean com.android.tools.r8.naming.NamingLens.hasPrefixRewritingLogic():0:0 -> a
     2:2:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):24 -> a
     3:4:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):24:25 -> a
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():408:408 -> a
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():415:415 -> a
     5:5:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):26 -> a
     6:8:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):27:29 -> a
 com.android.tools.r8.dex.CodeToKeep$1 -> com.android.tools.r8.dex.d:
@@ -13561,9 +13696,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):378:385 -> c
+    2:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.lookupBaseType(com.android.tools.r8.graph.DexItemFactory):411:418 -> 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):383:387 -> c
+    10:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.lookupBaseType(com.android.tools.r8.graph.DexItemFactory):416:420 -> 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
@@ -13582,7 +13717,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.e8:
+com.android.tools.r8.dex.CompatByteBuffer -> com.android.tools.r8.internal.G7:
     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
@@ -13650,12 +13785,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.v8:
+com.android.tools.r8.dex.Constants -> com.android.tools.r8.internal.W7:
     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.S8:
+com.android.tools.r8.dex.DebugBytecodeWriter -> com.android.tools.r8.internal.r8:
     com.android.tools.r8.graph.ObjectToOffsetMapping mapping -> a
     com.android.tools.r8.graph.DexDebugInfo info -> c
     java.nio.ByteBuffer buffer -> d
@@ -13765,11 +13900,11 @@
     39:39:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
     39:39:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):633 -> a
     40:50:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):633:643 -> a
-    51:52:java.lang.String com.android.tools.r8.graph.DexAnnotation.getSignature(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):266:267 -> a
+    51:52:java.lang.String com.android.tools.r8.graph.DexAnnotation.getSignature(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):264:265 -> a
     51:52:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):643 -> a
     53:56:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):645:648 -> a
     57:61:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):647:651 -> a
-    62:62: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):80:80 -> a
+    62:62: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):74:74 -> a
     62:62:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):651 -> a
     63:63:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):651:651 -> a
     64:71:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):663:670 -> a
@@ -13867,7 +14002,7 @@
     170:171:void ensureCodesInited(int):166:167 -> a
     170:171:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):675 -> a
     172:180:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):676:684 -> a
-    181:182:java.lang.String com.android.tools.r8.graph.DexAnnotation.getSignature(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):266:267 -> a
+    181:182:java.lang.String com.android.tools.r8.graph.DexAnnotation.getSignature(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):264:265 -> a
     181:182:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):684 -> a
     183:186:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):686:689 -> a
     187:201:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):688:702 -> a
@@ -14279,7 +14414,7 @@
     8:8:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> h
     8:8:void setByteOrder():98 -> h
     9:9:void setByteOrder():98:98 -> h
-com.android.tools.r8.dex.DexSection -> com.android.tools.r8.internal.ja:
+com.android.tools.r8.dex.DexSection -> com.android.tools.r8.internal.G9:
     int offset -> d
     boolean $assertionsDisabled -> a
     int type -> b
@@ -14388,7 +14523,7 @@
     173:173:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):580 -> a
     174:180:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):582:588 -> a
     181:181:int lambda$writeAnnotationSet$2(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation):585:585 -> a
-    182:182:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):63:63 -> a
+    182:182:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):68:68 -> a
     182:182:int lambda$writeAnnotationSet$2(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation):585 -> a
     183:192:void writeAnnotationSetRefList(com.android.tools.r8.graph.ParameterAnnotationsList):593:602 -> a
     193:195:void writeMemberAnnotations(java.util.List,java.util.function.ToIntFunction):608:610 -> a
@@ -14402,7 +14537,7 @@
     223:223:void writeEncodedFields(java.util.List):644 -> a
     224:224:void writeEncodedFields(java.util.List):645:645 -> a
     225:225:int lambda$writeEncodedFields$6(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):636:636 -> a
-    226:226:int com.android.tools.r8.graph.DexField.acceptCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.structural.CompareToVisitor):155:155 -> a
+    226:226:int com.android.tools.r8.graph.DexField.acceptCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.structural.CompareToVisitor):143:143 -> a
     226:226:int lambda$writeEncodedFields$6(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):636 -> a
     227:233:void writeEncodedMethods(java.lang.Iterable,boolean):651:657 -> a
     234:234:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):82:82 -> a
@@ -14460,103 +14595,100 @@
     8:8:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():175:175 -> c
     9:23:boolean verifyNames():312:326 -> c
     9:23:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():175 -> c
-    24:24:boolean com.android.tools.r8.synthesis.SyntheticNaming.verifyNotInternalSynthetic(com.android.tools.r8.graph.DexType):103:103 -> c
-    24:24:boolean verifyNames():326 -> c
-    24:24:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():175 -> c
-    25:35:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():177:187 -> c
-    36:38:int sizeOfCodeItems(java.lang.Iterable):400:402 -> c
-    36:38:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():187 -> c
-    39:60:int sizeOfCodeItem(com.android.tools.r8.graph.DexCode):410:431 -> c
-    39:60:int sizeOfCodeItems(java.lang.Iterable):402 -> c
-    39:60:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():187 -> c
-    61:61:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
-    61:61:int sizeOfCodeItem(com.android.tools.r8.graph.DexCode):432 -> c
-    61:61:int sizeOfCodeItems(java.lang.Iterable):402 -> c
-    61:61:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():187 -> c
-    62:72:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():187:197 -> c
-    73:74:void writeDebugItem(com.android.tools.r8.graph.DexDebugInfo,com.android.tools.r8.graph.GraphLens):491:492 -> c
-    73:74:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():197 -> c
-    75:85:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():203:213 -> c
-    86:86:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):385:385 -> c
-    86:86:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():213 -> c
-    87:87:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():214:214 -> c
-    88:88:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):385:385 -> c
-    88:88:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():214 -> c
-    89:89:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():216:216 -> c
-    90:90:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):385:385 -> c
-    90:90:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():216 -> c
-    91:91:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():218:218 -> c
-    92:92:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):385:385 -> c
-    92:92:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():218 -> c
-    93:93:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():220:220 -> c
-    94:94:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):385:385 -> c
-    94:94:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():220 -> c
-    95:103:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():222:230 -> c
-    104:109:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):757:762 -> c
-    104:109:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():231 -> c
-    110:113:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):761:764 -> c
-    110:113:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():231 -> c
-    114:117:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):763:766 -> c
-    114:117:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():231 -> c
-    118:121:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):765:768 -> c
-    118:121:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():231 -> c
-    122:125:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):767:770 -> c
-    122:125:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():231 -> c
-    126:129:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):769:772 -> c
-    126:129:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():231 -> c
-    130:133:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):771:774 -> c
-    130:133:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():231 -> c
-    134:137:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):773:776 -> c
-    134:137:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():231 -> c
-    138:141:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):775:778 -> c
-    138:141:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():231 -> c
-    142:145:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):777:780 -> c
-    142:145:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():231 -> c
-    146:149:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):779:782 -> c
-    146:149:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():231 -> c
-    150:153:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):781:784 -> c
-    150:153:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():231 -> c
-    154:157:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):783:786 -> c
-    154:157:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():231 -> c
-    158:161:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):785:788 -> c
-    158:161:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():231 -> c
-    162:165:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):787:790 -> c
-    162:165:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():231 -> c
-    166:169:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):789:792 -> c
-    166:169:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():231 -> c
-    170:174:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):791:795 -> c
-    170:174:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():231 -> c
-    175:180:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):793:798 -> c
-    175:180:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():231 -> c
-    181:187:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):796:802 -> c
-    181:187:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():231 -> c
-    188:197:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():232:241 -> c
-    198:200:void writeFixedSectionItems(com.android.tools.r8.graph.DexProgramClass[],int,java.util.function.Consumer):377:379 -> c
-    198:200:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():241 -> c
-    201:203:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():242:244 -> c
-    204:204:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():243:243 -> c
-    205:211:void writeHeader(com.android.tools.r8.dex.FileWriter$Layout):806:812 -> c
-    205:211:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():247 -> c
-    212:213:void writeHeader(com.android.tools.r8.dex.FileWriter$Layout):811:812 -> c
-    212:213:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():247 -> c
-    214:248:void writeHeader(com.android.tools.r8.dex.FileWriter$Layout):808:842 -> c
-    214:248:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():247 -> c
-    249:251:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):847:849 -> c
-    249:251:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():248 -> c
-    252:254:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):848:850 -> c
-    252:254:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():248 -> c
-    255:257:void writeChecksum(com.android.tools.r8.dex.FileWriter$Layout):857:859 -> c
-    255:257:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():249 -> c
-    258:261:void writeChecksum(com.android.tools.r8.dex.FileWriter$Layout):858:861 -> c
-    258:261:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():249 -> c
-    262:262:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():252:252 -> c
-    263:263:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):852:852 -> c
-    263:263:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():248 -> c
-    264:269:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):475:480 -> c
-    270:274:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):479:483 -> c
-    275:279:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):482:486 -> c
-    280:282:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):485:487 -> c
-    283:283:int lambda$writeAnnotationDirectory$5(com.android.tools.r8.graph.DexEncodedMethod):631:631 -> c
+    24:34:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():177:187 -> c
+    35:37:int sizeOfCodeItems(java.lang.Iterable):400:402 -> c
+    35:37:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():187 -> c
+    38:59:int sizeOfCodeItem(com.android.tools.r8.graph.DexCode):410:431 -> c
+    38:59:int sizeOfCodeItems(java.lang.Iterable):402 -> c
+    38:59:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():187 -> c
+    60:60:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
+    60:60:int sizeOfCodeItem(com.android.tools.r8.graph.DexCode):432 -> c
+    60:60:int sizeOfCodeItems(java.lang.Iterable):402 -> c
+    60:60:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():187 -> c
+    61:71:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():187:197 -> c
+    72:73:void writeDebugItem(com.android.tools.r8.graph.DexDebugInfo,com.android.tools.r8.graph.GraphLens):491:492 -> c
+    72:73:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():197 -> c
+    74:84:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():203:213 -> c
+    85:85:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):385:385 -> c
+    85:85:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():213 -> c
+    86:86:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():214:214 -> c
+    87:87:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):385:385 -> c
+    87:87:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():214 -> c
+    88:88:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():216:216 -> c
+    89:89:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):385:385 -> c
+    89:89:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():216 -> c
+    90:90:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():218:218 -> c
+    91:91:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):385:385 -> c
+    91:91:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():218 -> c
+    92:92:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():220:220 -> c
+    93:93:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):385:385 -> c
+    93:93:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():220 -> c
+    94:102:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():222:230 -> c
+    103:108:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):757:762 -> c
+    103:108:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():231 -> c
+    109:112:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):761:764 -> c
+    109:112:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():231 -> c
+    113:116:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):763:766 -> c
+    113:116:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():231 -> c
+    117:120:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):765:768 -> c
+    117:120:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():231 -> c
+    121:124:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):767:770 -> c
+    121:124:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():231 -> c
+    125:128:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):769:772 -> c
+    125:128:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():231 -> c
+    129:132:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):771:774 -> c
+    129:132:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():231 -> c
+    133:136:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):773:776 -> c
+    133:136:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():231 -> c
+    137:140:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):775:778 -> c
+    137:140:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():231 -> c
+    141:144:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):777:780 -> c
+    141:144:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():231 -> c
+    145:148:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):779:782 -> c
+    145:148:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():231 -> c
+    149:152:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):781:784 -> c
+    149:152:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():231 -> c
+    153:156:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):783:786 -> c
+    153:156:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():231 -> c
+    157:160:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):785:788 -> c
+    157:160:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():231 -> c
+    161:164:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):787:790 -> c
+    161:164:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():231 -> c
+    165:168:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):789:792 -> c
+    165:168:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():231 -> c
+    169:173:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):791:795 -> c
+    169:173:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():231 -> c
+    174:179:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):793:798 -> c
+    174:179:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():231 -> c
+    180:186:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):796:802 -> c
+    180:186:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():231 -> c
+    187:196:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():232:241 -> c
+    197:199:void writeFixedSectionItems(com.android.tools.r8.graph.DexProgramClass[],int,java.util.function.Consumer):377:379 -> c
+    197:199:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():241 -> c
+    200:202:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():242:244 -> c
+    203:203:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():243:243 -> c
+    204:210:void writeHeader(com.android.tools.r8.dex.FileWriter$Layout):806:812 -> c
+    204:210:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():247 -> c
+    211:212:void writeHeader(com.android.tools.r8.dex.FileWriter$Layout):811:812 -> c
+    211:212:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():247 -> c
+    213:247:void writeHeader(com.android.tools.r8.dex.FileWriter$Layout):808:842 -> c
+    213:247:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():247 -> c
+    248:250:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):847:849 -> c
+    248:250:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():248 -> c
+    251:253:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):848:850 -> c
+    251:253:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():248 -> c
+    254:256:void writeChecksum(com.android.tools.r8.dex.FileWriter$Layout):857:859 -> c
+    254:256:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():249 -> c
+    257:260:void writeChecksum(com.android.tools.r8.dex.FileWriter$Layout):858:861 -> c
+    257:260:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():249 -> c
+    261:261:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():252:252 -> c
+    262:262:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):852:852 -> c
+    262:262:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():248 -> c
+    263:268:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):475:480 -> c
+    269:273:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):479:483 -> c
+    274:278:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):482:486 -> c
+    279:281:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):485:487 -> c
+    282:282:int lambda$writeAnnotationDirectory$5(com.android.tools.r8.graph.DexEncodedMethod):631:631 -> c
     1:16:java.util.List sortDexCodesByClassName():334:349 -> d
 com.android.tools.r8.dex.FileWriter$1 -> com.android.tools.r8.dex.l:
 com.android.tools.r8.dex.FileWriter$ByteBufferResult -> com.android.tools.r8.dex.m$a:
@@ -14700,7 +14832,7 @@
     1:2:void <init>(com.android.tools.r8.dex.FileWriter,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexProgramClass[]):1373:1374 -> <init>
     3:7:void <init>(com.android.tools.r8.dex.FileWriter,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexProgramClass[]):1371:1375 -> <init>
     1:4:void visit(com.android.tools.r8.graph.DexClass):1386:1389 -> b
-com.android.tools.r8.dex.IndexedItemCollection -> com.android.tools.r8.internal.qf:
+com.android.tools.r8.dex.IndexedItemCollection -> com.android.tools.r8.internal.Ce:
     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
@@ -14752,14 +14884,14 @@
     47:71:java.util.List collectNoDirectInheritanceGroups(java.util.Set):491:515 -> a
     47:71:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):426 -> a
     72:92:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):428:448 -> a
-    93:93:boolean com.android.tools.r8.dex.VirtualFile.isFull():247:247 -> a
+    93:93:boolean com.android.tools.r8.dex.VirtualFile.isFull():246:246 -> a
     93:93:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):449 -> a
     94:101:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):450:457 -> a
     102:102:void markDexFull(com.android.tools.r8.dex.VirtualFile):727:727 -> a
     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():650:650 -> a
+    108:108:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():632:632 -> 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
@@ -14768,26 +14900,30 @@
     111:111:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
     111:111:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):454 -> a
     112:124:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):454:466 -> a
-    125:138:void collectGroup(java.util.Collection,com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup,com.android.tools.r8.graph.DexProgramClass):573:586 -> a
-    139:139: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
-    139:139:void collectGroup(java.util.Collection,com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup,com.android.tools.r8.graph.DexProgramClass):586 -> a
-    140:142:void collectGroup(java.util.Collection,com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup,com.android.tools.r8.graph.DexProgramClass):586:588 -> a
-    143:143: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
-    143:143:void collectGroup(java.util.Collection,com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup,com.android.tools.r8.graph.DexProgramClass):588 -> a
-    144:149:void collectGroup(java.util.Collection,com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup,com.android.tools.r8.graph.DexProgramClass):588:593 -> a
-    150:154:boolean assignAll(com.android.tools.r8.dex.VirtualFile,java.util.Collection):602:606 -> a
-    155:155:boolean com.android.tools.r8.dex.VirtualFile.isFull():247:247 -> a
-    155:155:boolean assignAll(com.android.tools.r8.dex.VirtualFile,java.util.Collection):608 -> a
-    156:157:boolean assignAll(com.android.tools.r8.dex.VirtualFile,java.util.Collection):609:610 -> a
-    158:158:void markDexFull(com.android.tools.r8.dex.VirtualFile):727:727 -> a
-    158:158:boolean assignAll(com.android.tools.r8.dex.VirtualFile,java.util.Collection):611 -> a
-    159:165:boolean assignAll(com.android.tools.r8.dex.VirtualFile,java.util.Collection):613:619 -> a
-    166:166:boolean assignAll(com.android.tools.r8.dex.VirtualFile,java.util.Collection):618:618 -> a
-    167:167:com.android.tools.r8.graph.DexProgramClass findOneRootInSetFrom(com.android.tools.r8.graph.DexProgramClass,java.util.Set):713:713 -> a
-    168:168: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
-    168:168:com.android.tools.r8.graph.DexProgramClass findOneRootInSetFrom(com.android.tools.r8.graph.DexProgramClass,java.util.Set):713 -> a
-    169:175:com.android.tools.r8.graph.DexProgramClass findOneRootInSetFrom(com.android.tools.r8.graph.DexProgramClass,java.util.Set):714:720 -> a
-    176:176:boolean isDexFull(com.android.tools.r8.dex.VirtualFile):731:731 -> a
+    125:125:void lambda$updateGroupsNumberOfIds$5(com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup):551:551 -> a
+    126:139:void collectGroup(java.util.Collection,com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup,com.android.tools.r8.graph.DexProgramClass):573:586 -> a
+    140:140: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
+    140:140:void collectGroup(java.util.Collection,com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup,com.android.tools.r8.graph.DexProgramClass):586 -> a
+    141:143:void collectGroup(java.util.Collection,com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup,com.android.tools.r8.graph.DexProgramClass):586:588 -> a
+    144:144: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
+    144:144:void collectGroup(java.util.Collection,com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup,com.android.tools.r8.graph.DexProgramClass):588 -> a
+    145:150:void collectGroup(java.util.Collection,com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup,com.android.tools.r8.graph.DexProgramClass):588:593 -> a
+    151:155:boolean assignAll(com.android.tools.r8.dex.VirtualFile,java.util.Collection):602:606 -> a
+    156:156:boolean com.android.tools.r8.dex.VirtualFile.isFull():246:246 -> a
+    156:156:boolean assignAll(com.android.tools.r8.dex.VirtualFile,java.util.Collection):608 -> a
+    157:158:boolean assignAll(com.android.tools.r8.dex.VirtualFile,java.util.Collection):609:610 -> a
+    159:159:void markDexFull(com.android.tools.r8.dex.VirtualFile):727:727 -> a
+    159:159:boolean assignAll(com.android.tools.r8.dex.VirtualFile,java.util.Collection):611 -> a
+    160:166:boolean assignAll(com.android.tools.r8.dex.VirtualFile,java.util.Collection):613:619 -> a
+    167:167:boolean assignAll(com.android.tools.r8.dex.VirtualFile,java.util.Collection):618:618 -> a
+    168:168:com.android.tools.r8.graph.DexProgramClass findOneRootInSetFrom(com.android.tools.r8.graph.DexProgramClass,java.util.Set):713:713 -> a
+    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):273:273 -> 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
     1:1:com.android.tools.r8.graph.GraphLens access$100(com.android.tools.r8.dex.InheritanceClassInDexDistributor):45:45 -> b
     2:2:boolean lambda$assignGroup$2(java.util.List,com.android.tools.r8.dex.VirtualFile):402:402 -> b
     3:3:boolean isDexFull(com.android.tools.r8.dex.VirtualFile):731:731 -> b
@@ -14817,13 +14953,13 @@
     99:99:boolean hasDirectInheritanceInCollection(com.android.tools.r8.graph.DexProgramClass,java.util.Set):675:675 -> b
     99:99:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):640 -> b
     100:100:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):643:643 -> b
-    101:101:boolean com.android.tools.r8.dex.VirtualFile.isFull():247:247 -> b
+    101:101:boolean com.android.tools.r8.dex.VirtualFile.isFull():246:246 -> b
     101:101:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):644 -> b
     102:110:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):645:653 -> b
     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():650:650 -> b
+    113:113:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():632:632 -> 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
@@ -14893,7 +15029,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.pj:
+com.android.tools.r8.dex.JumboStringRewriter -> com.android.tools.r8.internal.xi:
     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
@@ -14965,10 +15101,10 @@
     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$1 -> com.android.tools.r8.internal.pj$a:
+com.android.tools.r8.dex.JumboStringRewriter$1 -> com.android.tools.r8.internal.xi$a:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
     1:1:void <clinit>():297:297 -> <clinit>
-com.android.tools.r8.dex.JumboStringRewriter$TryTargets -> com.android.tools.r8.internal.pj$b:
+com.android.tools.r8.dex.JumboStringRewriter$TryTargets -> com.android.tools.r8.internal.xi$b:
     com.android.tools.r8.code.Instruction start -> b
     com.android.tools.r8.code.Instruction end -> c
     boolean $assertionsDisabled -> a
@@ -14978,7 +15114,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.hq:
+com.android.tools.r8.dex.Marker -> com.android.tools.r8.internal.ep:
     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
@@ -15029,12 +15165,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.hq$a:
+com.android.tools.r8.dex.Marker$Backend -> com.android.tools.r8.internal.ep$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.hq$b:
+com.android.tools.r8.dex.Marker$Tool -> com.android.tools.r8.internal.ep$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
@@ -15042,7 +15178,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.gr:
+com.android.tools.r8.dex.MethodToCodeObjectMapping -> com.android.tools.r8.internal.eq:
     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
@@ -15078,7 +15214,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.oA:
+com.android.tools.r8.dex.ResourceAdapter -> com.android.tools.r8.internal.az:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.utils.InternalOptions options -> e
     com.android.tools.r8.naming.NamingLens namingLens -> d
@@ -15105,14 +15241,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.iA:
+com.android.tools.r8.dex.ResourceAdapter$DefaultFileNameAdapter -> com.android.tools.r8.internal.Uy:
     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.jA:
+com.android.tools.r8.dex.ResourceAdapter$DirectoryNameAdapter -> com.android.tools.r8.internal.Vy:
     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.kA:
+com.android.tools.r8.dex.ResourceAdapter$FileContentsAdapter -> com.android.tools.r8.internal.Wy:
     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
@@ -15122,7 +15258,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.lA:
+com.android.tools.r8.dex.ResourceAdapter$FileNameAdapter -> com.android.tools.r8.internal.Xy:
     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
@@ -15131,12 +15267,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.mA:
+com.android.tools.r8.dex.ResourceAdapter$ServiceFileNameAdapter -> com.android.tools.r8.internal.Yy:
     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.nA:
+com.android.tools.r8.dex.ResourceAdapter$StringAdapter -> com.android.tools.r8.internal.Zy:
     int position -> f
     com.android.tools.r8.dex.ResourceAdapter this$0 -> h
     int outputFrom -> e
@@ -15233,6 +15369,7 @@
     22:22:void parseDexFiles():53 -> b
     23:23:void parseDexFiles():53:53 -> b
 com.android.tools.r8.dex.VDexReader -> com.android.tools.r8.dex.y:
+    int version -> e
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():22:22 -> <clinit>
     1:4:void <init>(com.android.tools.r8.origin.Origin,java.io.InputStream):27:30 -> <init>
@@ -15266,53 +15403,53 @@
     int id -> b
     com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction transaction -> d
     com.android.tools.r8.FeatureSplit featureSplit -> e
-    1:1:void <clinit>():61:61 -> <clinit>
-    1:1:void <init>(int,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.graph.DexProgramClass,com.android.tools.r8.dex.VirtualFile$1):61:61 -> <init>
-    2:2:void <init>(int,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):94:94 -> <init>
-    3:3:void <init>(int,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.FeatureSplit):104:104 -> <init>
-    4:4:void <init>(int,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.graph.DexProgramClass):114:114 -> <init>
-    5:11:void <init>(int,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.graph.DexProgramClass,com.android.tools.r8.FeatureSplit):124:130 -> <init>
-    1:1:java.util.Map access$1100(java.util.Collection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.ClassNameMapper):61:61 -> a
-    2:2:com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction access$1200(com.android.tools.r8.dex.VirtualFile):61:61 -> a
-    3:21:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):155:173 -> a
-    22:22:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):168:168 -> a
-    23:23:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):165:165 -> a
-    24:24:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):158:158 -> a
-    25:28:void lambda$computeOriginalNameMapping$0(com.android.tools.r8.graph.GraphLens,java.util.Map,com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.graph.DexProgramClass):189:192 -> a
-    29:29:void lambda$computeOriginalNameMapping$0(com.android.tools.r8.graph.GraphLens,java.util.Map,com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.graph.DexProgramClass):190:190 -> a
-    30:35:java.lang.String extractPrefixToken(int,java.lang.String,boolean):203:208 -> a
-    30:35:java.lang.String access$1400(int,java.lang.String,boolean):61 -> a
-    36:50:com.android.tools.r8.graph.ObjectToOffsetMapping computeMapping(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.utils.Timing):219:233 -> a
-    51:51:void addClass(com.android.tools.r8.graph.DexProgramClass):238:238 -> a
-    52:53:boolean isFull(int):242:243 -> a
-    54:54:boolean isFull():247:247 -> a
-    54:54:void throwIfFull(boolean,com.android.tools.r8.utils.Reporter):263 -> a
-    55:58:void throwIfFull(boolean,com.android.tools.r8.utils.Reporter):266:266 -> a
-    59:59:void abortTransaction():276:276 -> a
-    60:60:boolean containsString(com.android.tools.r8.graph.DexString):284:284 -> a
-    61:61:boolean containsType(com.android.tools.r8.graph.DexType):288:288 -> a
-    1:1:int access$1300(com.android.tools.r8.dex.VirtualFile):61:61 -> b
-    2:2:void injectString(com.android.tools.r8.graph.DexString):180:180 -> b
-    3:3:void commitTransaction():280:280 -> b
-    3:3:void injectString(com.android.tools.r8.graph.DexString):181 -> b
-    4:5:java.util.Map computeOriginalNameMapping(java.util.Collection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.ClassNameMapper):186:187 -> b
-    6:6:java.util.Collection classes():296:296 -> b
-    1:1:void commitTransaction():280:280 -> c
-    1:4:java.util.Set getClassDescriptors():138:141 -> d
-    1:1:com.android.tools.r8.FeatureSplit getFeatureSplit():147:147 -> e
-    1:1:int getId():134:134 -> f
-    1:1:int getNumberOfClasses():259:259 -> g
-    1:1:int getNumberOfFields():255:255 -> h
-    1:1:int getNumberOfMethods():251:251 -> i
-    1:1:java.lang.String getPrimaryClassDescriptor():151:151 -> j
-    1:1:boolean isEmpty():292:292 -> k
+    1:1:void <clinit>():60:60 -> <clinit>
+    1:1:void <init>(int,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.graph.DexProgramClass,com.android.tools.r8.dex.VirtualFile$1):60:60 -> <init>
+    2:2:void <init>(int,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):93:93 -> <init>
+    3:3:void <init>(int,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.FeatureSplit):103:103 -> <init>
+    4:4:void <init>(int,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.graph.DexProgramClass):113:113 -> <init>
+    5:11:void <init>(int,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.graph.DexProgramClass,com.android.tools.r8.FeatureSplit):123:129 -> <init>
+    1:1:java.util.Map access$1100(java.util.Collection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.ClassNameMapper):60:60 -> a
+    2:2:com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction access$1200(com.android.tools.r8.dex.VirtualFile):60:60 -> a
+    3:21:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):154:172 -> a
+    22:22:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):167:167 -> a
+    23:23:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):164:164 -> a
+    24:24:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):157:157 -> a
+    25:28:void lambda$computeOriginalNameMapping$0(com.android.tools.r8.graph.GraphLens,java.util.Map,com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.graph.DexProgramClass):188:191 -> a
+    29:29:void lambda$computeOriginalNameMapping$0(com.android.tools.r8.graph.GraphLens,java.util.Map,com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.graph.DexProgramClass):189:189 -> a
+    30:35:java.lang.String extractPrefixToken(int,java.lang.String,boolean):202:207 -> a
+    30:35:java.lang.String access$1400(int,java.lang.String,boolean):60 -> a
+    36:50:com.android.tools.r8.graph.ObjectToOffsetMapping computeMapping(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.utils.Timing):218:232 -> a
+    51:51:void addClass(com.android.tools.r8.graph.DexProgramClass):237:237 -> a
+    52:53:boolean isFull(int):241:242 -> a
+    54:54:boolean isFull():246:246 -> a
+    54:54:void throwIfFull(boolean,com.android.tools.r8.utils.Reporter):262 -> a
+    55:58:void throwIfFull(boolean,com.android.tools.r8.utils.Reporter):265:265 -> a
+    59:59:void abortTransaction():275:275 -> a
+    60:60:boolean containsString(com.android.tools.r8.graph.DexString):283:283 -> a
+    61:61:boolean containsType(com.android.tools.r8.graph.DexType):287:287 -> a
+    1:1:int access$1300(com.android.tools.r8.dex.VirtualFile):60:60 -> b
+    2:2:void injectString(com.android.tools.r8.graph.DexString):179:179 -> b
+    3:3:void commitTransaction():279:279 -> b
+    3:3:void injectString(com.android.tools.r8.graph.DexString):180 -> b
+    4:5:java.util.Map computeOriginalNameMapping(java.util.Collection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.ClassNameMapper):185:186 -> b
+    6:6:java.util.Collection classes():295:295 -> b
+    1:1:void commitTransaction():279:279 -> c
+    1:4:java.util.Set getClassDescriptors():137:140 -> d
+    1:1:com.android.tools.r8.FeatureSplit getFeatureSplit():146:146 -> e
+    1:1:int getId():133:133 -> f
+    1:1:int getNumberOfClasses():258:258 -> g
+    1:1:int getNumberOfFields():254:254 -> h
+    1:1:int getNumberOfMethods():250:250 -> i
+    1:1:java.lang.String getPrimaryClassDescriptor():150:150 -> j
+    1:1:boolean isEmpty():291:291 -> k
 com.android.tools.r8.dex.VirtualFile$1 -> com.android.tools.r8.dex.z$a:
 com.android.tools.r8.dex.VirtualFile$Distributor -> com.android.tools.r8.dex.z$b:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.List virtualFiles -> c
     com.android.tools.r8.dex.ApplicationWriter writer -> b
-    1:1:void <init>(com.android.tools.r8.dex.ApplicationWriter):304:304 -> <init>
-    2:6:void <init>(com.android.tools.r8.dex.ApplicationWriter):302:306 -> <init>
+    1:1:void <init>(com.android.tools.r8.dex.ApplicationWriter):303:303 -> <init>
+    2:6:void <init>(com.android.tools.r8.dex.ApplicationWriter):301:305 -> <init>
     java.util.List run() -> a
 com.android.tools.r8.dex.VirtualFile$DistributorBase -> com.android.tools.r8.dex.z$c:
     com.android.tools.r8.dex.VirtualFile mainDexFile -> g
@@ -15320,48 +15457,37 @@
     com.android.tools.r8.utils.InternalOptions options -> h
     java.util.Map originalNames -> f
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():363:363 -> <clinit>
-    1:15:void <init>(com.android.tools.r8.dex.ApplicationWriter,com.android.tools.r8.utils.InternalOptions):370:384 -> <init>
-    16:16:void <init>(com.android.tools.r8.dex.ApplicationWriter,com.android.tools.r8.utils.InternalOptions):383:383 -> <init>
-    1:5:void addMarkers(com.android.tools.r8.dex.VirtualFile):388:392 -> a
-    6:23:void fillForMainDexList(java.util.Set):397:414 -> a
-    24:27:void fillForMainDexList(java.util.Set):413:416 -> a
-    28:31:void fillForMainDexList(java.util.Set):415:418 -> a
-    32:35:void fillForMainDexList(java.util.Set):417:420 -> a
-    36:42:void lambda$fillForMainDexList$0(com.android.tools.r8.dex.VirtualFile,java.util.Set,com.android.tools.r8.graph.DexType):404:410 -> a
-    43:69:java.util.TreeSet sortClassesByPackage(java.util.Set,java.util.Map):425:451 -> a
-    70:92:int lambda$sortClassesByPackage$1(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):427:449 -> a
-    93:125:void addFeatureSplitFiles(java.util.Map,com.android.tools.r8.dex.VirtualFile$FillStrategy):500:532 -> a
-    1:23:java.util.Map removeFeatureSplitClassesGetMapping():456:478 -> b
-    24:24:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getFirst(java.lang.Iterable,java.lang.Object):809:809 -> b
-    24:24:java.util.Map removeFeatureSplitClassesGetMapping():479 -> b
-    25:25:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.getNext(java.util.Iterator,java.lang.Object):888:888 -> b
-    25:25:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getFirst(java.lang.Iterable,java.lang.Object):809 -> b
-    25:25:java.util.Map removeFeatureSplitClassesGetMapping():479 -> b
-    26:26:java.util.Map removeFeatureSplitClassesGetMapping():479:479 -> b
-    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():726:726 -> b
-    27:27:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition):124 -> b
-    27:27:java.util.Map removeFeatureSplitClassesGetMapping():480 -> b
-    28:28:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition):124:124 -> b
-    28:28:java.util.Map removeFeatureSplitClassesGetMapping():480 -> b
-    29:36:java.util.Map removeFeatureSplitClassesGetMapping():481:488 -> b
+    1:1:void <clinit>():362:362 -> <clinit>
+    1:15:void <init>(com.android.tools.r8.dex.ApplicationWriter,com.android.tools.r8.utils.InternalOptions):369:383 -> <init>
+    16:16:void <init>(com.android.tools.r8.dex.ApplicationWriter,com.android.tools.r8.utils.InternalOptions):382:382 -> <init>
+    1:5:void addMarkers(com.android.tools.r8.dex.VirtualFile):387:391 -> a
+    6:23:void fillForMainDexList(java.util.Set):396:413 -> a
+    24:27:void fillForMainDexList(java.util.Set):412:415 -> a
+    28:31:void fillForMainDexList(java.util.Set):414:417 -> a
+    32:35:void fillForMainDexList(java.util.Set):416:419 -> a
+    36:42:void lambda$fillForMainDexList$0(com.android.tools.r8.dex.VirtualFile,java.util.Set,com.android.tools.r8.graph.DexType):403:409 -> a
+    43:69:java.util.TreeSet sortClassesByPackage(java.util.Set,java.util.Map):424:450 -> a
+    70:92:int lambda$sortClassesByPackage$1(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):426:448 -> a
+    93:125:void addFeatureSplitFiles(java.util.Map,com.android.tools.r8.dex.VirtualFile$FillStrategy):485:517 -> a
+    1:17:java.util.Map removeFeatureSplitClassesGetMapping():455:471 -> b
 com.android.tools.r8.dex.VirtualFile$FilePerInputClassDistributor -> com.android.tools.r8.dex.z$d:
     boolean combineSyntheticClassesWithPrimaryClass -> d
-    1:2:void <init>(com.android.tools.r8.dex.ApplicationWriter,boolean):323:324 -> <init>
-    1:21:java.util.List run():329:349 -> a
-    22:47:java.util.List run():334:359 -> a
+    1:2:void <init>(com.android.tools.r8.dex.ApplicationWriter,boolean):322:323 -> <init>
+    1:21:java.util.List run():328:348 -> a
+    22:47:java.util.List run():333:358 -> a
 com.android.tools.r8.dex.VirtualFile$FillFilesDistributor -> com.android.tools.r8.dex.z$e:
     boolean $assertionsDisabled -> i
     java.util.concurrent.ExecutorService executorService -> k
     com.android.tools.r8.dex.VirtualFile$FillStrategy fillStrategy -> j
-    1:1:void <clinit>():537:537 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.dex.ApplicationWriter,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):543:545 -> <init>
-    1:58:java.util.List run():550:607 -> a
-    1:1:int lambda$run$0(com.android.tools.r8.dex.VirtualFile):606:606 -> b
+    1:1:void <clinit>():522:522 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.dex.ApplicationWriter,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):528:530 -> <init>
+    1:58:java.util.List run():535:592 -> a
+    1:1:int lambda$run$0(com.android.tools.r8.dex.VirtualFile):591:591 -> b
 com.android.tools.r8.dex.VirtualFile$FillStrategy -> com.android.tools.r8.dex.z$f:
     com.android.tools.r8.dex.VirtualFile$FillStrategy FILL_MAX -> a
-    1:1:void <clinit>():66:66 -> <clinit>
-    1:1:void <init>(java.lang.String,int):64:64 -> <init>
+    com.android.tools.r8.dex.VirtualFile$FillStrategy LEAVE_SPACE_FOR_GROWTH -> b
+    1:4:void <clinit>():65:68 -> <clinit>
+    1:1:void <init>(java.lang.String,int):63:63 -> <init>
 com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction -> com.android.tools.r8.dex.z$g:
     com.android.tools.r8.ir.conversion.LensCodeRewriterUtils rewriter -> f
     com.android.tools.r8.naming.NamingLens namingLens -> e
@@ -15377,43 +15503,40 @@
     java.util.Set callSites -> m
     com.android.tools.r8.graph.GraphLens graphLens -> c
     java.util.Set methodHandles -> n
-    1:1:void <clinit>():739:739 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection,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.dex.VirtualFile$1):739:739 -> <init>
-    2:2:void <init>(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):761:761 -> <init>
-    3:22:void <init>(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):747:766 -> <init>
-    1:1:java.util.Set access$1500(com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction):739:739 -> a
-    2:5:boolean maybeInsert(com.android.tools.r8.graph.DexItem,java.util.Set,java.util.Set):770:773 -> a
-    6:6:boolean addClass(com.android.tools.r8.graph.DexProgramClass):783:783 -> a
-    7:7:boolean addString(com.android.tools.r8.graph.DexString):798:798 -> a
-    8:8:boolean addProto(com.android.tools.r8.graph.DexProto):803:803 -> a
-    9:9:boolean addCallSite(com.android.tools.r8.graph.DexCallSite):814:814 -> a
-    10:10:boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle):819:819 -> a
-    11:11:com.android.tools.r8.graph.InitClassLens getInitClassLens():829:829 -> a
-    12:12:com.android.tools.r8.graph.DexString getRenamedDescriptor(com.android.tools.r8.graph.DexType):834:834 -> a
-    13:14:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexMethod):839:840 -> a
-    15:15:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexField):845:845 -> a
-    16:20:void commitItemsIn(java.util.Set,java.util.function.Function):861:865 -> a
-    21:22:void lambda$commitItemsIn$0(java.util.function.Function,com.android.tools.r8.graph.DexItem):862:863 -> a
-    1:1:com.android.tools.r8.ir.conversion.LensCodeRewriterUtils access$200(com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction):739:739 -> b
-    2:2:void addClassAndDependencies(com.android.tools.r8.graph.DexProgramClass):778:778 -> b
-    3:3:boolean addField(com.android.tools.r8.graph.DexField):788:788 -> b
-    4:4:boolean addMethod(com.android.tools.r8.graph.DexMethod):793:793 -> b
-    5:5:boolean addType(com.android.tools.r8.graph.DexType):808:808 -> b
-    6:6:boolean com.android.tools.r8.synthesis.SyntheticNaming.verifyNotInternalSynthetic(com.android.tools.r8.graph.DexType):103:103 -> b
-    6:6:boolean addType(com.android.tools.r8.graph.DexType):808 -> b
-    7:7:boolean addType(com.android.tools.r8.graph.DexType):809:809 -> b
-    8:13:void abort():880:885 -> b
-    1:8:void commit():869:876 -> c
-    1:1:int getNumberOfClasses():853:853 -> d
-    1:1:int getNumberOfFields():857:857 -> e
-    1:1:int getNumberOfMethods():849:849 -> f
-    1:2:boolean isEmpty():889:890 -> g
+    1:1:void <clinit>():724:724 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection,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.dex.VirtualFile$1):724:724 -> <init>
+    2:2:void <init>(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):746:746 -> <init>
+    3:22:void <init>(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):732:751 -> <init>
+    1:1:java.util.Set access$1500(com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction):724:724 -> a
+    2:5:boolean maybeInsert(com.android.tools.r8.graph.DexItem,java.util.Set,java.util.Set):755:758 -> a
+    6:6:boolean addClass(com.android.tools.r8.graph.DexProgramClass):768:768 -> a
+    7:7:boolean addString(com.android.tools.r8.graph.DexString):783:783 -> a
+    8:8:boolean addProto(com.android.tools.r8.graph.DexProto):788:788 -> a
+    9:9:boolean addCallSite(com.android.tools.r8.graph.DexCallSite):799:799 -> a
+    10:10:boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle):804:804 -> a
+    11:11:com.android.tools.r8.graph.InitClassLens getInitClassLens():814:814 -> a
+    12:12:com.android.tools.r8.graph.DexString getRenamedDescriptor(com.android.tools.r8.graph.DexType):819:819 -> a
+    13:14:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexMethod):824:825 -> a
+    15:15:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexField):830:830 -> a
+    16:20:void commitItemsIn(java.util.Set,java.util.function.Function):846:850 -> a
+    21:22:void lambda$commitItemsIn$0(java.util.function.Function,com.android.tools.r8.graph.DexItem):847:848 -> a
+    1:1:com.android.tools.r8.ir.conversion.LensCodeRewriterUtils access$200(com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction):724:724 -> b
+    2:2:void addClassAndDependencies(com.android.tools.r8.graph.DexProgramClass):763:763 -> b
+    3:3:boolean addField(com.android.tools.r8.graph.DexField):773:773 -> b
+    4:4:boolean addMethod(com.android.tools.r8.graph.DexMethod):778:778 -> b
+    5:6:boolean addType(com.android.tools.r8.graph.DexType):793:794 -> b
+    7:12:void abort():865:870 -> b
+    1:8:void commit():854:861 -> c
+    1:1:int getNumberOfClasses():838:838 -> d
+    1:1:int getNumberOfFields():842:842 -> e
+    1:1:int getNumberOfMethods():834:834 -> f
+    1:2:boolean isEmpty():874:875 -> g
 com.android.tools.r8.dex.VirtualFile$MonoDexDistributor -> com.android.tools.r8.dex.z$h:
-    1:1:void <init>(com.android.tools.r8.dex.ApplicationWriter,com.android.tools.r8.utils.InternalOptions):613:613 -> <init>
-    1:9:java.util.List run():619:627 -> a
-    10:10:void com.android.tools.r8.dex.VirtualFile$DistributorBase.addFeatureSplitFiles(java.util.Map):494:494 -> a
-    10:10:java.util.List run():629 -> a
-    11:11:java.util.List run():632:632 -> a
+    1:1:void <init>(com.android.tools.r8.dex.ApplicationWriter,com.android.tools.r8.utils.InternalOptions):598:598 -> <init>
+    1:9:java.util.List run():604:612 -> a
+    10:10:void com.android.tools.r8.dex.VirtualFile$DistributorBase.addFeatureSplitFiles(java.util.Map):479:479 -> a
+    10:10:java.util.List run():614 -> a
+    11:11:java.util.List run():617:617 -> a
 com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator -> com.android.tools.r8.dex.z$i:
     java.util.List classes -> b
     com.android.tools.r8.dex.VirtualFile$FillStrategy fillStrategy -> e
@@ -15422,41 +15545,41 @@
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> d
     com.android.tools.r8.utils.InternalOptions options -> f
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():1013:1013 -> <clinit>
-    1:7:void <init>(java.util.List,com.android.tools.r8.graph.AppView,java.util.Set,java.util.Map,com.android.tools.r8.dex.VirtualFile$FillStrategy,int,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):1044:1050 -> <init>
-    1:5:java.util.Map call():1077:1081 -> a
-    6:6:java.lang.String getOriginalName(com.android.tools.r8.graph.DexProgramClass):1068:1068 -> a
-    6:6:java.util.Map call():1082 -> a
-    7:11:boolean coveredByPrefix(java.lang.String,java.lang.String):1059:1063 -> a
-    7:11:java.util.Map call():1083 -> a
-    12:80:java.util.Map call():1085:1153 -> a
-    81:126:java.util.Map call():1117:1162 -> a
-    127:131:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1177:1181 -> a
-    127:131:java.util.Map call():1162 -> a
-    132:132:boolean com.android.tools.r8.dex.VirtualFile.isFilledEnough(com.android.tools.r8.dex.VirtualFile$FillStrategy):272:272 -> a
-    132:132:boolean com.android.tools.r8.dex.VirtualFile.access$1600(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.dex.VirtualFile$FillStrategy):61 -> a
-    132:132:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1181 -> a
-    132:132:java.util.Map call():1162 -> a
-    133:135:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1182:1184 -> a
-    133:135:java.util.Map call():1162 -> a
-    136:136:boolean com.android.tools.r8.dex.VirtualFile.isFull():247:247 -> a
-    136:136:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1185 -> a
-    136:136:java.util.Map call():1162 -> a
-    137:140:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1187:1190 -> a
-    137:140:java.util.Map call():1162 -> a
-    141:141:boolean com.android.tools.r8.dex.VirtualFile.isFull():247:247 -> a
-    141:141:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1191 -> a
-    141:141:java.util.Map call():1162 -> a
-    142:146:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1192:1196 -> a
-    142:146:java.util.Map call():1162 -> a
-    147:151:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1168:1172 -> a
-    152:152:boolean com.android.tools.r8.dex.VirtualFile.isFilledEnough(com.android.tools.r8.dex.VirtualFile$FillStrategy):272:272 -> a
-    152:152:boolean com.android.tools.r8.dex.VirtualFile.access$1600(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.dex.VirtualFile$FillStrategy):61 -> a
-    152:152:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1172 -> a
-    153:153:boolean com.android.tools.r8.dex.VirtualFile.isFull():247:247 -> a
-    153:153:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1172 -> a
-    154:156:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1202:1204 -> a
-    1:1:java.lang.Object call():1013:1013 -> call
+    1:1:void <clinit>():998:998 -> <clinit>
+    1:7:void <init>(java.util.List,com.android.tools.r8.graph.AppView,java.util.Set,java.util.Map,com.android.tools.r8.dex.VirtualFile$FillStrategy,int,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):1029:1035 -> <init>
+    1:5:java.util.Map call():1062:1066 -> a
+    6:6:java.lang.String getOriginalName(com.android.tools.r8.graph.DexProgramClass):1053:1053 -> a
+    6:6:java.util.Map call():1067 -> a
+    7:11:boolean coveredByPrefix(java.lang.String,java.lang.String):1044:1048 -> a
+    7:11:java.util.Map call():1068 -> a
+    12:80:java.util.Map call():1070:1138 -> a
+    81:126:java.util.Map call():1102:1147 -> a
+    127:131:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1162:1166 -> a
+    127:131:java.util.Map call():1147 -> a
+    132:132:boolean com.android.tools.r8.dex.VirtualFile.isFilledEnough(com.android.tools.r8.dex.VirtualFile$FillStrategy):271:271 -> a
+    132:132:boolean com.android.tools.r8.dex.VirtualFile.access$1600(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.dex.VirtualFile$FillStrategy):60 -> a
+    132:132:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1166 -> a
+    132:132:java.util.Map call():1147 -> a
+    133:135:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1167:1169 -> a
+    133:135:java.util.Map call():1147 -> a
+    136:136:boolean com.android.tools.r8.dex.VirtualFile.isFull():246:246 -> a
+    136:136:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1170 -> a
+    136:136:java.util.Map call():1147 -> a
+    137:140:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1172:1175 -> a
+    137:140:java.util.Map call():1147 -> a
+    141:141:boolean com.android.tools.r8.dex.VirtualFile.isFull():246:246 -> a
+    141:141:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1176 -> a
+    141:141:java.util.Map call():1147 -> a
+    142:146:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1177:1181 -> a
+    142:146:java.util.Map call():1147 -> a
+    147:151:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1153:1157 -> a
+    152:152:boolean com.android.tools.r8.dex.VirtualFile.isFilledEnough(com.android.tools.r8.dex.VirtualFile$FillStrategy):271:271 -> a
+    152:152:boolean com.android.tools.r8.dex.VirtualFile.access$1600(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.dex.VirtualFile$FillStrategy):60 -> a
+    152:152:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1157 -> a
+    153:153:boolean com.android.tools.r8.dex.VirtualFile.isFull():246:246 -> a
+    153:153:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1157 -> a
+    154:156:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1187:1189 -> a
+    1:1:java.lang.Object call():998:998 -> call
 com.android.tools.r8.dex.VirtualFile$VirtualFileCycler -> com.android.tools.r8.dex.z$j:
     java.util.List files -> b
     com.android.tools.r8.graph.GraphLens graphLens -> d
@@ -15468,19 +15591,19 @@
     java.util.Iterator allFilesCyclic -> h
     com.android.tools.r8.graph.InitClassLens initClassLens -> e
     java.util.Iterator activeFiles -> i
-    1:1:void <clinit>():906:906 -> <clinit>
-    1:13:void <init>(java.util.List,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,int):925:937 -> <init>
-    1:1:boolean hasNext():946:946 -> a
-    1:1:com.android.tools.r8.dex.VirtualFile nextOrCreate():957 -> a
-    1:1:com.android.tools.r8.dex.VirtualFile nextOrCreate(java.util.function.Predicate):977 -> a
-    2:8:com.android.tools.r8.dex.VirtualFile nextOrCreate():958:964 -> a
-    2:8:com.android.tools.r8.dex.VirtualFile nextOrCreate(java.util.function.Predicate):977 -> a
-    9:12:com.android.tools.r8.dex.VirtualFile nextOrCreate(java.util.function.Predicate):978:981 -> a
-    13:18:com.android.tools.r8.dex.VirtualFile addFile():993:998 -> a
-    1:1:boolean hasNext():946:946 -> b
-    1:1:com.android.tools.r8.dex.VirtualFile next():950:950 -> c
-    1:2:void reset():941:942 -> d
-    1:1:void restart():989:989 -> e
+    1:1:void <clinit>():891:891 -> <clinit>
+    1:13:void <init>(java.util.List,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,int):910:922 -> <init>
+    1:1:boolean hasNext():931:931 -> a
+    1:1:com.android.tools.r8.dex.VirtualFile nextOrCreate():942 -> a
+    1:1:com.android.tools.r8.dex.VirtualFile nextOrCreate(java.util.function.Predicate):962 -> a
+    2:8:com.android.tools.r8.dex.VirtualFile nextOrCreate():943:949 -> a
+    2:8:com.android.tools.r8.dex.VirtualFile nextOrCreate(java.util.function.Predicate):962 -> a
+    9:12:com.android.tools.r8.dex.VirtualFile nextOrCreate(java.util.function.Predicate):963:966 -> a
+    13:18:com.android.tools.r8.dex.VirtualFile addFile():978:983 -> a
+    1:1:boolean hasNext():931:931 -> b
+    1:1:com.android.tools.r8.dex.VirtualFile next():935:935 -> c
+    1:2:void reset():926:927 -> d
+    1:1:void restart():974:974 -> e
 com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection -> com.android.tools.r8.dex.z$k:
     java.util.Set types -> g
     java.util.Set methods -> h
@@ -15494,34 +15617,31 @@
     java.util.Set callSites -> k
     java.util.Set methodHandles -> l
     com.android.tools.r8.graph.GraphLens graphLens -> b
-    1:1:void <clinit>():636:636 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):652:652 -> <init>
-    2:15:void <init>(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):642:655 -> <init>
-    1:1:java.util.Set access$100(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):636:636 -> a
-    2:2:boolean addClass(com.android.tools.r8.graph.DexProgramClass):660:660 -> a
-    3:3:boolean addString(com.android.tools.r8.graph.DexString):675:675 -> a
-    4:4:boolean addProto(com.android.tools.r8.graph.DexProto):680:680 -> a
-    5:5:boolean addCallSite(com.android.tools.r8.graph.DexCallSite):691:691 -> a
-    6:6:boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle):696:696 -> a
-    7:7:com.android.tools.r8.graph.InitClassLens getInitClassLens():718:718 -> a
-    8:8:com.android.tools.r8.graph.DexString getRenamedDescriptor(com.android.tools.r8.graph.DexType):723:723 -> a
-    9:11:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexMethod):728:730 -> a
-    12:12:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexField):735:735 -> a
-    1:1:java.util.Set access$300(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):636:636 -> b
-    2:2:boolean addField(com.android.tools.r8.graph.DexField):665:665 -> b
-    3:3:boolean addMethod(com.android.tools.r8.graph.DexMethod):670:670 -> b
-    4:4:boolean addType(com.android.tools.r8.graph.DexType):685:685 -> b
-    5:5:boolean com.android.tools.r8.synthesis.SyntheticNaming.verifyNotInternalSynthetic(com.android.tools.r8.graph.DexType):103:103 -> b
-    5:5:boolean addType(com.android.tools.r8.graph.DexType):685 -> b
-    6:6:boolean addType(com.android.tools.r8.graph.DexType):686:686 -> b
-    7:7:int getNumberOfFields():704:704 -> b
-    1:1:java.util.Set access$400(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):636:636 -> c
-    2:2:int getNumberOfMethods():700:700 -> c
-    1:1:java.util.Set access$500(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):636:636 -> d
-    1:1:java.util.Set access$600(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):636:636 -> e
-    1:1:java.util.Set access$700(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):636:636 -> f
-    1:1:java.util.Set access$800(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):636:636 -> g
-    1:1:java.util.Set access$900(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):636:636 -> h
+    1:1:void <clinit>():621:621 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):637:637 -> <init>
+    2:15:void <init>(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):627:640 -> <init>
+    1:1:java.util.Set access$100(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):621:621 -> a
+    2:2:boolean addClass(com.android.tools.r8.graph.DexProgramClass):645:645 -> a
+    3:3:boolean addString(com.android.tools.r8.graph.DexString):660:660 -> a
+    4:4:boolean addProto(com.android.tools.r8.graph.DexProto):665:665 -> a
+    5:5:boolean addCallSite(com.android.tools.r8.graph.DexCallSite):676:676 -> a
+    6:6:boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle):681:681 -> a
+    7:7:com.android.tools.r8.graph.InitClassLens getInitClassLens():703:703 -> a
+    8:8:com.android.tools.r8.graph.DexString getRenamedDescriptor(com.android.tools.r8.graph.DexType):708:708 -> a
+    9:11:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexMethod):713:715 -> a
+    12:12:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexField):720:720 -> a
+    1:1:java.util.Set access$300(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):621:621 -> b
+    2:2:boolean addField(com.android.tools.r8.graph.DexField):650:650 -> b
+    3:3:boolean addMethod(com.android.tools.r8.graph.DexMethod):655:655 -> b
+    4:5:boolean addType(com.android.tools.r8.graph.DexType):670:671 -> b
+    6:6:int getNumberOfFields():689:689 -> b
+    1:1:java.util.Set access$400(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):621:621 -> c
+    2:2:int getNumberOfMethods():685:685 -> c
+    1:1:java.util.Set access$500(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):621:621 -> d
+    1:1:java.util.Set access$600(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):621:621 -> e
+    1:1:java.util.Set access$700(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):621:621 -> f
+    1:1:java.util.Set access$800(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):621:621 -> g
+    1:1:java.util.Set access$900(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):621:621 -> h
 com.android.tools.r8.dexsplitter.DexSplitter -> com.android.tools.r8.dexsplitter.DexSplitter:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():37:37 -> <clinit>
@@ -15605,7 +15725,7 @@
 com.android.tools.r8.dexsplitter.DexSplitter$ZipFileOrigin -> com.android.tools.r8.dexsplitter.DexSplitter$b:
     1:1:void <init>(java.nio.file.Path):79:79 -> <init>
     1:1:java.lang.String part():84:84 -> part
-com.android.tools.r8.errors.ApiLevelDiagnostic -> com.android.tools.r8.internal.g1:
+com.android.tools.r8.errors.ApiLevelDiagnostic -> com.android.tools.r8.internal.f1:
     1:1:void <init>():11:11 -> <init>
     1:1:com.android.tools.r8.origin.Origin getOrigin():15:15 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():20:20 -> getPosition
@@ -15658,7 +15778,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.f8:
+com.android.tools.r8.errors.CompilationError -> com.android.tools.r8.internal.H7:
     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>
@@ -15675,14 +15795,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.i9:
+com.android.tools.r8.errors.DefaultInterfaceMethodDiagnostic -> com.android.tools.r8.internal.G8:
     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.E9:
+com.android.tools.r8.errors.DesugaredLibraryMismatchDiagnostic -> com.android.tools.r8.internal.b9:
     java.util.Set desugaredLibraryIdentifiers -> a
     1:2:void <init>(java.util.Set):16:17 -> <init>
     1:1:java.lang.String getDiagnosticMessage():32:32 -> getDiagnosticMessage
@@ -15709,7 +15829,7 @@
     1:1:java.util.Collection getOrigins():43:43 -> getOrigins
     1:1:com.android.tools.r8.position.Position getPosition():61:61 -> getPosition
     1:1:com.android.tools.r8.references.ClassReference getType():30:30 -> getType
-com.android.tools.r8.errors.ExperimentalClassFileVersionDiagnostic -> com.android.tools.r8.internal.Ib:
+com.android.tools.r8.errors.ExperimentalClassFileVersionDiagnostic -> com.android.tools.r8.internal.cb:
     com.android.tools.r8.origin.Origin origin -> b
     java.lang.String message -> a
     1:3:void <init>(com.android.tools.r8.origin.Origin,java.lang.String):16:18 -> <init>
@@ -15732,14 +15852,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.ci:
+com.android.tools.r8.errors.InternalCompilerError -> com.android.tools.r8.internal.oh:
     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.ki:
+com.android.tools.r8.errors.InvalidDebugInfoException -> com.android.tools.r8.internal.vh:
     1:1:void <init>(java.lang.String):9:9 -> <init>
-com.android.tools.r8.errors.InvalidDescriptorException -> com.android.tools.r8.internal.li:
+com.android.tools.r8.errors.InvalidDescriptorException -> com.android.tools.r8.internal.wh:
     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
@@ -15753,7 +15873,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.pi:
+com.android.tools.r8.errors.InvokeCustomDiagnostic -> com.android.tools.r8.internal.Ah:
     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:
@@ -15766,68 +15886,27 @@
     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.Xv:
+com.android.tools.r8.errors.PrivateInterfaceMethodDiagnostic -> com.android.tools.r8.internal.Qu:
     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.bD:
+com.android.tools.r8.errors.StaticInterfaceMethodDiagnostic -> com.android.tools.r8.internal.QB:
     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.PF:
+com.android.tools.r8.errors.Unimplemented -> com.android.tools.r8.internal.fF:
     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.bG:
+com.android.tools.r8.errors.Unreachable -> com.android.tools.r8.internal.rF:
     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>
-com.android.tools.r8.errors.dontwarn.DontWarnConfiguration -> com.android.tools.r8.internal.ya:
-    1:1:void <init>():13:13 -> <init>
-    java.util.Set getNonMatches(java.util.Set) -> a
-    boolean matches(com.android.tools.r8.graph.DexType) -> a
-    boolean validate(com.android.tools.r8.utils.InternalOptions) -> a
-    1:3:com.android.tools.r8.errors.dontwarn.DontWarnConfiguration create(com.android.tools.r8.shaking.ProguardConfiguration):16:18 -> a
-    4:4:com.android.tools.r8.errors.dontwarn.EmptyDontWarnConfiguration com.android.tools.r8.errors.dontwarn.DontWarnConfiguration.empty():24:24 -> a
-    4:4:com.android.tools.r8.errors.dontwarn.DontWarnConfiguration create(com.android.tools.r8.shaking.ProguardConfiguration):20 -> a
-com.android.tools.r8.errors.dontwarn.DontWarnConfiguration$1 -> com.android.tools.r8.internal.ya$a:
-com.android.tools.r8.errors.dontwarn.DontWarnConfiguration$Witness -> com.android.tools.r8.internal.ya$b:
-    1:1:void <init>(com.android.tools.r8.errors.dontwarn.DontWarnConfiguration$1):39:39 -> <init>
-    2:2:void <init>():41:41 -> <init>
-com.android.tools.r8.errors.dontwarn.EmptyDontWarnConfiguration -> com.android.tools.r8.internal.Ga:
-    1:1:void <init>():11:11 -> <init>
-    java.util.Set getNonMatches(java.util.Set) -> a
-    boolean matches(com.android.tools.r8.graph.DexType) -> a
-    boolean validate(com.android.tools.r8.utils.InternalOptions) -> a
-com.android.tools.r8.errors.dontwarn.NonEmptyDontWarnConfiguration -> com.android.tools.r8.internal.Fs:
-    java.util.List dontWarnPatterns -> b
-    java.util.Map matchedDontWarnPatterns -> c
-    boolean $assertionsDisabled -> a
-    1:1:void <clinit>():19:19 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.ProguardClassFilter):25:25 -> <init>
-    2:8:void <init>(com.android.tools.r8.shaking.ProguardClassFilter):22:28 -> <init>
-    1:4:java.util.Set getNonMatches(java.util.Set):33:36 -> a
-    5:7:boolean matches(com.android.tools.r8.graph.DexType):44:46 -> a
-    8:11:void recordMatch(com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.graph.DexType):54:57 -> a
-    12:12:java.util.Set lambda$recordMatch$0(com.android.tools.r8.shaking.ProguardClassNameList):56:56 -> a
-    13:13:boolean validate(com.android.tools.r8.utils.InternalOptions):63:63 -> a
-    14:16:boolean com.android.tools.r8.errors.dontwarn.NonEmptyDontWarnConfiguration.validateNoUnnecessaryDontWarnWildcards():70:72 -> a
-    14:16:boolean validate(com.android.tools.r8.utils.InternalOptions):64 -> a
-    17:22:boolean com.android.tools.r8.errors.dontwarn.NonEmptyDontWarnConfiguration.validateNoUnnecessaryDontWarnWildcards():71:76 -> a
-    17:22:boolean validate(com.android.tools.r8.utils.InternalOptions):64 -> a
-    23:23:java.lang.String com.android.tools.r8.graph.DexType.getTypeName():171:171 -> a
-    23:23:boolean com.android.tools.r8.errors.dontwarn.NonEmptyDontWarnConfiguration.validateNoUnnecessaryDontWarnWildcards():76 -> a
-    23:23:boolean validate(com.android.tools.r8.utils.InternalOptions):64 -> a
-    24:24:boolean com.android.tools.r8.errors.dontwarn.NonEmptyDontWarnConfiguration.validateNoUnnecessaryDontWarnWildcards():76:76 -> a
-    24:24:boolean validate(com.android.tools.r8.utils.InternalOptions):64 -> a
-    25:25:boolean validate(com.android.tools.r8.utils.InternalOptions):65:65 -> a
-    26:28:boolean com.android.tools.r8.errors.dontwarn.NonEmptyDontWarnConfiguration.validateNoUnusedDontWarnPatterns():83:85 -> a
-    26:28:boolean validate(com.android.tools.r8.utils.InternalOptions):65 -> a
 com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode -> com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode:
     com.android.tools.r8.experimental.graphinfo.GraphNode annotatedNode -> c
     1:2:void <init>(com.android.tools.r8.experimental.graphinfo.GraphNode):14:15 -> <init>
@@ -15853,7 +15932,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.yd:
+com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo -> com.android.tools.r8.internal.Mc:
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo UNKNOWN -> a
     boolean $assertionsDisabled -> b
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind kind -> c
@@ -15865,10 +15944,10 @@
     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$1 -> com.android.tools.r8.internal.yd$a:
+com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$1 -> com.android.tools.r8.internal.Mc$a:
     int[] $SwitchMap$com$android$tools$r8$experimental$graphinfo$GraphEdgeInfo$EdgeKind -> a
     1:1:void <clinit>():50:50 -> <clinit>
-com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind -> com.android.tools.r8.internal.yd$b:
+com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind -> com.android.tools.r8.internal.Mc$b:
     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
@@ -15932,72 +16011,35 @@
     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.V6:
+com.android.tools.r8.features.ClassToFeatureSplitMap -> com.android.tools.r8.internal.G6:
     java.util.Map classToFeatureSplitMap -> c
-    java.util.Map representativeStringsForFeatureSplit -> d
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
-    1:1:void <clinit>():28:28 -> <clinit>
-    1:1:void <init>(java.util.Map):37:37 -> <init>
-    2:10:void <init>(java.util.Map):30:38 -> <init>
-    1:1:com.android.tools.r8.features.ClassToFeatureSplitMap createEmptyClassToFeatureSplitMap():42:42 -> a
-    2:2:com.android.tools.r8.features.ClassToFeatureSplitMap createInitialClassToFeatureSplitMap(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.utils.Reporter):61:61 -> a
-    3:3:void com.android.tools.r8.features.ClassToFeatureSplitMap.<init>():34:34 -> a
-    3:3:com.android.tools.r8.features.ClassToFeatureSplitMap createInitialClassToFeatureSplitMap(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.utils.Reporter):61 -> a
-    4:23:com.android.tools.r8.features.ClassToFeatureSplitMap createInitialClassToFeatureSplitMap(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.utils.Reporter):66:85 -> a
-    24:25:java.util.Map getFeatureSplitClasses(java.util.Set):113:114 -> a
-    26:26:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition):124:124 -> a
-    26:26:java.util.Map getFeatureSplitClasses(java.util.Set):115 -> a
-    27:28:java.util.Map getFeatureSplitClasses(java.util.Set):116:117 -> a
-    29:29:java.util.Set lambda$getFeatureSplitClasses$0(com.android.tools.r8.FeatureSplit):117:117 -> a
-    30:30:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition):124:124 -> a
-    30:30:boolean isInBaseOrSameFeatureAs(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):140 -> a
-    31:31:boolean isInBaseOrSameFeatureAs(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):141:141 -> a
-    32:32:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition):124:124 -> a
-    32:32:boolean isInBaseOrSameFeatureAs(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):141 -> a
-    33:33:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.DexType):128:128 -> a
-    33:33:int compareFeatureSplitsForDexTypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):92 -> a
-    34:34:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.DexType):128:128 -> a
-    34:34:int compareFeatureSplitsForDexTypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):93 -> a
-    35:49:int compareFeatureSplitsForDexTypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):94:108 -> a
-    50:50:com.android.tools.r8.FeatureSplit getFeatureSplit(com.android.tools.r8.graph.DexType):128:128 -> a
-    51:51:boolean isInSameFeatureOrBothInBase(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):149:149 -> a
-    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():726:726 -> a
-    52:52:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition):124 -> a
-    52:52:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInSameFeatureOrBothInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):153 -> a
-    52:52:boolean isInSameFeatureOrBothInBase(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):149 -> a
-    53:53:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition):124:124 -> a
-    53:53:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInSameFeatureOrBothInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):153 -> a
-    53:53:boolean isInSameFeatureOrBothInBase(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):149 -> a
-    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():726:726 -> a
-    54:54:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition):124 -> a
-    54:54:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInSameFeatureOrBothInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):153 -> a
-    54:54:boolean isInSameFeatureOrBothInBase(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):149 -> a
-    55:55:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition):124:124 -> a
-    55:55:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInSameFeatureOrBothInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):153 -> a
-    55:55:boolean isInSameFeatureOrBothInBase(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):149 -> a
-    56:58:com.android.tools.r8.features.ClassToFeatureSplitMap rewrittenWithLens(com.android.tools.r8.graph.GraphLens):161:163 -> a
-    59:68: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):165:174 -> a
-    69:71:com.android.tools.r8.features.ClassToFeatureSplitMap withoutPrunedItems(com.android.tools.r8.graph.PrunedItems):180:182 -> a
-    72:73:void lambda$withoutPrunedItems$2(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.graph.DexType,com.android.tools.r8.FeatureSplit):184:185 -> a
-    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():726:726 -> a
-    74:74:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition):124 -> a
-    74:74:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass):136 -> a
-    74:74:boolean isInFeature(com.android.tools.r8.graph.DexProgramClass):145 -> a
-    75:75:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition):124:124 -> a
-    75:75:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass):136 -> a
-    75:75:boolean isInFeature(com.android.tools.r8.graph.DexProgramClass):145 -> a
-    76:76:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass):136:136 -> a
-    76:76:boolean isInFeature(com.android.tools.r8.graph.DexProgramClass):145 -> a
-    1:2:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.DexType):128:128 -> b
-    1:2:boolean isInSameFeatureOrBothInBase(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):157 -> b
-    3:3:boolean isEmpty():132:132 -> b
-com.android.tools.r8.features.FeatureSplitConfiguration -> com.android.tools.r8.internal.Qb:
+    1:1:void <clinit>():27:27 -> <clinit>
+    1:1:void <init>():31:31 -> <init>
+    2:2:void <init>():29:29 -> <init>
+    1:1:com.android.tools.r8.features.ClassToFeatureSplitMap createEmptyClassToFeatureSplitMap():34:34 -> a
+    2:18:com.android.tools.r8.features.ClassToFeatureSplitMap createInitialClassToFeatureSplitMap(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.utils.Reporter):53:69 -> a
+    19:23:java.util.Map getFeatureSplitClasses(java.util.Set):78:82 -> a
+    24:24:java.util.Set lambda$getFeatureSplitClasses$0(com.android.tools.r8.FeatureSplit):82:82 -> a
+    25:25:com.android.tools.r8.FeatureSplit getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition):89:89 -> a
+    26:26:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.DexType):93:93 -> a
+    26:26:com.android.tools.r8.FeatureSplit getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition):89 -> a
+    27:27:com.android.tools.r8.FeatureSplit getFeatureSplit(com.android.tools.r8.graph.DexType):93:93 -> a
+    28:28:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass):101:101 -> a
+    28:28:boolean isInFeature(com.android.tools.r8.graph.DexProgramClass):110 -> a
+    29:29:boolean isInSameFeatureOrBothInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):118:118 -> a
+    30:31:com.android.tools.r8.features.ClassToFeatureSplitMap rewrittenWithLens(com.android.tools.r8.graph.GraphLens):122:123 -> a
+    32:41: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):125:134 -> a
+    42:43:com.android.tools.r8.features.ClassToFeatureSplitMap withoutPrunedItems(com.android.tools.r8.graph.PrunedItems):140:141 -> a
+    44:45:void lambda$withoutPrunedItems$2(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.graph.DexType,com.android.tools.r8.FeatureSplit):143:144 -> a
+    1:1:boolean isEmpty():97:97 -> b
+com.android.tools.r8.features.FeatureSplitConfiguration -> com.android.tools.r8.internal.jb:
     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.Qb$a:
+com.android.tools.r8.features.FeatureSplitConfiguration$DataResourceProvidersAndConsumer -> com.android.tools.r8.internal.jb$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>
@@ -16075,15 +16117,18 @@
     boolean isAccessedOnlyInMethodSatisfying(java.util.function.Predicate) -> b
     1:1:int getNumberOfAccessContexts():377:377 -> b
     boolean isEmpty() -> c
-com.android.tools.r8.graph.AccessControl -> com.android.tools.r8.internal.R0:
+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):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():630:630 -> a
+    29:29:boolean com.android.tools.r8.graph.DexClass.isPublic():612:612 -> 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: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):26:33 -> 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):105:106 -> 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
@@ -16100,19 +16145,20 @@
     1:1:void unsetProtected():184:184 -> G
     1:1:void unsetPublic():158:158 -> H
     1:2:com.android.tools.r8.graph.AccessFlags unsetSynthetic():221:222 -> I
-    1:1:int lambda$specify$0(com.android.tools.r8.graph.AccessFlags):60:60 -> a
-    2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):60:60 -> a
+    1:1:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):60:60 -> a
+    2:2:boolean isAtLeastAsVisibleAs(com.android.tools.r8.graph.AccessFlags):114:114 -> a
     3:3:void demoteFromFinal():234:234 -> a
     4:17:java.lang.String toStringInternal(boolean):294:307 -> a
-    1:1:int lambda$specify$1(com.android.tools.r8.graph.AccessFlags):60:60 -> b
+    1:1:int lambda$specify$0(com.android.tools.r8.graph.AccessFlags):60:60 -> b
     2:2:void demoteFromSynthetic():226:226 -> b
     1:1:java.util.List getNames():48:48 -> c
+    2:2:int lambda$specify$1(com.android.tools.r8.graph.AccessFlags):60:60 -> c
     boolean isSet(int,int) -> d
     1:1:int getOriginalAccessFlags():82:82 -> d
     2:2:void demote(int):281:281 -> d
-    1:1:java.util.List getPredicates():37:37 -> e
+    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():65:65 -> e
     1:3:boolean equals(java.lang.Object):87:89 -> equals
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():65:65 -> f
+    1:1:java.util.List getPredicates():37:37 -> f
     1:7:int getVisibilityOrdinal():123:129 -> g
     8:8:void promote(int):277:277 -> g
     1:1:boolean isSet(int):255:255 -> h
@@ -16182,215 +16228,216 @@
     16:16:com.android.tools.r8.graph.AppInfo prunedCopyFrom(com.android.tools.r8.graph.PrunedItems):75:75 -> a
     17:18:com.android.tools.r8.graph.DexItemFactory dexItemFactory():106:107 -> a
     19:22:void addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,boolean):119:122 -> a
-    23:24:void forEachMethod(java.util.function.Consumer):137:138 -> a
-    25:28:com.android.tools.r8.graph.DexClass definitionForDesugarDependency(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):153:156 -> a
+    23:24:void forEachMethod(java.util.function.Consumer):142:143 -> a
+    25:28:com.android.tools.r8.graph.DexClass definitionForDesugarDependency(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):158:161 -> a
     29:30:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    29:30:com.android.tools.r8.graph.DexClass definitionForDesugarDependency(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):157 -> a
+    29:30:com.android.tools.r8.graph.DexClass definitionForDesugarDependency(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):162 -> a
     31:31:com.android.tools.r8.utils.InternalOptions options():79:79 -> a
-    31:31:com.android.tools.r8.graph.DexClass definitionForDesugarDependency(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):158 -> a
-    32:32:com.android.tools.r8.graph.DexClass definitionForDesugarDependency(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):158:158 -> a
-    33:36:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):201:204 -> a
-    37:37:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupDirectMethod(com.android.tools.r8.graph.DexMethod):474:474 -> a
-    37:37:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):204 -> a
-    38:38:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):205:205 -> a
-    39:39: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:237 -> a
+    31:31:com.android.tools.r8.graph.DexClass definitionForDesugarDependency(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):163 -> a
+    32:32:com.android.tools.r8.graph.DexClass definitionForDesugarDependency(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):163:163 -> a
+    33:36:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):206:209 -> a
+    37:37:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupDirectMethod(com.android.tools.r8.graph.DexMethod):456:456 -> a
+    37:37:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):209 -> a
+    38:38:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):210:210 -> a
+    39:39: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):242:242 -> a
     40:40:com.android.tools.r8.graph.FieldResolutionResult$FailedFieldResolutionResult com.android.tools.r8.graph.FieldResolutionResult.failure():13:13 -> a
-    40:40: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):238 -> a
-    41:44: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):240:243 -> a
+    40:40: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):243 -> a
+    41:44: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):245:248 -> a
     45:45:com.android.tools.r8.graph.FieldResolutionResult$UnknownFieldResolutionResult com.android.tools.r8.graph.FieldResolutionResult.unknown():17:17 -> a
-    45:45: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):244 -> a
+    45:45: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):249 -> a
     1:2:com.android.tools.r8.graph.DexApplication app():100:101 -> b
-    3:6:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):182:185 -> b
-    7:7:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupDirectMethod(com.android.tools.r8.graph.DexMethod):474:474 -> b
-    7:7:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):185 -> b
-    8:8:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):186:186 -> b
+    3:6:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):187:190 -> b
+    7:7:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupDirectMethod(com.android.tools.r8.graph.DexMethod):456:456 -> b
+    7:7:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):190 -> b
+    8:8:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):191:191 -> b
     1:1:boolean checkIfObsolete():95:95 -> c
     2:2:boolean isObsolete():83:83 -> c
     2:2:boolean checkIfObsolete():95 -> c
     3:3:boolean checkIfObsolete():95:95 -> c
-    4:4:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):144:144 -> c
-    1:2:java.util.Collection classes():127:128 -> d
-    3:4:com.android.tools.r8.graph.DexClass definitionForWithoutExistenceAssert(com.android.tools.r8.graph.DexType):148:149 -> d
-    1:2:java.util.List classesWithDeterministicOrder():132:133 -> e
-    3:3:com.android.tools.r8.graph.DexProgramClass unsafeDirectProgramTypeLookup(com.android.tools.r8.graph.DexType):164:164 -> e
+    4:4:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):149:149 -> c
+    1:2:java.util.Collection classes():132:133 -> d
+    3:4:com.android.tools.r8.graph.DexClass definitionForWithoutExistenceAssert(com.android.tools.r8.graph.DexType):153:154 -> d
+    1:2:java.util.List classesWithDeterministicOrder():137:138 -> e
+    3:3:com.android.tools.r8.graph.DexProgramClass unsafeDirectProgramTypeLookup(com.android.tools.r8.graph.DexType):169:169 -> e
     1:1:com.android.tools.r8.shaking.MainDexClasses getMainDexClasses():111:111 -> f
     1:1:com.android.tools.r8.synthesis.SyntheticItems getSyntheticItems():115:115 -> g
-    1:1:boolean hasClassHierarchy():212:212 -> h
-    1:1:boolean hasLiveness():222:222 -> i
+    1:1:boolean hasClassHierarchy():217:217 -> h
+    1:1:boolean hasLiveness():227:227 -> i
     1:1:boolean isObsolete():83:83 -> j
     1:1:void markObsolete():87:87 -> k
     1:1:com.android.tools.r8.utils.InternalOptions options():79:79 -> l
     1:1:void unsetObsolete():91:91 -> m
-    1:1:com.android.tools.r8.graph.AppInfoWithClassHierarchy withClassHierarchy():217:217 -> n
-    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():227:227 -> o
+    1:1:com.android.tools.r8.graph.AppInfoWithClassHierarchy withClassHierarchy():222:222 -> n
+    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():232:232 -> o
 com.android.tools.r8.graph.AppInfoWithClassHierarchy -> com.android.tools.r8.graph.c:
     com.android.tools.r8.features.ClassToFeatureSplitMap classToFeatureSplitMap -> i
     boolean $assertionsDisabled -> h
     com.android.tools.r8.graph.AppInfoWithClassHierarchy$CreateDesugaringViewOnAppInfo WITNESS -> g
     com.android.tools.r8.shaking.MissingClasses missingClasses -> j
-    1:3:void <clinit>():48:50 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.synthesis.CommittedItems,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.shaking.MissingClasses):79:81 -> <init>
-    4:8:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy$CreateDesugaringViewOnAppInfo,com.android.tools.r8.graph.AppInfo):86:90 -> <init>
-    1:1:com.android.tools.r8.graph.AppInfo prunedCopyFrom(com.android.tools.r8.graph.PrunedItems):48:48 -> a
-    2:6:com.android.tools.r8.graph.AppInfoWithClassHierarchy createInitialAppInfoWithClassHierarchy(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.shaking.MainDexClasses):60:64 -> a
-    7:8:com.android.tools.r8.graph.AppInfoWithClassHierarchy createForDesugaring(com.android.tools.r8.graph.AppInfo):94:95 -> a
-    9:9:com.android.tools.r8.graph.AppInfoWithClassHierarchy rebuildWithClassHierarchy(com.android.tools.r8.synthesis.CommittedItems):99:99 -> a
-    10:10:com.android.tools.r8.features.ClassToFeatureSplitMap getClassToFeatureSplitMap():136:136 -> a
-    10:10:com.android.tools.r8.graph.AppInfoWithClassHierarchy rebuildWithClassHierarchy(com.android.tools.r8.synthesis.CommittedItems):100 -> a
-    11:11:com.android.tools.r8.graph.AppInfoWithClassHierarchy rebuildWithClassHierarchy(com.android.tools.r8.synthesis.CommittedItems):100:100 -> a
-    12:12:com.android.tools.r8.shaking.MissingClasses getMissingClasses():140:140 -> a
-    12:12:com.android.tools.r8.graph.AppInfoWithClassHierarchy rebuildWithClassHierarchy(com.android.tools.r8.synthesis.CommittedItems):100 -> a
-    13:13:com.android.tools.r8.graph.AppInfoWithClassHierarchy rebuildWithClassHierarchy(com.android.tools.r8.synthesis.CommittedItems):100:100 -> a
-    14:15:com.android.tools.r8.graph.AppInfoWithClassHierarchy rebuildWithClassHierarchy(com.android.tools.r8.shaking.MissingClasses):104:105 -> a
-    16:16:com.android.tools.r8.features.ClassToFeatureSplitMap getClassToFeatureSplitMap():136:136 -> a
-    16:16:com.android.tools.r8.graph.AppInfoWithClassHierarchy rebuildWithClassHierarchy(com.android.tools.r8.shaking.MissingClasses):106 -> a
-    17:17:com.android.tools.r8.graph.AppInfoWithClassHierarchy rebuildWithClassHierarchy(com.android.tools.r8.shaking.MissingClasses):107:107 -> a
-    18:19:com.android.tools.r8.graph.AppInfoWithClassHierarchy rebuildWithClassHierarchy(java.util.function.Function):113:114 -> a
-    20:20:com.android.tools.r8.features.ClassToFeatureSplitMap getClassToFeatureSplitMap():136:136 -> a
-    20:20:com.android.tools.r8.graph.AppInfoWithClassHierarchy rebuildWithClassHierarchy(java.util.function.Function):115 -> a
-    21:21:com.android.tools.r8.graph.AppInfoWithClassHierarchy rebuildWithClassHierarchy(java.util.function.Function):116:116 -> a
-    22:22:com.android.tools.r8.shaking.MissingClasses getMissingClasses():140:140 -> a
-    22:22:com.android.tools.r8.graph.AppInfoWithClassHierarchy rebuildWithClassHierarchy(java.util.function.Function):117 -> a
-    23:23:com.android.tools.r8.graph.AppInfoWithClassHierarchy rebuildWithClassHierarchy(java.util.function.Function):117:117 -> a
-    24:76:com.android.tools.r8.utils.TraversalContinuation traverseSuperTypes(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.TriFunction):172:224 -> a
-    77:77:void forEachSuperType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.TriConsumer):233:233 -> a
-    78:79:com.android.tools.r8.utils.TraversalContinuation lambda$forEachSuperType$0(com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):236:237 -> a
-    80:80:com.android.tools.r8.utils.TraversalContinuation lambda$isStrictSubtypeOf$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):273:273 -> a
-    81:81:boolean inDifferentHierarchy(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):284:284 -> a
-    82:95:java.util.List computeProgramClassRelationChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):377:390 -> a
-    96:104:boolean isInterfaceInSuperTypes(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList):399:407 -> a
-    96:104:java.util.List computeProgramClassRelationChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):390 -> a
-    105:108:java.util.List computeProgramClassRelationChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):391:394 -> a
-    109:113:java.util.List computeChainInClassHierarchy(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):415:419 -> a
-    114:126:java.util.List computeChainInClassHierarchy(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):417:429 -> a
-    127:133:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):448:454 -> a
-    134:134:boolean com.android.tools.r8.graph.DexMethod.hasSameProtoAndName(com.android.tools.r8.graph.DexMethod):207:207 -> a
-    134:134:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):454 -> a
-    135:135:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):454:454 -> a
-    136:136:boolean com.android.tools.r8.graph.AccessFlags.isSameVisibility(com.android.tools.r8.graph.AccessFlags):118:118 -> a
-    136:136:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):455 -> a
-    137:138:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):459:460 -> a
-    139:139:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexField):494:494 -> a
-    140:143:com.android.tools.r8.graph.DexEncodedField lookupInstanceTargetOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):487:490 -> a
-    140:143:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexField):494 -> a
-    144:145:com.android.tools.r8.graph.DexClassAndMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):546:547 -> a
-    146:147:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,boolean):599:600 -> a
-    148:151:com.android.tools.r8.graph.ResolutionResult resolveMethodOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,boolean):621:624 -> a
-    152:157:com.android.tools.r8.graph.ResolutionResult resolveMethodOnArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):635:640 -> a
-    158:158:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethod):645:645 -> a
-    159:171:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):660:672 -> a
-    172:175:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):676:679 -> a
-    176:176:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):731:731 -> a
-    176:176:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):684 -> a
-    177:179:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):753:753 -> a
-    177:179:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):732 -> a
-    177:179:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):684 -> a
-    180:180:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):733:733 -> a
-    180:180:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):684 -> 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):697:697 -> a
-    182:188: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):522:528 -> a
-    182:188: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):697 -> a
-    189:191:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):544:544 -> a
-    189:191: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):535 -> a
-    189:191: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):697 -> a
-    193:195:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):546:548 -> a
-    193:195: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):535 -> a
-    193:195: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):697 -> a
-    196: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):699:699 -> a
-    197:197:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):512:512 -> a
-    197:197: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):702 -> a
-    198:207: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):709:718 -> a
-    208:208:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):738:738 -> a
-    208:208:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):472 -> a
-    209:211:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):753:753 -> a
-    209:211:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):739 -> a
-    209:211:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):472 -> a
-    212:212:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):740:740 -> a
-    212:212:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):472 -> a
-    213:215:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexMethod):745:747 -> a
-    213:215:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificMethod(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexMethod):477 -> a
-    216:218:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):753:753 -> a
-    219:225:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):762:768 -> a
-    226:226:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):512:512 -> a
-    226:226:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):769 -> a
-    227:227:boolean isMaximallySpecificCandidate(com.android.tools.r8.graph.DexEncodedMethod):793:793 -> a
-    227:227:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):770 -> a
-    228:238:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):772:782 -> a
-    239:239: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):863:863 -> a
-    240:242:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):873:875 -> a
-    243:243:com.android.tools.r8.graph.FieldResolutionResult$FailedFieldResolutionResult com.android.tools.r8.graph.FieldResolutionResult.failure():13:13 -> a
-    243:243:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):875 -> a
-    244:246:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField):879:881 -> a
-    247:264:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexClass,java.util.Set):889:906 -> a
-    265:265:com.android.tools.r8.graph.FieldResolutionResult$FailedFieldResolutionResult com.android.tools.r8.graph.FieldResolutionResult.failure():13:13 -> a
-    265:265:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexClass,java.util.Set):909 -> a
-    266:268:com.android.tools.r8.graph.DexClassAndField resolveFieldOnDirectInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,java.util.Set):914:916 -> a
-    269:274:com.android.tools.r8.graph.DexClassAndField resolveFieldOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,java.util.Set):932:937 -> a
-    269:274:com.android.tools.r8.graph.DexClassAndField resolveFieldOnDirectInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,java.util.Set):919 -> a
-    1:8:com.android.tools.r8.graph.AppInfoWithClassHierarchy prunedCopyFrom(com.android.tools.r8.graph.PrunedItems):122:129 -> b
-    9:9:com.android.tools.r8.features.ClassToFeatureSplitMap getClassToFeatureSplitMap():136:136 -> b
-    9:9:com.android.tools.r8.graph.AppInfoWithClassHierarchy prunedCopyFrom(com.android.tools.r8.graph.PrunedItems):130 -> b
-    10:11:com.android.tools.r8.graph.AppInfoWithClassHierarchy prunedCopyFrom(com.android.tools.r8.graph.PrunedItems):130:131 -> b
-    12:12:com.android.tools.r8.shaking.MissingClasses getMissingClasses():140:140 -> b
-    12:12:com.android.tools.r8.graph.AppInfoWithClassHierarchy prunedCopyFrom(com.android.tools.r8.graph.PrunedItems):132 -> b
-    13:13:com.android.tools.r8.graph.AppInfoWithClassHierarchy prunedCopyFrom(com.android.tools.r8.graph.PrunedItems):132:132 -> b
-    14:16:boolean inSameHierarchy(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):278:280 -> b
-    17:17:com.android.tools.r8.graph.DexEncodedField lookupStaticTarget(com.android.tools.r8.graph.DexField):511:511 -> b
-    18:21:com.android.tools.r8.graph.DexEncodedField lookupStaticTargetOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):504:507 -> b
-    18:21:com.android.tools.r8.graph.DexEncodedField lookupStaticTarget(com.android.tools.r8.graph.DexField):511 -> b
-    22:24:com.android.tools.r8.graph.ResolutionResult resolveMethodOn(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):604:606 -> b
-    25:25:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexMethod):797:797 -> b
-    26:40:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):812:826 -> b
-    1:25:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):250:274 -> c
-    26:26:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):571:571 -> c
-    27:28:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):565:566 -> c
-    27:28:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):571 -> c
-    29:38:com.android.tools.r8.graph.ResolutionResult unsafeResolveMethodDueToDexFormat(com.android.tools.r8.graph.DexMethod):585:594 -> c
-    39:40:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):830:831 -> c
-    41:41:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):512:512 -> c
-    41:41:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):833 -> c
-    42:47:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):835:840 -> c
-    48:48:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):512:512 -> c
-    48:48:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):842 -> c
-    49:50:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):843:844 -> c
-    51:51:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):731:731 -> c
-    51:51:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):848 -> c
-    52:54:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):753:753 -> c
-    52:54:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):732 -> c
-    52:54:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):848 -> c
-    55:55:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):733:733 -> c
-    55:55:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):848 -> c
-    56:57:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField):856:857 -> c
-    1:5:boolean isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):242:246 -> d
-    6:6:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):531:531 -> d
-    7:8:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):525:526 -> d
-    7:8:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):531 -> d
-    1:71:com.android.tools.r8.ir.analysis.type.InterfaceCollection implementedInterfaces(com.android.tools.r8.graph.DexType):294:364 -> f
-    1:1:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):288:288 -> g
-    2:6:boolean com.android.tools.r8.graph.DexClass.hasMissingSuperType(com.android.tools.r8.graph.AppInfoWithClassHierarchy):684:688 -> g
-    2:6:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):289 -> g
-    1:1:boolean hasClassHierarchy():145:145 -> h
-    1:1:com.android.tools.r8.graph.AppInfoWithClassHierarchy withClassHierarchy():151:151 -> n
-    1:1:com.android.tools.r8.features.ClassToFeatureSplitMap getClassToFeatureSplitMap():136:136 -> p
-    1:1:com.android.tools.r8.shaking.MissingClasses getMissingClasses():140:140 -> q
+    1:3:void <clinit>():45:47 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.synthesis.CommittedItems,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.shaking.MissingClasses):76:78 -> <init>
+    4:8:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy$CreateDesugaringViewOnAppInfo,com.android.tools.r8.graph.AppInfo):83:87 -> <init>
+    1:1:com.android.tools.r8.graph.AppInfo prunedCopyFrom(com.android.tools.r8.graph.PrunedItems):45:45 -> a
+    2:6:com.android.tools.r8.graph.AppInfoWithClassHierarchy createInitialAppInfoWithClassHierarchy(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.shaking.MainDexClasses):57:61 -> a
+    7:8:com.android.tools.r8.graph.AppInfoWithClassHierarchy createForDesugaring(com.android.tools.r8.graph.AppInfo):91:92 -> a
+    9:9:com.android.tools.r8.graph.AppInfoWithClassHierarchy rebuildWithClassHierarchy(com.android.tools.r8.synthesis.CommittedItems):96:96 -> a
+    10:10:com.android.tools.r8.features.ClassToFeatureSplitMap getClassToFeatureSplitMap():133:133 -> a
+    10:10:com.android.tools.r8.graph.AppInfoWithClassHierarchy rebuildWithClassHierarchy(com.android.tools.r8.synthesis.CommittedItems):97 -> a
+    11:11:com.android.tools.r8.graph.AppInfoWithClassHierarchy rebuildWithClassHierarchy(com.android.tools.r8.synthesis.CommittedItems):97:97 -> a
+    12:12:com.android.tools.r8.shaking.MissingClasses getMissingClasses():137:137 -> a
+    12:12:com.android.tools.r8.graph.AppInfoWithClassHierarchy rebuildWithClassHierarchy(com.android.tools.r8.synthesis.CommittedItems):97 -> a
+    13:13:com.android.tools.r8.graph.AppInfoWithClassHierarchy rebuildWithClassHierarchy(com.android.tools.r8.synthesis.CommittedItems):97:97 -> a
+    14:15:com.android.tools.r8.graph.AppInfoWithClassHierarchy rebuildWithClassHierarchy(com.android.tools.r8.shaking.MissingClasses):101:102 -> a
+    16:16:com.android.tools.r8.features.ClassToFeatureSplitMap getClassToFeatureSplitMap():133:133 -> a
+    16:16:com.android.tools.r8.graph.AppInfoWithClassHierarchy rebuildWithClassHierarchy(com.android.tools.r8.shaking.MissingClasses):103 -> a
+    17:17:com.android.tools.r8.graph.AppInfoWithClassHierarchy rebuildWithClassHierarchy(com.android.tools.r8.shaking.MissingClasses):104:104 -> a
+    18:19:com.android.tools.r8.graph.AppInfoWithClassHierarchy rebuildWithClassHierarchy(java.util.function.Function):110:111 -> a
+    20:20:com.android.tools.r8.features.ClassToFeatureSplitMap getClassToFeatureSplitMap():133:133 -> a
+    20:20:com.android.tools.r8.graph.AppInfoWithClassHierarchy rebuildWithClassHierarchy(java.util.function.Function):112 -> a
+    21:21:com.android.tools.r8.graph.AppInfoWithClassHierarchy rebuildWithClassHierarchy(java.util.function.Function):113:113 -> a
+    22:22:com.android.tools.r8.shaking.MissingClasses getMissingClasses():137:137 -> a
+    22:22:com.android.tools.r8.graph.AppInfoWithClassHierarchy rebuildWithClassHierarchy(java.util.function.Function):114 -> a
+    23:23:com.android.tools.r8.graph.AppInfoWithClassHierarchy rebuildWithClassHierarchy(java.util.function.Function):114:114 -> a
+    24:76:com.android.tools.r8.utils.TraversalContinuation traverseSuperTypes(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.TriFunction):169:221 -> a
+    77:77:void forEachSuperType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.TriConsumer):230:230 -> a
+    78:79:com.android.tools.r8.utils.TraversalContinuation lambda$forEachSuperType$0(com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):233:234 -> a
+    80:80:com.android.tools.r8.utils.TraversalContinuation lambda$isStrictSubtypeOf$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):270:270 -> a
+    81:81:boolean inDifferentHierarchy(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):281:281 -> a
+    82:83:void lambda$implementedInterfaces$2(java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):310:311 -> a
+    84:97:java.util.List computeProgramClassRelationChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):327:340 -> a
+    98:106:boolean isInterfaceInSuperTypes(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList):349:357 -> a
+    98:106:java.util.List computeProgramClassRelationChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):340 -> a
+    107:110:java.util.List computeProgramClassRelationChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):341:344 -> a
+    111:115:java.util.List computeChainInClassHierarchy(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):365:369 -> a
+    116:128:java.util.List computeChainInClassHierarchy(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):367:379 -> a
+    129:135:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):398:404 -> a
+    136:136:boolean com.android.tools.r8.graph.DexMethod.hasSameProtoAndName(com.android.tools.r8.graph.DexMethod):202:202 -> a
+    136:136:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):404 -> a
+    137:137:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):404:404 -> a
+    138:138:boolean com.android.tools.r8.graph.AccessFlags.isSameVisibility(com.android.tools.r8.graph.AccessFlags):118:118 -> a
+    138:138:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):405 -> a
+    139:140:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):409:410 -> a
+    141:141:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexField):444:444 -> a
+    142:145:com.android.tools.r8.graph.DexEncodedField lookupInstanceTargetOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):437:440 -> a
+    142:145:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexField):444 -> a
+    146:147:com.android.tools.r8.graph.DexClassAndMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):496:497 -> a
+    148:149:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,boolean):549:550 -> a
+    150:153:com.android.tools.r8.graph.ResolutionResult resolveMethodOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,boolean):571:574 -> a
+    154:159:com.android.tools.r8.graph.ResolutionResult resolveMethodOnArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):585:590 -> a
+    160:160:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethod):595:595 -> a
+    161:173:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):610:622 -> a
+    174:177:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):626:629 -> a
+    178:178:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):681:681 -> a
+    178:178:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):634 -> a
+    179:181:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):703:703 -> a
+    179:181:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):682 -> a
+    179:181:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):634 -> a
+    182:182:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):683:683 -> a
+    182:182:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):634 -> a
+    183:183: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):647:647 -> a
+    184:190: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):504:510 -> a
+    184:190: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):647 -> a
+    191:193:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):526:526 -> a
+    191:193: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):517 -> a
+    191:193: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):647 -> a
+    195:197:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):528:530 -> a
+    195:197: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):517 -> a
+    195:197: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):647 -> a
+    198:198: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):649:649 -> a
+    199:199:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):494:494 -> a
+    199:199: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):652 -> a
+    200:209: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):659:668 -> a
+    210:210:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):688:688 -> a
+    210:210:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):422 -> a
+    211:213:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):703:703 -> a
+    211:213:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):689 -> a
+    211:213:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):422 -> a
+    214:214:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):690:690 -> a
+    214:214:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):422 -> a
+    215:217:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexMethod):695:697 -> a
+    215:217:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificMethod(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexMethod):427 -> a
+    218:220:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):703:703 -> a
+    221:227:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):712:718 -> a
+    228:228:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):494:494 -> a
+    228:228:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):719 -> a
+    229:229:boolean isMaximallySpecificCandidate(com.android.tools.r8.graph.DexEncodedMethod):743:743 -> a
+    229:229:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):720 -> a
+    230:240:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):722:732 -> a
+    241:241: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):813:813 -> a
+    242:244:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):823:825 -> a
+    245:245:com.android.tools.r8.graph.FieldResolutionResult$FailedFieldResolutionResult com.android.tools.r8.graph.FieldResolutionResult.failure():13:13 -> a
+    245:245:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):825 -> a
+    246:248:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField):829:831 -> a
+    249:266:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexClass,java.util.Set):839:856 -> a
+    267:267:com.android.tools.r8.graph.FieldResolutionResult$FailedFieldResolutionResult com.android.tools.r8.graph.FieldResolutionResult.failure():13:13 -> a
+    267:267:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexClass,java.util.Set):859 -> a
+    268:270:com.android.tools.r8.graph.DexClassAndField resolveFieldOnDirectInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,java.util.Set):864:866 -> a
+    271:276:com.android.tools.r8.graph.DexClassAndField resolveFieldOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,java.util.Set):882:887 -> a
+    271:276:com.android.tools.r8.graph.DexClassAndField resolveFieldOnDirectInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,java.util.Set):869 -> a
+    1:8:com.android.tools.r8.graph.AppInfoWithClassHierarchy prunedCopyFrom(com.android.tools.r8.graph.PrunedItems):119:126 -> b
+    9:9:com.android.tools.r8.features.ClassToFeatureSplitMap getClassToFeatureSplitMap():133:133 -> b
+    9:9:com.android.tools.r8.graph.AppInfoWithClassHierarchy prunedCopyFrom(com.android.tools.r8.graph.PrunedItems):127 -> b
+    10:11:com.android.tools.r8.graph.AppInfoWithClassHierarchy prunedCopyFrom(com.android.tools.r8.graph.PrunedItems):127:128 -> b
+    12:12:com.android.tools.r8.shaking.MissingClasses getMissingClasses():137:137 -> b
+    12:12:com.android.tools.r8.graph.AppInfoWithClassHierarchy prunedCopyFrom(com.android.tools.r8.graph.PrunedItems):129 -> b
+    13:13:com.android.tools.r8.graph.AppInfoWithClassHierarchy prunedCopyFrom(com.android.tools.r8.graph.PrunedItems):129:129 -> b
+    14:16:boolean inSameHierarchy(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):275:277 -> b
+    17:17:com.android.tools.r8.graph.DexEncodedField lookupStaticTarget(com.android.tools.r8.graph.DexField):461:461 -> b
+    18:21:com.android.tools.r8.graph.DexEncodedField lookupStaticTargetOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):454:457 -> b
+    18:21:com.android.tools.r8.graph.DexEncodedField lookupStaticTarget(com.android.tools.r8.graph.DexField):461 -> b
+    22:24:com.android.tools.r8.graph.ResolutionResult resolveMethodOn(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):554:556 -> b
+    25:25:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexMethod):747:747 -> b
+    26:40:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):762:776 -> b
+    1:25:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):247:271 -> c
+    26:26:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):521:521 -> c
+    27:28:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):515:516 -> c
+    27:28:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):521 -> c
+    29:38:com.android.tools.r8.graph.ResolutionResult unsafeResolveMethodDueToDexFormat(com.android.tools.r8.graph.DexMethod):535:544 -> c
+    39:40:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):780:781 -> c
+    41:41:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):494:494 -> c
+    41:41:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):783 -> c
+    42:47:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):785:790 -> c
+    48:48:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):494:494 -> c
+    48:48:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):792 -> c
+    49:50:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):793:794 -> c
+    51:51:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):681:681 -> c
+    51:51:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):798 -> c
+    52:54:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):703:703 -> c
+    52:54:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):682 -> c
+    52:54:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):798 -> c
+    55:55:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):683:683 -> c
+    55:55:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):798 -> c
+    56:57:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField):806:807 -> c
+    1:5:boolean isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):239:243 -> d
+    6:6:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):481:481 -> d
+    7:8:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):475:476 -> d
+    7:8:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):481 -> d
+    1:17:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):291:307 -> f
+    1:1:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):285:285 -> g
+    2:6:boolean com.android.tools.r8.graph.DexClass.hasMissingSuperType(com.android.tools.r8.graph.AppInfoWithClassHierarchy):666:670 -> g
+    2:6:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):286 -> g
+    1:1:boolean hasClassHierarchy():142:142 -> h
+    1:1:com.android.tools.r8.graph.AppInfoWithClassHierarchy withClassHierarchy():148:148 -> n
+    1:1:com.android.tools.r8.features.ClassToFeatureSplitMap getClassToFeatureSplitMap():133:133 -> p
+    1:1:com.android.tools.r8.shaking.MissingClasses getMissingClasses():137:137 -> q
 com.android.tools.r8.graph.AppInfoWithClassHierarchy$1 -> com.android.tools.r8.graph.c$a:
 com.android.tools.r8.graph.AppInfoWithClassHierarchy$CreateDesugaringViewOnAppInfo -> com.android.tools.r8.graph.c$b:
-    1:1:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy$1):52:52 -> <init>
-    2:2:void <init>():53:53 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy$1):49:49 -> <init>
+    2:2:void <init>():50:50 -> <init>
 com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder -> com.android.tools.r8.graph.c$c:
     java.util.LinkedHashMap maximallySpecificMethods -> b
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():940:940 -> <clinit>
-    1:9:void <init>():940:948 -> <init>
-    10:10:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy$1):940:940 -> <init>
-    1:9:void addCandidate(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppInfo):952:960 -> a
-    10:24:void markShadowed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfo):968:982 -> a
-    25:27:com.android.tools.r8.graph.DexClassAndMethod lookup():987:989 -> a
-    28:34:com.android.tools.r8.graph.ResolutionResult internalResolve(com.android.tools.r8.graph.DexClass):999:1005 -> a
-    35:63:com.android.tools.r8.graph.ResolutionResult internalResolve(com.android.tools.r8.graph.DexClass):1004:1032 -> a
-    64:67:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult singleResultHelper(com.android.tools.r8.graph.DexClass,java.util.Map$Entry):1037:1040 -> a
-    1:2:com.android.tools.r8.graph.ResolutionResult resolve(com.android.tools.r8.graph.DexClass):994:995 -> b
-com.android.tools.r8.graph.AppServices -> com.android.tools.r8.internal.i1:
+    1:1:void <clinit>():890:890 -> <clinit>
+    1:9:void <init>():890:898 -> <init>
+    10:10:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy$1):890:890 -> <init>
+    1:9:void addCandidate(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppInfo):902:910 -> a
+    10:24:void markShadowed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfo):918:932 -> a
+    25:27:com.android.tools.r8.graph.DexClassAndMethod lookup():937:939 -> a
+    28:34:com.android.tools.r8.graph.ResolutionResult internalResolve(com.android.tools.r8.graph.DexClass):949:955 -> a
+    35:63:com.android.tools.r8.graph.ResolutionResult internalResolve(com.android.tools.r8.graph.DexClass):954:982 -> a
+    64:67:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult singleResultHelper(com.android.tools.r8.graph.DexClass,java.util.Map$Entry):987:990 -> a
+    1:2:com.android.tools.r8.graph.ResolutionResult resolve(com.android.tools.r8.graph.DexClass):944:945 -> b
+com.android.tools.r8.graph.AppServices -> com.android.tools.r8.internal.h1:
     java.util.Map services -> c
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
@@ -16402,20 +16449,27 @@
     4:4:void lambda$computeAllServiceImplementations$0(java.util.Set,com.android.tools.r8.FeatureSplit,java.util.List):67:67 -> a
     5:12:java.util.List serviceImplementationsFor(com.android.tools.r8.graph.DexType):72:79 -> a
     13:23:java.util.List serviceImplementationsFor(com.android.tools.r8.graph.DexType):75:85 -> a
-    24:47:boolean hasServiceImplementationsInFeature(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):90:113 -> a
-    48:50:boolean hasServiceImplementationsInFeature(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):96:98 -> a
-    51:63:com.android.tools.r8.graph.AppServices rewrittenWithLens(com.android.tools.r8.graph.GraphLens):122:134 -> a
-    64:69:com.android.tools.r8.graph.AppServices rewrittenWithLens(com.android.tools.r8.graph.GraphLens):133:138 -> a
-    70:89:com.android.tools.r8.graph.AppServices prunedCopy(com.android.tools.r8.graph.PrunedItems):143:162 -> a
-    90:100:com.android.tools.r8.graph.AppServices prunedCopy(com.android.tools.r8.graph.PrunedItems):161:171 -> a
-    101:101:void visit(java.util.function.BiConsumer):187:187 -> a
-    102:104:void lambda$visit$2(java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,java.util.Map):189:191 -> a
-    105:105:com.android.tools.r8.graph.AppServices$Builder builder(com.android.tools.r8.graph.AppView):196:196 -> a
+    24:41:boolean hasServiceImplementationsInFeature(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):90:107 -> a
+    42:42:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass):101:101 -> a
+    42:42:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInFeature(com.android.tools.r8.graph.DexProgramClass):110 -> a
+    42:42:boolean hasServiceImplementationsInFeature(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):108 -> a
+    43:44:boolean hasServiceImplementationsInFeature(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):111:112 -> a
+    45:45:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass):101:101 -> a
+    45:45:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInFeature(com.android.tools.r8.graph.DexProgramClass):110 -> a
+    45:45:boolean hasServiceImplementationsInFeature(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):113 -> a
+    46:48:boolean hasServiceImplementationsInFeature(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):96:98 -> a
+    49:61:com.android.tools.r8.graph.AppServices rewrittenWithLens(com.android.tools.r8.graph.GraphLens):122:134 -> a
+    62:67:com.android.tools.r8.graph.AppServices rewrittenWithLens(com.android.tools.r8.graph.GraphLens):133:138 -> a
+    68:87:com.android.tools.r8.graph.AppServices prunedCopy(com.android.tools.r8.graph.PrunedItems):143:162 -> a
+    88:98:com.android.tools.r8.graph.AppServices prunedCopy(com.android.tools.r8.graph.PrunedItems):161:171 -> a
+    99:99:void visit(java.util.function.BiConsumer):187:187 -> a
+    100:102:void lambda$visit$2(java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,java.util.Map):189:191 -> a
+    103:103:com.android.tools.r8.graph.AppServices$Builder builder(com.android.tools.r8.graph.AppView):196:196 -> a
     1:3:java.util.Set computeAllServiceImplementations():61:63 -> b
     1:1:boolean isEmpty():52:52 -> c
     1:5:boolean verifyRewrittenWithLens():175:179 -> d
-com.android.tools.r8.graph.AppServices$1 -> com.android.tools.r8.internal.i1$a:
-com.android.tools.r8.graph.AppServices$Builder -> com.android.tools.r8.internal.i1$b:
+com.android.tools.r8.graph.AppServices$1 -> com.android.tools.r8.internal.h1$a:
+com.android.tools.r8.graph.AppServices$Builder -> com.android.tools.r8.internal.h1$b:
     java.util.Map services -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> b
@@ -16432,7 +16486,7 @@
     15:15:com.android.tools.r8.graph.AppServices build():225:225 -> a
     1:1:java.util.Map access$300(com.android.tools.r8.graph.AppServices$Builder):199:199 -> b
     1:1:com.android.tools.r8.utils.InternalOptions access$400(com.android.tools.r8.graph.AppServices$Builder):199:199 -> c
-com.android.tools.r8.graph.AppServices$Builder$DataResourceProviderVisitor -> com.android.tools.r8.internal.i1$b$a:
+com.android.tools.r8.graph.AppServices$Builder$DataResourceProviderVisitor -> com.android.tools.r8.internal.h1$b$a:
     com.android.tools.r8.graph.AppServices$Builder this$0 -> b
     com.android.tools.r8.FeatureSplit featureSplit -> a
     1:2:void <init>(com.android.tools.r8.graph.AppServices$Builder,com.android.tools.r8.FeatureSplit):241:242 -> <init>
@@ -16443,194 +16497,187 @@
     46:52:boolean lambda$readServiceImplementationsForService$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,java.util.List,com.android.tools.r8.graph.DexType):303:309 -> a
     53:74:boolean lambda$readServiceImplementationsForService$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,java.util.List,com.android.tools.r8.graph.DexType):305:326 -> a
     75:87:boolean lambda$readServiceImplementationsForService$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,java.util.List,com.android.tools.r8.graph.DexType):321:333 -> a
-    88:89:void warn(java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin):345:346 -> a
+    88:90:void warn(java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin):345:347 -> a
     1:2:java.lang.String prefixUntilCommentChar(java.lang.String):340:341 -> b
     1:20:void visit(com.android.tools.r8.DataEntryResource):253:272 -> visit
     21:36:void visit(com.android.tools.r8.DataEntryResource):267:282 -> visit
     37:40:void visit(com.android.tools.r8.DataEntryResource):281:284 -> visit
 com.android.tools.r8.graph.AppView -> com.android.tools.r8.graph.d:
-    com.android.tools.r8.graph.classmerging.VerticallyMergedClasses verticallyMergedClasses -> A
-    com.android.tools.r8.graph.GraphLens graphLens -> g
-    com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator callSiteOptimizationInfoPropagator -> s
-    com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer libraryMemberOptimizer -> t
-    java.util.function.Predicate classesEscapingIntoLibrary -> w
+    com.android.tools.r8.graph.InitClassLens initClassLens -> g
+    com.android.tools.r8.graph.AppView$WholeProgramOptimizations wholeProgramOptimizations -> e
+    com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator callSiteOptimizationInfoPropagator -> q
+    com.android.tools.r8.shaking.RootSetBuilder$RootSet rootSet -> h
+    com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer libraryMemberOptimizer -> r
+    java.util.function.Predicate classesEscapingIntoLibrary -> u
+    com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses horizontallyMergedLambdaClasses -> w
     com.android.tools.r8.graph.AppServices appServices -> d
-    com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses horizontallyMergedLambdaClasses -> y
-    com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods initializedClassesInInstanceMethods -> x
-    java.util.Map sourceDebugExtensions -> D
-    com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory simpleInliningConstraintFactory -> o
-    com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection libraryMethodSideEffectModelCollection -> r
-    com.android.tools.r8.shaking.RootSetUtils$RootSet rootSet -> j
-    com.android.tools.r8.ir.analysis.value.AbstractValueFactory abstractValueFactory -> l
-    com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory instanceFieldInitializationInfoFactory -> m
-    com.android.tools.r8.ir.conversion.MethodProcessingId$Factory methodProcessingIdFactory -> n
+    com.android.tools.r8.ir.optimize.enums.EnumDataMap unboxedEnums -> A
+    com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection libraryMethodSideEffectModelCollection -> p
+    com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods initializedClassesInInstanceMethods -> v
+    java.util.Set alreadyLibraryDesugared -> D
+    com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory simpleInliningConstraintFactory -> m
+    com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory instanceFieldInitializationInfoFactory -> k
+    com.android.tools.r8.ir.conversion.MethodProcessingId$Factory methodProcessingIdFactory -> l
+    com.android.tools.r8.ir.analysis.value.AbstractValueFactory abstractValueFactory -> j
     com.android.tools.r8.graph.AppInfo appInfo -> b
-    com.android.tools.r8.errors.dontwarn.DontWarnConfiguration dontWarnConfiguration -> e
-    com.android.tools.r8.ir.analysis.proto.ProtoShrinker protoShrinker -> u
-    com.android.tools.r8.graph.InitClassLens initClassLens -> h
-    com.android.tools.r8.graph.AppView$WholeProgramOptimizations wholeProgramOptimizations -> f
-    com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses horizontallyMergedClasses -> z
-    boolean allCodeProcessed -> v
-    com.android.tools.r8.shaking.KeepInfoCollection keepInfo -> k
+    com.android.tools.r8.ir.analysis.proto.ProtoShrinker protoShrinker -> s
+    com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses horizontallyMergedClasses -> x
+    com.android.tools.r8.graph.GraphLens graphLens -> f
+    java.util.Set cfByteCodePassThrough -> B
+    com.android.tools.r8.shaking.KeepInfoCollection keepInfo -> i
+    boolean allCodeProcessed -> t
+    java.util.Map sourceDebugExtensions -> C
     com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfoForDesugaring -> c
-    java.util.Set cfByteCodePassThrough -> C
-    com.android.tools.r8.ir.optimize.enums.EnumDataMap unboxedEnums -> B
-    java.util.Set alreadyLibraryDesugared -> E
-    com.android.tools.r8.shaking.ProguardCompatibilityActions proguardCompatibilityActions -> i
-    com.android.tools.r8.ir.desugar.PrefixRewritingMapper rewritePrefix -> p
-    com.android.tools.r8.ir.desugar.InvokeSpecialBridgeSynthesizer invokeSpecialBridgeSynthesizer -> q
+    com.android.tools.r8.graph.classmerging.StaticallyMergedClasses staticallyMergedClasses -> y
+    com.android.tools.r8.graph.classmerging.VerticallyMergedClasses verticallyMergedClasses -> z
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():51:51 -> <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):110:110 -> <init>
-    2:68:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):69:135 -> <init>
-    1:1:com.android.tools.r8.ir.conversion.MethodProcessingId$Factory methodProcessingIdFactory():193:193 -> A
-    1:1:com.android.tools.r8.utils.InternalOptions options():447:447 -> B
-    1:1:com.android.tools.r8.ir.analysis.proto.ProtoShrinker protoShrinker():331:331 -> C
-    1:1:com.android.tools.r8.shaking.RootSetUtils$RootSet rootSet():455:455 -> D
-    1:1:void setAllCodeProcessed():246:246 -> E
-    1:1:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory simpleInliningConstraintFactory():197:197 -> F
-    1:1:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():451:451 -> G
-    1:1:com.android.tools.r8.ir.optimize.enums.EnumDataMap unboxedEnums():541:541 -> H
-    1:4:boolean validateUnboxedEnumsHaveBeenPruned():551:554 -> I
-    1:1:com.android.tools.r8.graph.classmerging.VerticallyMergedClasses verticallyMergedClasses():531:531 -> J
-    1:1:com.android.tools.r8.graph.AppView withClassHierarchy():562:562 -> K
-    com.android.tools.r8.graph.AppView withLiveness() -> L
-    1:1:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo):150:150 -> a
-    2:3:com.android.tools.r8.ir.desugar.PrefixRewritingMapper defaultPrefixRewritingMapper(com.android.tools.r8.graph.AppInfo):145:146 -> a
-    2:3:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo):151 -> a
-    4:4:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo):151:151 -> a
-    5:5:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):156:156 -> a
-    6:6:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication):160:160 -> a
-    7:8:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexClasses):165:166 -> a
-    9:9:com.android.tools.r8.features.ClassToFeatureSplitMap com.android.tools.r8.features.ClassToFeatureSplitMap.createInitialClassToFeatureSplitMap(com.android.tools.r8.utils.InternalOptions):53:53 -> a
-    9:9:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexClasses):166 -> a
-    10:10:com.android.tools.r8.features.ClassToFeatureSplitMap com.android.tools.r8.features.ClassToFeatureSplitMap.createInitialClassToFeatureSplitMap(com.android.tools.r8.utils.InternalOptions):52:52 -> a
-    10:10:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexClasses):166 -> a
-    11:14:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexClasses):168:171 -> a
-    15:15:void setAppServices(com.android.tools.r8.graph.AppServices):258:258 -> a
-    16:16:void setClassesEscapingIntoLibrary(java.util.function.Predicate):271:271 -> a
-    17:17:void setSourceDebugExtensionForType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexValue$DexValueString):275:275 -> a
-    18:18:com.android.tools.r8.graph.DexValue$DexValueString getSourceDebugExtensionForType(com.android.tools.r8.graph.DexClass):279:279 -> a
-    19:19:com.android.tools.r8.graph.DexItemFactory dexItemFactory():303:303 -> a
-    20:21:void withGeneratedExtensionRegistryShrinker(com.android.tools.r8.utils.ThrowingConsumer):357:358 -> a
-    22:23:java.lang.Object withGeneratedExtensionRegistryShrinker(java.util.function.Function,java.lang.Object):364:365 -> a
-    24:25:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):406:407 -> a
-    24:25: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):656 -> a
-    26:45: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):657:676 -> a
-    46:50: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):675:679 -> a
-    51:52:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):406:407 -> a
-    53:53:void setInitClassLens(com.android.tools.r8.graph.InitClassLens):426:426 -> a
-    54:54:void setInitializedClassesInInstanceMethods(com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods):431:431 -> a
-    55:56:void setRootSet(com.android.tools.r8.shaking.RootSetUtils$RootSet):459:460 -> a
-    57:58:void setProguardCompatibilityActions(com.android.tools.r8.shaking.ProguardCompatibilityActions):477:478 -> a
-    59:60:void setHorizontallyMergedLambdaClasses(com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses):505:506 -> a
-    61:61:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():451:451 -> a
-    61:61:void setHorizontallyMergedLambdaClasses(com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses):507 -> a
-    62:64:void setHorizontallyMergedLambdaClasses(com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses):507:509 -> a
-    65:66:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses):521:522 -> a
-    67:67:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():451:451 -> a
-    67:67:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses):523 -> a
-    68:68:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses):523:523 -> a
-    69:70:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):535:536 -> a
-    71:71:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():451:451 -> a
-    71:71:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):537 -> a
-    72:72:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):537:537 -> a
-    73:74:void setUnboxedEnums(com.android.tools.r8.ir.optimize.enums.EnumDataMap):545:546 -> a
-    75:75:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():451:451 -> a
-    75:75:void setUnboxedEnums(com.android.tools.r8.ir.optimize.enums.EnumDataMap):547 -> a
-    76:76:void setUnboxedEnums(com.android.tools.r8.ir.optimize.enums.EnumDataMap):547:547 -> a
-    77:79:com.android.tools.r8.utils.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):581:583 -> a
-    80:87:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):587:594 -> a
-    88:97:void pruneItems(com.android.tools.r8.graph.PrunedItems):602:611 -> a
-    98:98:void pruneAppInfo(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.graph.AppView):626:626 -> a
-    98:98:void pruneItems(com.android.tools.r8.graph.PrunedItems):613 -> a
-    99:99:com.android.tools.r8.graph.AppServices appServices():254:254 -> a
-    99:99:void pruneItems(com.android.tools.r8.graph.PrunedItems):615 -> a
-    100:102:void pruneItems(com.android.tools.r8.graph.PrunedItems):616:618 -> a
-    103:103:com.android.tools.r8.shaking.ProguardCompatibilityActions getProguardCompatibilityActions():472:472 -> a
-    103:103:void pruneItems(com.android.tools.r8.graph.PrunedItems):620 -> a
-    104:104:void pruneItems(com.android.tools.r8.graph.PrunedItems):620:620 -> a
-    105:105:void pruneItems(com.android.tools.r8.graph.PrunedItems):619:619 -> a
-    106:106:void rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):631:631 -> a
-    107:107:void rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication):637:637 -> a
-    108:110:void rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):642:644 -> a
-    111:111:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):682:682 -> a
-    112:112:com.android.tools.r8.graph.AppServices appServices():254:254 -> a
-    112:112:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):683 -> 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):683:683 -> a
-    114:114:boolean hasInitClassLens():422:422 -> 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):684 -> 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):685:685 -> a
-    116:116:void setInitClassLens(com.android.tools.r8.graph.InitClassLens):426:426 -> 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):685 -> 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):687:687 -> a
-    118:118:com.android.tools.r8.shaking.ProguardCompatibilityActions getProguardCompatibilityActions():472:472 -> 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):689 -> a
-    119:119:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):689:689 -> a
-    120:120:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):688:688 -> a
-    121:122:void setAlreadyLibraryDesugared(java.util.Set):695:696 -> a
-    123:127:boolean isAlreadyLibraryDesugared(com.android.tools.r8.graph.DexProgramClass):700:704 -> a
-    1:1:com.android.tools.r8.graph.AppView createForL8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):176:176 -> b
-    2:2:com.android.tools.r8.graph.AppView createForRelocator(com.android.tools.r8.graph.AppInfo):180:180 -> b
-    3:4:com.android.tools.r8.ir.desugar.PrefixRewritingMapper defaultPrefixRewritingMapper(com.android.tools.r8.graph.AppInfo):145:146 -> b
-    3:4:com.android.tools.r8.graph.AppView createForRelocator(com.android.tools.r8.graph.AppInfo):181 -> b
-    5:5:com.android.tools.r8.graph.AppView createForRelocator(com.android.tools.r8.graph.AppInfo):181:181 -> b
-    6:6:com.android.tools.r8.ir.analysis.value.AbstractValueFactory abstractValueFactory():185:185 -> b
-    7:8:void withGeneratedMessageLiteBuilderShrinker(com.android.tools.r8.utils.ThrowingConsumer):379:380 -> b
-    9:10:java.lang.Object withGeneratedMessageLiteBuilderShrinker(java.util.function.Function,java.lang.Object):394:395 -> b
-    11:11:void setCfByteCodePassThrough(java.util.Set):435:435 -> b
-    1:2:com.android.tools.r8.ir.desugar.PrefixRewritingMapper defaultPrefixRewritingMapper(com.android.tools.r8.graph.AppInfo):145:146 -> c
-    3:3:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):284:284 -> c
-    4:5:void withGeneratedMessageLiteShrinker(com.android.tools.r8.utils.ThrowingConsumer):372:373 -> c
-    6:7:java.lang.Object withGeneratedMessageLiteShrinker(java.util.function.Function,java.lang.Object):386:387 -> c
-    8:16:com.android.tools.r8.graph.classmerging.MergedClassesCollection allMergedClasses():482:490 -> c
-    1:1:boolean isModeled(com.android.tools.r8.graph.DexType):141:141 -> d
-    2:3:com.android.tools.r8.graph.AppInfo appInfo():201:202 -> d
-    4:6:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):226:228 -> d
-    7:7:void unsetAppInfoForDesugaring():222:222 -> d
-    7:7:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):229 -> d
-    8:11:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):231:234 -> d
-    12:13:void withProtoShrinker(com.android.tools.r8.utils.ThrowingConsumer):336:337 -> d
-    14:15:java.lang.Object withInitializedClassesInInstanceMethods(java.util.function.Function,java.lang.Object):440:441 -> d
-    1:9:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfoForDesugaring():210:218 -> e
-    10:11:boolean isClassEscapingIntoLibrary(com.android.tools.r8.graph.DexType):266:267 -> e
-    12:12:java.lang.Object withProtoEnumShrinker(java.util.function.Function,java.lang.Object):349:349 -> e
-    13:13:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.isEnumLiteProtoShrinkingEnabled():1224:1224 -> e
-    13:13:java.lang.Object withProtoEnumShrinker(java.util.function.Function,java.lang.Object):349 -> e
-    14:14:java.lang.Object withProtoEnumShrinker(java.util.function.Function,java.lang.Object):350:350 -> e
-    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness appInfoWithLiveness():206:206 -> f
-    2:12:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):288:298 -> f
-    13:14:java.lang.Object withProtoShrinker(java.util.function.Function,java.lang.Object):342:343 -> f
-    1:1:com.android.tools.r8.graph.AppServices appServices():254:254 -> g
-    1:1:com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator callSiteOptimizationInfoPropagator():315:315 -> h
-    1:1:boolean canUseInitClass():414:414 -> i
-    2:2:boolean com.android.tools.r8.graph.InitClassLens.isFinal():0:0 -> i
-    2:2:boolean canUseInitClass():414 -> i
-    1:1:com.android.tools.r8.graph.GraphLens clearCodeRewritings():250:250 -> j
-    2:3:com.android.tools.r8.graph.GraphLens com.android.tools.r8.graph.GraphLens.withCodeRewritingsApplied(com.android.tools.r8.graph.DexItemFactory):475:476 -> j
-    2:3:com.android.tools.r8.graph.GraphLens clearCodeRewritings():250 -> j
-    4:4:com.android.tools.r8.graph.GraphLens clearCodeRewritings():250:250 -> j
-    1:1:boolean enableWholeProgramOptimizations():307:307 -> k
-    1:1:com.android.tools.r8.errors.dontwarn.DontWarnConfiguration getDontWarnConfiguration():262:262 -> l
-    1:1:com.android.tools.r8.ir.desugar.InvokeSpecialBridgeSynthesizer getInvokeSpecialBridgeSynthesizer():319:319 -> m
-    1:1:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():464:464 -> n
-    1:1:com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection getLibraryMethodSideEffectModelCollection():327:327 -> o
-    1:1:com.android.tools.r8.shaking.ProguardCompatibilityActions getProguardCompatibilityActions():472:472 -> p
-    1:1:com.android.tools.r8.synthesis.SyntheticItems getSyntheticItems():311:311 -> q
-    1:1:com.android.tools.r8.graph.GraphLens graphLens():401:401 -> r
-    1:1:boolean hasCfByteCodePassThroughMethods():598:598 -> s
-    1:1:boolean hasProguardCompatibilityActions():468:468 -> t
-    1:1:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses horizontallyMergedClasses():517:517 -> u
-    1:1:com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses horizontallyMergedLambdaClasses():500:500 -> v
-    1:1:com.android.tools.r8.graph.InitClassLens initClassLens():418:418 -> w
-    1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory instanceFieldInitializationInfoFactory():189:189 -> x
-    1:1:boolean isAllCodeProcessed():242:242 -> y
-    1:1:com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer libraryMethodOptimizer():323:323 -> z
+    com.android.tools.r8.ir.desugar.InvokeSpecialBridgeSynthesizer invokeSpecialBridgeSynthesizer -> o
+    com.android.tools.r8.ir.desugar.PrefixRewritingMapper rewritePrefix -> n
+    1:1:void <clinit>():50:50 -> <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):107:107 -> <init>
+    2:68:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):66:132 -> <init>
+    1:1:void setAllCodeProcessed():239:239 -> A
+    1:1:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory simpleInliningConstraintFactory():194:194 -> B
+    1:1:com.android.tools.r8.graph.classmerging.StaticallyMergedClasses staticallyMergedClasses():505:505 -> C
+    1:1:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():440:440 -> D
+    1:1:com.android.tools.r8.ir.optimize.enums.EnumDataMap unboxedEnums():529:529 -> E
+    1:4:boolean validateUnboxedEnumsHaveBeenPruned():539:542 -> F
+    1:1:com.android.tools.r8.graph.classmerging.VerticallyMergedClasses verticallyMergedClasses():519:519 -> G
+    1:1:com.android.tools.r8.graph.AppView withClassHierarchy():550:550 -> H
+    com.android.tools.r8.graph.AppView withLiveness() -> I
+    1:1:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo):147:147 -> a
+    2:3:com.android.tools.r8.ir.desugar.PrefixRewritingMapper defaultPrefixRewritingMapper(com.android.tools.r8.graph.AppInfo):142:143 -> a
+    2:3:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo):148 -> a
+    4:4:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo):148:148 -> a
+    5:5:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):153:153 -> a
+    6:6:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication):157:157 -> a
+    7:8:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexClasses):162:163 -> a
+    9:9:com.android.tools.r8.features.ClassToFeatureSplitMap com.android.tools.r8.features.ClassToFeatureSplitMap.createInitialClassToFeatureSplitMap(com.android.tools.r8.utils.InternalOptions):45:45 -> a
+    9:9:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexClasses):163 -> a
+    10:10:com.android.tools.r8.features.ClassToFeatureSplitMap com.android.tools.r8.features.ClassToFeatureSplitMap.createInitialClassToFeatureSplitMap(com.android.tools.r8.utils.InternalOptions):44:44 -> a
+    10:10:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexClasses):163 -> a
+    11:14:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexClasses):165:168 -> a
+    15:15:void setAppServices(com.android.tools.r8.graph.AppServices):251:251 -> a
+    16:16:void setClassesEscapingIntoLibrary(java.util.function.Predicate):260:260 -> a
+    17:17:void setSourceDebugExtensionForType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexValue$DexValueString):264:264 -> a
+    18:18:com.android.tools.r8.graph.DexValue$DexValueString getSourceDebugExtensionForType(com.android.tools.r8.graph.DexClass):268:268 -> a
+    19:19:com.android.tools.r8.graph.DexItemFactory dexItemFactory():292:292 -> a
+    20:21:void withGeneratedExtensionRegistryShrinker(com.android.tools.r8.utils.ThrowingConsumer):346:347 -> a
+    22:23:java.lang.Object withGeneratedExtensionRegistryShrinker(java.util.function.Function,java.lang.Object):353:354 -> a
+    24:25:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):395:396 -> a
+    24:25: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):636 -> a
+    26:45: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):637:656 -> a
+    46:50: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):655:659 -> a
+    51:52:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):395:396 -> a
+    53:53:void setInitClassLens(com.android.tools.r8.graph.InitClassLens):415:415 -> a
+    54:54:void setInitializedClassesInInstanceMethods(com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods):420:420 -> a
+    55:56:void setRootSet(com.android.tools.r8.shaking.RootSetBuilder$RootSet):448:449 -> a
+    57:58:void setHorizontallyMergedLambdaClasses(com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses):480:481 -> a
+    59:59:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():440:440 -> a
+    59:59:void setHorizontallyMergedLambdaClasses(com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses):482 -> a
+    60:62:void setHorizontallyMergedLambdaClasses(com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses):482:484 -> a
+    63:64:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses):496:497 -> a
+    65:65:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():440:440 -> a
+    65:65:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses):498 -> a
+    66:66:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses):498:498 -> a
+    67:68:void setStaticallyMergedClasses(com.android.tools.r8.graph.classmerging.StaticallyMergedClasses):509:510 -> a
+    69:69:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():440:440 -> a
+    69:69:void setStaticallyMergedClasses(com.android.tools.r8.graph.classmerging.StaticallyMergedClasses):511 -> a
+    70:70:void setStaticallyMergedClasses(com.android.tools.r8.graph.classmerging.StaticallyMergedClasses):511:511 -> a
+    71:72:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):523:524 -> a
+    73:73:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():440:440 -> a
+    73:73:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):525 -> a
+    74:74:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):525:525 -> a
+    75:76:void setUnboxedEnums(com.android.tools.r8.ir.optimize.enums.EnumDataMap):533:534 -> a
+    77:77:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():440:440 -> a
+    77:77:void setUnboxedEnums(com.android.tools.r8.ir.optimize.enums.EnumDataMap):535 -> a
+    78:78:void setUnboxedEnums(com.android.tools.r8.ir.optimize.enums.EnumDataMap):535:535 -> a
+    79:81:com.android.tools.r8.utils.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):565:567 -> a
+    82:89:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):571:578 -> a
+    90:99:void pruneItems(com.android.tools.r8.graph.PrunedItems):586:595 -> a
+    100:100:void pruneAppInfo(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.graph.AppView):606:606 -> a
+    100:100:void pruneItems(com.android.tools.r8.graph.PrunedItems):597 -> a
+    101:101:com.android.tools.r8.graph.AppServices appServices():247:247 -> a
+    101:101:void pruneItems(com.android.tools.r8.graph.PrunedItems):599 -> a
+    102:102:void pruneItems(com.android.tools.r8.graph.PrunedItems):600:600 -> a
+    103:103:void rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):611:611 -> a
+    104:104:void rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication):617:617 -> a
+    105:107:void rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):622:624 -> a
+    108:108:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):662:662 -> a
+    109:109:com.android.tools.r8.graph.AppServices appServices():247:247 -> a
+    109:109:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):663 -> a
+    110:110:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):663:663 -> a
+    111:111:boolean hasInitClassLens():411:411 -> a
+    111:111:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):664 -> a
+    112:112:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):665:665 -> a
+    113:113:void setInitClassLens(com.android.tools.r8.graph.InitClassLens):415:415 -> 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):665 -> a
+    114:115:void setAlreadyLibraryDesugared(java.util.Set):671:672 -> a
+    116:120:boolean isAlreadyLibraryDesugared(com.android.tools.r8.graph.DexProgramClass):676:680 -> a
+    1:1:com.android.tools.r8.graph.AppView createForL8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):173:173 -> b
+    2:2:com.android.tools.r8.graph.AppView createForRelocator(com.android.tools.r8.graph.AppInfo):177:177 -> b
+    3:4:com.android.tools.r8.ir.desugar.PrefixRewritingMapper defaultPrefixRewritingMapper(com.android.tools.r8.graph.AppInfo):142:143 -> b
+    3:4:com.android.tools.r8.graph.AppView createForRelocator(com.android.tools.r8.graph.AppInfo):178 -> b
+    5:5:com.android.tools.r8.graph.AppView createForRelocator(com.android.tools.r8.graph.AppInfo):178:178 -> b
+    6:6:com.android.tools.r8.ir.analysis.value.AbstractValueFactory abstractValueFactory():182:182 -> b
+    7:8:void withGeneratedMessageLiteBuilderShrinker(com.android.tools.r8.utils.ThrowingConsumer):368:369 -> b
+    9:10:java.lang.Object withGeneratedMessageLiteBuilderShrinker(java.util.function.Function,java.lang.Object):383:384 -> b
+    11:11:void setCfByteCodePassThrough(java.util.Set):424:424 -> b
+    1:2:com.android.tools.r8.ir.desugar.PrefixRewritingMapper defaultPrefixRewritingMapper(com.android.tools.r8.graph.AppInfo):142:143 -> c
+    3:3:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):273:273 -> c
+    4:5:void withGeneratedMessageLiteShrinker(com.android.tools.r8.utils.ThrowingConsumer):361:362 -> c
+    6:7:java.lang.Object withGeneratedMessageLiteShrinker(java.util.function.Function,java.lang.Object):375:376 -> c
+    8:16:com.android.tools.r8.graph.classmerging.MergedClassesCollection allMergedClasses():457:465 -> c
+    1:1:boolean isModeled(com.android.tools.r8.graph.DexType):138:138 -> d
+    2:3:com.android.tools.r8.graph.AppInfo appInfo():198:199 -> d
+    4:6:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):219:221 -> d
+    7:7:void unsetAppInfoForDesugaring():215:215 -> d
+    7:7:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):222 -> d
+    8:11:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):224:227 -> d
+    12:13:void withProtoShrinker(com.android.tools.r8.utils.ThrowingConsumer):325:326 -> d
+    14:15:java.lang.Object withInitializedClassesInInstanceMethods(java.util.function.Function,java.lang.Object):429:430 -> d
+    1:9:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfoForDesugaring():203:211 -> e
+    10:11:boolean isClassEscapingIntoLibrary(com.android.tools.r8.graph.DexType):255:256 -> e
+    12:12:java.lang.Object withProtoEnumShrinker(java.util.function.Function,java.lang.Object):338:338 -> e
+    13:13:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.isEnumLiteProtoShrinkingEnabled():1366:1366 -> e
+    13:13:java.lang.Object withProtoEnumShrinker(java.util.function.Function,java.lang.Object):338 -> e
+    14:14:java.lang.Object withProtoEnumShrinker(java.util.function.Function,java.lang.Object):339:339 -> e
+    1:1:com.android.tools.r8.graph.AppServices appServices():247:247 -> f
+    2:5:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):277:280 -> f
+    6:6:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):273:273 -> f
+    6:6:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):281 -> f
+    7:11:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):283:287 -> f
+    12:13:java.lang.Object withProtoShrinker(java.util.function.Function,java.lang.Object):331:332 -> f
+    1:1:com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator callSiteOptimizationInfoPropagator():304:304 -> g
+    1:1:boolean canUseInitClass():403:403 -> h
+    2:2:boolean com.android.tools.r8.graph.InitClassLens.isFinal():0:0 -> h
+    2:2:boolean canUseInitClass():403 -> h
+    1:1:com.android.tools.r8.graph.GraphLens clearCodeRewritings():243:243 -> i
+    2:3:com.android.tools.r8.graph.GraphLens com.android.tools.r8.graph.GraphLens.withCodeRewritingsApplied(com.android.tools.r8.graph.DexItemFactory):476:477 -> i
+    2:3:com.android.tools.r8.graph.GraphLens clearCodeRewritings():243 -> i
+    4:4:com.android.tools.r8.graph.GraphLens clearCodeRewritings():243:243 -> i
+    1:1:boolean enableWholeProgramOptimizations():296:296 -> j
+    1:1:com.android.tools.r8.ir.desugar.InvokeSpecialBridgeSynthesizer getInvokeSpecialBridgeSynthesizer():308:308 -> k
+    1:1:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():453:453 -> l
+    1:1:com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection getLibraryMethodSideEffectModelCollection():316:316 -> m
+    1:1:com.android.tools.r8.synthesis.SyntheticItems getSyntheticItems():300:300 -> n
+    1:1:com.android.tools.r8.graph.GraphLens graphLens():390:390 -> o
+    1:1:boolean hasCfByteCodePassThroughMethods():582:582 -> p
+    1:1:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses horizontallyMergedClasses():492:492 -> q
+    1:1:com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses horizontallyMergedLambdaClasses():475:475 -> r
+    1:1:com.android.tools.r8.graph.InitClassLens initClassLens():407:407 -> s
+    1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory instanceFieldInitializationInfoFactory():186:186 -> t
+    1:1:boolean isAllCodeProcessed():235:235 -> u
+    1:1:com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer libraryMethodOptimizer():312:312 -> v
+    1:1:com.android.tools.r8.ir.conversion.MethodProcessingId$Factory methodProcessingIdFactory():190:190 -> w
+    1:1:com.android.tools.r8.utils.InternalOptions options():436:436 -> x
+    1:1:com.android.tools.r8.ir.analysis.proto.ProtoShrinker protoShrinker():320:320 -> y
+    1:1:com.android.tools.r8.shaking.RootSetBuilder$RootSet rootSet():444:444 -> 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>():54:55 -> <clinit>
-    1:1:void <init>(java.lang.String,int):53:53 -> <init>
+    1:2:void <clinit>():53:54 -> <clinit>
+    1:1:void <init>(java.lang.String,int):52:52 -> <init>
 com.android.tools.r8.graph.AppliedGraphLens -> com.android.tools.r8.graph.e:
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap renamedTypeNames -> g
     boolean $assertionsDisabled -> f
@@ -16657,10 +16704,10 @@
     boolean isContextFreeForMethods() -> e
     1:1:com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType):149:149 -> e
     com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod) -> f
-com.android.tools.r8.graph.ArgumentUse -> com.android.tools.r8.internal.o1:
+com.android.tools.r8.graph.ArgumentUse -> com.android.tools.r8.internal.n1:
     1:1:void <init>():7:7 -> <init>
     boolean register(int) -> a
-com.android.tools.r8.graph.AssemblyWriter -> com.android.tools.r8.internal.H1:
+com.android.tools.r8.graph.AssemblyWriter -> com.android.tools.r8.internal.F1:
     com.android.tools.r8.ir.conversion.MethodProcessingId$Factory methodProcessingIdFactory -> d
     boolean writeCode -> i
     com.android.tools.r8.graph.AppInfo appInfo -> j
@@ -16676,7 +16723,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():209:209 -> a
+    9:9:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():199:199 -> 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
@@ -16687,7 +16734,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):384:384 -> 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):382:382 -> 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
@@ -16695,11 +16742,14 @@
     52:57:void writeClassHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):110:115 -> c
     1:1:void writeFieldsFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):146:146 -> d
     1:4:void writeFieldsHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):120:123 -> e
-com.android.tools.r8.graph.BottomUpClassHierarchyTraversal -> com.android.tools.r8.internal.i3:
+com.android.tools.r8.graph.BottomUpClassHierarchyTraversal -> com.android.tools.r8.internal.V2:
     com.android.tools.r8.graph.SubtypingInfo subtypingInfo -> g
     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:17:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):49:64 -> 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):273:273 -> 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
     18:18:com.android.tools.r8.graph.ClassHierarchyTraversal excludeInterfaces():0 -> a
     1:1:com.android.tools.r8.graph.BottomUpClassHierarchyTraversal forProgramClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):35:35 -> b
@@ -16726,7 +16776,7 @@
     1:1:void <clinit>():67:67 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):152:152 -> <init>
     2:16:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):144:158 -> <init>
-    1:2:boolean isEmptyVoidMethod():396:397 -> B
+    1:2:boolean isEmptyVoidMethod():393:394 -> B
     1:1:java.util.List getInstructions():197:197 -> E
     1:1:java.util.List getLocalVariables():205:205 -> F
     1:1:int getMaxLocals():180:180 -> G
@@ -16734,167 +16784,167 @@
     1:1:com.android.tools.r8.graph.DexType getOriginalHolder():172:172 -> I
     1:2:com.android.tools.r8.graph.CfCode$StackMapStatus getStackMapStatus():184:185 -> J
     1:1:java.util.List getTryCatchRanges():193:193 -> K
-    1:2:boolean shouldComputeInitialFrame():857:858 -> L
+    1:2:boolean shouldComputeInitialFrame():854:855 -> L
     3:3:boolean com.android.tools.r8.cf.code.CfInstruction.isFrame():0:0 -> L
-    3:3:boolean shouldComputeInitialFrame():858 -> L
+    3:3:boolean shouldComputeInitialFrame():855 -> L
     4:4:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> L
-    4:4:boolean shouldComputeInitialFrame():860 -> L
+    4:4:boolean shouldComputeInitialFrame():857 -> L
     5:5:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> L
-    5:5:boolean shouldComputeInitialFrame():860 -> L
-    6:6:boolean shouldComputeInitialFrame():865:865 -> L
+    5:5:boolean shouldComputeInitialFrame():857 -> L
+    6:6:boolean shouldComputeInitialFrame():862:862 -> L
     1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):67:67 -> a
     2:2:void setInstructions(java.util.List):201:201 -> a
-    3:6:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):253:256 -> a
-    7:7:void lambda$acceptHashing$0(com.android.tools.r8.utils.structural.HashingVisitor,com.android.tools.r8.cf.code.CfInstruction):256:256 -> a
-    8:9:int acceptCompareTo(com.android.tools.r8.graph.CfCode,com.android.tools.r8.utils.structural.CompareToVisitor):261:262 -> a
-    10:10:java.util.Collection lambda$acceptCompareTo$1(com.android.tools.r8.graph.CfCode):266:266 -> a
-    11:11:void lambda$acceptCompareTo$4(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):266:266 -> a
+    3:6:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):250:253 -> a
+    7:7:void lambda$acceptHashing$0(com.android.tools.r8.utils.structural.HashingVisitor,com.android.tools.r8.cf.code.CfInstruction):253:253 -> a
+    8:9:int acceptCompareTo(com.android.tools.r8.graph.CfCode,com.android.tools.r8.utils.structural.CompareToVisitor):258:259 -> a
+    10:10:java.util.Collection lambda$acceptCompareTo$1(com.android.tools.r8.graph.CfCode):263:263 -> a
+    11:11:void lambda$acceptCompareTo$4(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):263:263 -> a
     12:12:com.android.tools.r8.utils.structural.StructuralAcceptor com.android.tools.r8.graph.CfCompareHelper.instructionAcceptor():102:102 -> a
-    12:12:void lambda$acceptCompareTo$4(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):266 -> a
-    13:13:void lambda$acceptCompareTo$4(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):266:266 -> a
+    12:12:void lambda$acceptCompareTo$4(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):263 -> a
+    13:13:void lambda$acceptCompareTo$4(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):263:263 -> a
     14:14:com.android.tools.r8.utils.structural.StructuralAcceptor com.android.tools.r8.graph.CfCompareHelper.tryCatchRangeAcceptor():118:118 -> a
-    14:14:void lambda$acceptCompareTo$4(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):267 -> a
-    15:15:void lambda$acceptCompareTo$4(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):267:267 -> a
+    14:14:void lambda$acceptCompareTo$4(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):264 -> a
+    15:15:void lambda$acceptCompareTo$4(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):264:264 -> a
     16:16:com.android.tools.r8.utils.structural.StructuralAcceptor com.android.tools.r8.graph.CfCompareHelper.localVariableAcceptor():133:133 -> a
-    16:16:void lambda$acceptCompareTo$4(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):268 -> a
-    17:17:void lambda$acceptCompareTo$4(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):268:268 -> a
-    18:21: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):304:307 -> a
-    22: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):306:312 -> a
-    29:45:boolean shouldAddParameterNames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):275:291 -> a
-    29:45: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 -> a
-    46:46: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):313:313 -> a
+    16:16:void lambda$acceptCompareTo$4(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):265 -> a
+    17:17:void lambda$acceptCompareTo$4(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):265:265 -> a
+    18:21: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:304 -> a
+    22: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):303:309 -> a
+    29:45:boolean shouldAddParameterNames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):272:288 -> a
+    29:45: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
+    46:46: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):310:310 -> a
     47:47: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):72:72 -> a
-    47:47: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):314 -> a
-    48:73: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):317:342 -> a
-    74:94: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):336:356 -> a
-    95:107: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:361 -> a
-    108:108: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):360:360 -> a
-    109:115:void writeLocalVariableEntry(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.GraphLens,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):374:380 -> a
-    116:116:void writeLocalVariableEntry(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.GraphLens,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):375:375 -> a
-    117:118: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):408:409 -> a
-    119:122: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):421:424 -> a
-    123:125: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):423:425 -> a
-    126:140: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):509:523 -> a
-    141:146:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):528:533 -> a
-    147:147:void lambda$registerCodeReferences$5(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.code.CfTryCatch):533:533 -> a
-    148:153:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):538:543 -> a
-    154:154:void lambda$registerCodeReferencesForDesugaring$6(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.cf.code.CfTryCatch):543:543 -> a
-    155:195:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):550:590 -> a
-    196:196:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):589:589 -> a
-    197:197:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):561:561 -> a
-    198:226:void registerArgumentReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ArgumentUse):598:626 -> a
-    227:227:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):638:638 -> a
-    228:238: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):646:656 -> a
-    239:239:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():505:505 -> a
-    239: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):656 -> a
+    47:47: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 -> a
+    48:73: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):314:339 -> a
+    74:94: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):333:353 -> a
+    95:107: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):346:358 -> a
+    108:108: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):357:357 -> a
+    109:115:void writeLocalVariableEntry(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.GraphLens,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):371:377 -> a
+    116:116:void writeLocalVariableEntry(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.GraphLens,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):372:372 -> a
+    117:118: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):405:406 -> a
+    119:122: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):418:421 -> a
+    123:125: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):420:422 -> a
+    126:140: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):506:520 -> a
+    141:146:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):525:530 -> a
+    147:147:void lambda$registerCodeReferences$5(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.code.CfTryCatch):530:530 -> a
+    148:153:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):535:540 -> a
+    154:154:void lambda$registerCodeReferencesForDesugaring$6(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.cf.code.CfTryCatch):540:540 -> a
+    155:195:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):547:587 -> a
+    196:196:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):586:586 -> a
+    197:197:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):558:558 -> a
+    198:226:void registerArgumentReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ArgumentUse):595:623 -> a
+    227:227:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):635:635 -> a
+    228:238: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:653 -> a
+    239:239:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():518:518 -> a
+    239: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):653 -> a
     240:240:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():272:272 -> a
-    240:240: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):657 -> a
-    241:249: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):658:666 -> a
-    250:256: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):665:671 -> a
+    240:240: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):654 -> a
+    241:249: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):655:663 -> a
+    250:256: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):662:668 -> a
     257:257:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMoveException():280:280 -> a
-    257:257: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):674 -> a
-    258:258: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):674:674 -> a
-    259:283:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):680:704 -> a
+    257:257: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):671 -> a
+    258:258: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):671:671 -> a
+    259:283:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):677:701 -> a
     284:285: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):89:90 -> a
-    284:285:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):704 -> a
-    286:286:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):701:701 -> a
-    287:300:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):709:722 -> a
-    301:301:boolean com.android.tools.r8.graph.DexMethod.isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):266:266 -> a
-    301:301:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):722 -> a
-    302:310:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):724:732 -> a
+    284:285:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):701 -> a
+    286:286:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):698:698 -> a
+    287:300:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):706:719 -> a
+    301:301:boolean com.android.tools.r8.graph.DexMethod.isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):261:261 -> a
+    301:301:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):719 -> a
+    302:310:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):721:729 -> a
     311:311:boolean com.android.tools.r8.cf.code.CfInstruction.isFrame():0:0 -> a
-    311:311:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):732 -> a
-    312:319:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):733:740 -> a
-    320:320:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):738:738 -> a
+    311:311:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):729 -> a
+    312:319:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):730:737 -> a
+    320:320:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):735:735 -> a
     321:325: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):31:35 -> a
-    321:325:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):738 -> a
-    326:327:boolean reportStackMapError(com.android.tools.r8.graph.CfCodeDiagnostics,com.android.tools.r8.graph.AppView):833:834 -> a
-    326:327:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):737 -> a
-    328:334:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):744:750 -> a
-    335:335:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):749:749 -> a
+    321:325:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):735 -> a
+    326:327:boolean reportStackMapError(com.android.tools.r8.graph.CfCodeDiagnostics,com.android.tools.r8.graph.AppView):830:831 -> a
+    326:327:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):734 -> a
+    328:334:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):741:747 -> a
+    335:335:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):746:746 -> a
     336:340: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):22:26 -> a
-    336:340:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):749 -> a
-    341:342:boolean reportStackMapError(com.android.tools.r8.graph.CfCodeDiagnostics,com.android.tools.r8.graph.AppView):833:834 -> a
-    341:342:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):748 -> a
+    336:340:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):746 -> a
+    341:342:boolean reportStackMapError(com.android.tools.r8.graph.CfCodeDiagnostics,com.android.tools.r8.graph.AppView):830:831 -> a
+    341:342:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):745 -> a
     343:343:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
-    343:343:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):756 -> a
+    343:343:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):753 -> a
     344:344:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
-    344:344:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):758 -> a
-    345:350:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):759:764 -> a
+    344:344:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):755 -> a
+    345:350:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):756:761 -> a
     351:351:boolean com.android.tools.r8.cf.code.CfInstruction.isThrow():0:0 -> a
-    351:351:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):839 -> a
-    351:351:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):764 -> a
-    352:361:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):839:848 -> a
-    352:361:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):764 -> a
+    351:351:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):836 -> a
+    351:351:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):761 -> a
+    352:361:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):836:845 -> a
+    352:361:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):761 -> a
     362:362:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
-    362:362:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):848 -> a
-    362:362:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):764 -> a
+    362:362:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):845 -> a
+    362:362:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):761 -> a
     363:363:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
-    363:363:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):848 -> a
-    363:363:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):764 -> a
-    364:364:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):853:853 -> a
-    364:364:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):764 -> a
-    365:368:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):768:771 -> a
-    369:369:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):770:770 -> a
+    363:363:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):845 -> a
+    363:363:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):761 -> a
+    364:364:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):850:850 -> a
+    364:364:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):761 -> a
+    365:368:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):765:768 -> a
+    369:369:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):767:767 -> a
     370:375: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):40:45 -> a
-    370:375:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):770 -> a
-    376:377:boolean reportStackMapError(com.android.tools.r8.graph.CfCodeDiagnostics,com.android.tools.r8.graph.AppView):833:834 -> a
-    376:377:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):769 -> a
-    378:400:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):774:796 -> a
-    401:437: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):872:908 -> a
-    401:437:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):798 -> a
-    438:438:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):798:798 -> a
-    439:449:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):796:806 -> a
+    370:375:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):767 -> a
+    376:377:boolean reportStackMapError(com.android.tools.r8.graph.CfCodeDiagnostics,com.android.tools.r8.graph.AppView):830:831 -> a
+    376:377:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):766 -> a
+    378:400:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):771:793 -> a
+    401:437: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):869:905 -> a
+    401:437:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):795 -> a
+    438:438:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):795:795 -> a
+    439:449:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):793:803 -> a
     450:450:boolean com.android.tools.r8.ir.conversion.CfSourceCode.canThrowHelper(com.android.tools.r8.cf.code.CfInstruction,boolean):305:305 -> a
-    450:450:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):806 -> a
+    450:450:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):803 -> a
     451:451:boolean com.android.tools.r8.cf.code.CfInstruction.isConstString():0:0 -> a
     451:451:boolean com.android.tools.r8.ir.conversion.CfSourceCode.canThrowHelper(com.android.tools.r8.cf.code.CfInstruction,boolean):305 -> a
-    451:451:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):806 -> a
+    451:451:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):803 -> a
     452:452:boolean com.android.tools.r8.cf.code.CfInstruction.isDexItemBasedConstString():0:0 -> a
     452:452:boolean com.android.tools.r8.ir.conversion.CfSourceCode.canThrowHelper(com.android.tools.r8.cf.code.CfInstruction,boolean):305 -> a
-    452:452:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):806 -> a
+    452:452:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):803 -> a
     453:453:boolean com.android.tools.r8.ir.conversion.CfSourceCode.canThrowHelper(com.android.tools.r8.cf.code.CfInstruction,boolean):308:308 -> a
-    453:453:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):806 -> a
-    454:454:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):807:807 -> a
+    453:453:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):803 -> a
+    454:454:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):804:804 -> a
     455:455:boolean com.android.tools.r8.cf.code.CfInstruction.isStore():0:0 -> a
-    455:455:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):807 -> a
-    456:460:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):807:811 -> a
-    461:470:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):810:819 -> a
+    455:455:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):804 -> a
+    456:460:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):804:808 -> a
+    461:470:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):807:816 -> a
     471:482: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
-    471:482:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):814 -> a
-    483:484:boolean reportStackMapError(com.android.tools.r8.graph.CfCodeDiagnostics,com.android.tools.r8.graph.AppView):833:834 -> a
-    483:484:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):813 -> a
-    485:485:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):824:824 -> a
-    486:486:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):711:711 -> a
-    487:487:java.util.function.BiPredicate isAssignablePredicate(com.android.tools.r8.graph.AppView):915:915 -> a
-    488:488:boolean lambda$isAssignablePredicate$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):915:915 -> a
-    489:512:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):920:943 -> a
-    513:517:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):942:946 -> a
-    518:519:com.android.tools.r8.graph.DexType byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):951:952 -> a
-    1:1:java.util.Collection lambda$acceptCompareTo$2(com.android.tools.r8.graph.CfCode):267:267 -> b
-    2:4:void verifyFramesOrRemove(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):434:436 -> b
+    471:482:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):811 -> a
+    483:484:boolean reportStackMapError(com.android.tools.r8.graph.CfCodeDiagnostics,com.android.tools.r8.graph.AppView):830:831 -> a
+    483:484:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):810 -> a
+    485:485:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):821:821 -> a
+    486:486:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):708:708 -> a
+    487:487:java.util.function.BiPredicate isAssignablePredicate(com.android.tools.r8.graph.AppView):912:912 -> a
+    488:488:boolean lambda$isAssignablePredicate$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):912:912 -> a
+    489:512:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):917:940 -> a
+    513:517:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):939:943 -> a
+    518:519:com.android.tools.r8.graph.DexType byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):948:949 -> a
+    1:1:java.util.Collection lambda$acceptCompareTo$2(com.android.tools.r8.graph.CfCode):264:264 -> b
+    2:4:void verifyFramesOrRemove(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):431:433 -> b
     5:5:void setInstructions(java.util.List):201:201 -> b
-    5:5:void verifyFramesOrRemove(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):437 -> b
-    6:8: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):450:452 -> b
-    9: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):451:451 -> b
-    10:12: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):476:476 -> b
-    10:12: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):461 -> b
-    22:24: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):486:488 -> b
-    22:24: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):461 -> b
-    25: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):487:487 -> b
-    25: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):461 -> b
-    1:1:java.util.Collection lambda$acceptCompareTo$3(com.android.tools.r8.graph.CfCode):268:268 -> c
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():168:168 -> f
+    5:5:void verifyFramesOrRemove(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):434 -> b
+    6:8: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:449 -> b
+    9: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):448:448 -> b
+    10:12: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
+    10:12: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):458 -> b
+    22:24: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):483:485 -> b
+    22:24: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):458 -> b
+    25: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):484:484 -> b
+    25: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):458 -> b
+    1:1:java.util.Collection lambda$acceptCompareTo$3(com.android.tools.r8.graph.CfCode):265:265 -> c
+    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():168:168 -> e
     1:1:boolean estimatedSizeForInliningAtMost(int):215:215 -> g
-    2:2:boolean computeEquals(java.lang.Object):391:391 -> g
+    2:2:boolean computeEquals(java.lang.Object):388:388 -> g
     1:2:int countNonStackOperations(int):225:226 -> h
     1:1:void setMaxLocals(int):189:189 -> i
     com.android.tools.r8.utils.structural.StructuralItem self() -> k
-    1:1:int computeHashCode():386:386 -> t
-    1:1:java.lang.String toString():633:633 -> toString
+    1:1:int computeHashCode():383:383 -> t
+    1:1:java.lang.String toString():630:630 -> 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():633 -> toString
-    3:3:java.lang.String toString():633:633 -> toString
+    2:2:java.lang.String toString():630 -> toString
+    3:3:java.lang.String toString():630:630 -> toString
     com.android.tools.r8.graph.CfCode asCfCode() -> u
     1:1:int estimatedSizeForInlining():210:210 -> x
     1:1:int estimatedDexCodeSizeUpperBoundInBytes():220 -> x
@@ -16932,7 +16982,7 @@
     com.android.tools.r8.graph.CfCode$StackMapStatus NOT_VERIFIED -> a
     1:3:void <clinit>():70:72 -> <clinit>
     1:1:void <init>(java.lang.String,int):69:69 -> <init>
-com.android.tools.r8.graph.CfCodeDiagnostics -> com.android.tools.r8.internal.R3:
+com.android.tools.r8.graph.CfCodeDiagnostics -> com.android.tools.r8.internal.E3:
     com.android.tools.r8.origin.Origin origin -> a
     com.android.tools.r8.position.MethodPosition methodPosition -> b
     java.lang.String diagnosticMessage -> c
@@ -16940,11 +16990,11 @@
     1:1:java.lang.String getDiagnosticMessage():26:26 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():16:16 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():21:21 -> getPosition
-com.android.tools.r8.graph.CfCodeStackMapValidatingException -> com.android.tools.r8.internal.T3:
+com.android.tools.r8.graph.CfCodeStackMapValidatingException -> com.android.tools.r8.internal.G3:
     int $r8$clinit -> a
     1:1:void <init>(java.lang.String):13:13 -> <init>
     1:1:com.android.tools.r8.graph.CfCodeStackMapValidatingException error(java.lang.String):17:17 -> a
-com.android.tools.r8.graph.CfCompareHelper -> com.android.tools.r8.internal.V3:
+com.android.tools.r8.graph.CfCompareHelper -> com.android.tools.r8.internal.I3:
     boolean $assertionsDisabled -> j
     int LABEL_COMPARE_ID -> h
     int POSITION_COMPARE_ID -> i
@@ -16972,7 +17022,8 @@
     9:9:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap access$100(com.android.tools.r8.graph.CfCode):18 -> a
     10:27:com.android.tools.r8.utils.structural.StructuralAcceptor labelAcceptor():80:97 -> a
     1:1:com.android.tools.r8.graph.CfCode access$200(com.android.tools.r8.graph.CfCompareHelper):18:18 -> b
-com.android.tools.r8.graph.CfCompareHelper$1 -> com.android.tools.r8.internal.U3:
+com.android.tools.r8.graph.CfCompareHelper$1 -> com.android.tools.r8.internal.H3:
+    com.android.tools.r8.graph.CfCompareHelper this$0 -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap labels1 -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap labels2 -> b
     1:3:void <init>(com.android.tools.r8.graph.CfCompareHelper):82:84 -> <init>
@@ -17043,7 +17094,7 @@
     1:1:void unsetSuper():190:190 -> Y
     1:16:boolean areValid(com.android.tools.r8.cf.CfVersion,boolean):110:125 -> a
     1:8:java.util.List getNames():31:38 -> c
-    1:8:java.util.List getPredicates():43:50 -> e
+    1:8:java.util.List getPredicates():43:50 -> f
     1:1:com.android.tools.r8.graph.ClassAccessFlags fromCfAccessFlags(int):72:72 -> j
     2:2:void <init>(int):54:54 -> j
     2:2:com.android.tools.r8.graph.ClassAccessFlags fromCfAccessFlags(int):72 -> j
@@ -17053,7 +17104,7 @@
     2:2:com.android.tools.r8.graph.ClassAccessFlags fromDexAccessFlags(int):68 -> k
     1:3:com.android.tools.r8.graph.ClassAccessFlags fromSharedAccessFlags(int):62:64 -> l
     com.android.tools.r8.graph.AccessFlags self() -> w
-com.android.tools.r8.graph.ClassHierarchyTraversal -> com.android.tools.r8.internal.T5:
+com.android.tools.r8.graph.ClassHierarchyTraversal -> com.android.tools.r8.internal.F5:
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set visited -> d
     com.android.tools.r8.graph.ClassHierarchyTraversal$Scope scope -> c
@@ -17066,10 +17117,12 @@
     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.S5:
+com.android.tools.r8.graph.ClassHierarchyTraversal$Scope -> com.android.tools.r8.internal.E5:
     com.android.tools.r8.graph.ClassHierarchyTraversal$Scope ALL_CLASSES -> a
-    com.android.tools.r8.graph.ClassHierarchyTraversal$Scope ONLY_PROGRAM_CLASSES -> b
-    com.android.tools.r8.graph.ClassHierarchyTraversal$Scope[] $VALUES -> c
+    com.android.tools.r8.graph.ClassHierarchyTraversal$Scope ONLY_LIBRARY_CLASSES -> b
+    com.android.tools.r8.graph.ClassHierarchyTraversal$Scope ONLY_LIBRARY_AND_CLASSPATH_CLASSES -> c
+    com.android.tools.r8.graph.ClassHierarchyTraversal$Scope ONLY_PROGRAM_CLASSES -> d
+    com.android.tools.r8.graph.ClassHierarchyTraversal$Scope[] $VALUES -> e
     1:4:void <clinit>():19:22 -> <clinit>
     5:5:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(java.lang.String,int):18:18 -> <init>
@@ -17087,20 +17140,18 @@
     1:1:com.android.tools.r8.graph.DexLibraryClass lambda$static$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,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.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier):80:80 -> c
 com.android.tools.r8.graph.ClassKind$Factory -> com.android.tools.r8.graph.l$a:
     com.android.tools.r8.graph.DexClass create(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,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.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier) -> a
-com.android.tools.r8.graph.ClasspathField -> com.android.tools.r8.graph.m:
-    1:1:void <init>(com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.graph.DexEncodedField):10:10 -> <init>
-com.android.tools.r8.graph.ClasspathMethod -> com.android.tools.r8.graph.n:
+com.android.tools.r8.graph.ClasspathMethod -> com.android.tools.r8.graph.m:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.graph.DexEncodedMethod):12:12 -> <init>
-    1:2:com.android.tools.r8.graph.DexClasspathClass getHolder():42:43 -> n
+    1:2:com.android.tools.r8.graph.DexClasspathClass getHolder():37:38 -> n
     1:2:com.android.tools.r8.graph.DexClass getHolder():9 -> n
     3:3:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> n
-    3:3:com.android.tools.r8.graph.DexClasspathClass getHolder():43 -> n
+    3:3:com.android.tools.r8.graph.DexClasspathClass getHolder():38 -> n
     3:3:com.android.tools.r8.graph.DexClass getHolder():9 -> n
-    4:5:com.android.tools.r8.graph.DexClasspathClass getHolder():43:44 -> n
+    4:5:com.android.tools.r8.graph.DexClasspathClass getHolder():38:39 -> n
     4:5:com.android.tools.r8.graph.DexClass getHolder():9 -> n
-com.android.tools.r8.graph.Code -> com.android.tools.r8.graph.o:
+com.android.tools.r8.graph.Code -> com.android.tools.r8.graph.n:
     1:1:void <init>():17:17 -> <init>
     boolean isDexCode() -> A
     boolean isEmptyVoidMethod() -> B
@@ -17121,7 +17172,7 @@
     int estimatedDexCodeSizeUpperBoundInBytes() -> x
     int estimatedSizeForInlining() -> y
     boolean isCfCode() -> z
-com.android.tools.r8.graph.DebugLocalInfo -> com.android.tools.r8.internal.T8:
+com.android.tools.r8.graph.DebugLocalInfo -> com.android.tools.r8.internal.s8:
     com.android.tools.r8.graph.DexString name -> b
     com.android.tools.r8.graph.DexString signature -> d
     com.android.tools.r8.graph.DexType type -> c
@@ -17136,98 +17187,98 @@
     2:6:boolean localsInfoMapsEqual(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):60:64 -> b
     1:1:com.android.tools.r8.graph.DexString lambda$specify$2(com.android.tools.r8.graph.DebugLocalInfo):33:33 -> c
     2:7:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap startingLocals(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):88:93 -> c
+    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():49:49 -> e
     1:5:boolean equals(java.lang.Object):104:108 -> equals
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():49:49 -> f
     1:3:int hashCode():113:115 -> hashCode
     com.android.tools.r8.utils.structural.StructuralItem self() -> k
     1:1:java.lang.String toString():122:122 -> toString
-com.android.tools.r8.graph.DebugLocalInfo$PrintLevel -> com.android.tools.r8.internal.T8$a:
-    com.android.tools.r8.graph.DebugLocalInfo$PrintLevel[] $VALUES -> c
-    com.android.tools.r8.graph.DebugLocalInfo$PrintLevel FULL -> b
-    com.android.tools.r8.graph.DebugLocalInfo$PrintLevel NAME -> a
+com.android.tools.r8.graph.DebugLocalInfo$PrintLevel -> com.android.tools.r8.internal.s8$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
+    com.android.tools.r8.graph.DebugLocalInfo$PrintLevel FULL -> c
     1:3:void <clinit>():19:21 -> <clinit>
     4:4:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(java.lang.String,int):18:18 -> <init>
-com.android.tools.r8.graph.DefaultInitClassLens -> com.android.tools.r8.internal.e9:
+com.android.tools.r8.graph.DefaultInitClassLens -> com.android.tools.r8.internal.C8:
     com.android.tools.r8.graph.DefaultInitClassLens INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():13:13 -> <init>
     com.android.tools.r8.graph.InitClassLens rewrittenWithLens(com.android.tools.r8.graph.GraphLens) -> a
     1:1:com.android.tools.r8.graph.DexField getInitClassField(com.android.tools.r8.graph.DexType):21:21 -> a
     1:1:com.android.tools.r8.graph.DefaultInitClassLens getInstance():16:16 -> c
-com.android.tools.r8.graph.DexAnnotation -> com.android.tools.r8.graph.p:
+com.android.tools.r8.graph.DexAnnotation -> com.android.tools.r8.graph.o:
     com.android.tools.r8.graph.DexEncodedAnnotation annotation -> d
     com.android.tools.r8.graph.DexAnnotation[] EMPTY_ARRAY -> a
     boolean $assertionsDisabled -> b
     int visibility -> c
-    1:2:void <clinit>():31:32 -> <clinit>
-    1:3:void <init>(int,com.android.tools.r8.graph.DexEncodedAnnotation):43:45 -> <init>
-    1:1:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):40:40 -> a
-    2:2:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):90:90 -> a
-    3:15:boolean retainCompileTimeAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):94:106 -> a
+    1:2:void <clinit>():29:30 -> <clinit>
+    1:3:void <init>(int,com.android.tools.r8.graph.DexEncodedAnnotation):41:43 -> <init>
+    1:1:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):38:38 -> a
+    2:2:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):88:88 -> a
+    3:15:boolean retainCompileTimeAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):92:104 -> a
     16:16:boolean com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):264:264 -> a
-    16:16:boolean retainCompileTimeAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):106 -> a
-    17:17:com.android.tools.r8.graph.DexAnnotation createEnclosingClassAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):114:114 -> a
-    18:22:com.android.tools.r8.graph.DexType getEnclosingClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):120:124 -> a
-    23:23:com.android.tools.r8.graph.DexAnnotation createEnclosingMethodAnnotation(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):129:129 -> a
-    24:28:com.android.tools.r8.graph.DexAnnotation createMemberClassesAnnotation(java.util.List,com.android.tools.r8.graph.DexItemFactory):196:200 -> a
-    29:33:com.android.tools.r8.graph.DexAnnotation createAnnotationDefaultAnnotation(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):244:244 -> a
-    34:34:com.android.tools.r8.graph.DexAnnotation createSignatureAnnotation(java.lang.String,com.android.tools.r8.graph.DexItemFactory):252:252 -> a
-    35:62:com.android.tools.r8.graph.DexValue compressSignature(java.lang.String,com.android.tools.r8.graph.DexItemFactory):328:355 -> a
-    35:62:com.android.tools.r8.graph.DexAnnotation createSignatureAnnotation(java.lang.String,com.android.tools.r8.graph.DexItemFactory):253 -> a
-    63:63:com.android.tools.r8.graph.DexValue toDexValue(java.lang.String,com.android.tools.r8.graph.DexItemFactory):363:363 -> a
-    63:63:com.android.tools.r8.graph.DexValue compressSignature(java.lang.String,com.android.tools.r8.graph.DexItemFactory):355 -> a
-    63:63:com.android.tools.r8.graph.DexAnnotation createSignatureAnnotation(java.lang.String,com.android.tools.r8.graph.DexItemFactory):253 -> a
-    64:68:com.android.tools.r8.graph.DexValue compressSignature(java.lang.String,com.android.tools.r8.graph.DexItemFactory):355:359 -> a
-    64:68:com.android.tools.r8.graph.DexAnnotation createSignatureAnnotation(java.lang.String,com.android.tools.r8.graph.DexItemFactory):253 -> a
-    69:69:com.android.tools.r8.graph.DexAnnotation createSignatureAnnotation(java.lang.String,com.android.tools.r8.graph.DexItemFactory):252:252 -> a
-    70:75:java.lang.String getSignature(com.android.tools.r8.graph.DexAnnotation):257:262 -> a
-    76:76:com.android.tools.r8.graph.DexAnnotation createThrowsAnnotation(com.android.tools.r8.graph.DexValue[],com.android.tools.r8.graph.DexItemFactory):272:272 -> a
-    77:79:com.android.tools.r8.graph.DexAnnotation createSystemValueAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexValue):278:280 -> a
-    80:84:com.android.tools.r8.graph.DexValue getSystemValueAnnotationValue(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotation):285:289 -> a
-    85:103:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):369:387 -> a
-    104:104:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):385:385 -> a
+    16:16:boolean retainCompileTimeAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):104 -> a
+    17:17:com.android.tools.r8.graph.DexAnnotation createEnclosingClassAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):112:112 -> a
+    18:22:com.android.tools.r8.graph.DexType getEnclosingClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):118:122 -> a
+    23:23:com.android.tools.r8.graph.DexAnnotation createEnclosingMethodAnnotation(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):127:127 -> a
+    24:28:com.android.tools.r8.graph.DexAnnotation createMemberClassesAnnotation(java.util.List,com.android.tools.r8.graph.DexItemFactory):194:198 -> a
+    29:33:com.android.tools.r8.graph.DexAnnotation createAnnotationDefaultAnnotation(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):242:242 -> a
+    34:34:com.android.tools.r8.graph.DexAnnotation createSignatureAnnotation(java.lang.String,com.android.tools.r8.graph.DexItemFactory):250:250 -> a
+    35:62:com.android.tools.r8.graph.DexValue compressSignature(java.lang.String,com.android.tools.r8.graph.DexItemFactory):326:353 -> a
+    35:62:com.android.tools.r8.graph.DexAnnotation createSignatureAnnotation(java.lang.String,com.android.tools.r8.graph.DexItemFactory):251 -> a
+    63:63:com.android.tools.r8.graph.DexValue toDexValue(java.lang.String,com.android.tools.r8.graph.DexItemFactory):361:361 -> a
+    63:63:com.android.tools.r8.graph.DexValue compressSignature(java.lang.String,com.android.tools.r8.graph.DexItemFactory):353 -> a
+    63:63:com.android.tools.r8.graph.DexAnnotation createSignatureAnnotation(java.lang.String,com.android.tools.r8.graph.DexItemFactory):251 -> a
+    64:68:com.android.tools.r8.graph.DexValue compressSignature(java.lang.String,com.android.tools.r8.graph.DexItemFactory):353:357 -> a
+    64:68:com.android.tools.r8.graph.DexAnnotation createSignatureAnnotation(java.lang.String,com.android.tools.r8.graph.DexItemFactory):251 -> a
+    69:69:com.android.tools.r8.graph.DexAnnotation createSignatureAnnotation(java.lang.String,com.android.tools.r8.graph.DexItemFactory):250:250 -> a
+    70:75:java.lang.String getSignature(com.android.tools.r8.graph.DexAnnotation):255:260 -> a
+    76:76:com.android.tools.r8.graph.DexAnnotation createThrowsAnnotation(com.android.tools.r8.graph.DexValue[],com.android.tools.r8.graph.DexItemFactory):270:270 -> a
+    77:79:com.android.tools.r8.graph.DexAnnotation createSystemValueAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexValue):276:278 -> a
+    80:84:com.android.tools.r8.graph.DexValue getSystemValueAnnotationValue(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotation):283:287 -> a
+    85:103:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):367:385 -> a
+    104:104:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):383:383 -> a
     105:105:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    105:105:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):385 -> a
-    106:106:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):385:385 -> a
-    107:107:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):380:380 -> a
+    105:105:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):383 -> a
+    106:106:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):383:383 -> a
+    107:107:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):378:378 -> a
     108:108:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    108:108:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):380 -> a
-    109:109:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):380:380 -> a
-    110:110:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):376:376 -> a
+    108:108:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):378 -> a
+    109:109:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):378:378 -> a
+    110:110:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):374:374 -> a
     111:111:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    111:111:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):376 -> a
-    112:112:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):376:376 -> a
-    113:113:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):372:372 -> a
+    111:111:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):374 -> a
+    112:112:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):374:374 -> a
+    113:113:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):370:370 -> a
     114:114:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    114:114:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):372 -> a
-    115:134:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):372:391 -> a
-    135:138:java.lang.String getInvalidSynthesizedClassMapMessage(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):397:400 -> a
-    139:159:com.android.tools.r8.utils.Pair getSynthesizedClassAnnotationContextType(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):425:445 -> a
-    160:172:com.android.tools.r8.utils.Pair getSynthesizedClassAnnotationContextType(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):444:456 -> a
-    173:179:com.android.tools.r8.graph.DexAnnotation createAnnotationSynthesizedClassMap(java.util.TreeSet,com.android.tools.r8.graph.DexItemFactory):462:468 -> a
-    180:187:com.android.tools.r8.graph.DexAnnotation rewrite(java.util.function.Function):480:487 -> a
-    1:1:com.android.tools.r8.graph.DexEncodedAnnotation lambda$specify$0(com.android.tools.r8.graph.DexAnnotation):40:40 -> b
-    2:6:com.android.tools.r8.graph.DexMethod getEnclosingMethodFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):135:139 -> b
-    1:1:int lambda$specify$1(com.android.tools.r8.graph.DexAnnotation):40:40 -> c
-    2:4:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):178:180 -> c
+    114:114:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):370 -> a
+    115:134:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):370:389 -> a
+    135:138:java.lang.String getInvalidSynthesizedClassMapMessage(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):395:398 -> a
+    139:156:com.android.tools.r8.graph.DexType getSynthesizedClassAnnotationContextType(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):418:435 -> a
+    157:163:com.android.tools.r8.graph.DexAnnotation createAnnotationSynthesizedClassMap(java.util.TreeSet,com.android.tools.r8.graph.DexItemFactory):441:447 -> a
+    164:171:com.android.tools.r8.graph.DexAnnotation rewrite(java.util.function.Function):459:466 -> a
+    1:1:com.android.tools.r8.graph.DexEncodedAnnotation lambda$specify$0(com.android.tools.r8.graph.DexAnnotation):38:38 -> b
+    2:6:com.android.tools.r8.graph.DexMethod getEnclosingMethodFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):133:137 -> b
+    1:1:int lambda$specify$1(com.android.tools.r8.graph.DexAnnotation):38:38 -> c
+    2:4:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):176:178 -> c
     5:5:void com.android.tools.r8.utils.Pair.<init>():20:20 -> c
-    5:5:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):180 -> c
-    6:13:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):181:188 -> c
-    1:8:java.util.List getMemberClassesFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):206:213 -> d
-    1:1:boolean isEnclosingClassAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):144:144 -> e
-    1:3:boolean equals(java.lang.Object):72:74 -> equals
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():55:55 -> f
-    2:2:boolean isEnclosingMethodAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):149:149 -> f
-    1:1:boolean isInnerClassAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):153:153 -> g
-    2:2:com.android.tools.r8.graph.DexValue$DexValueType[] lambda$createAnnotationSynthesizedClassMap$2(int):464:464 -> g
-    1:1:boolean isMemberClassesAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):158:158 -> h
-    1:1:int hashCode():64:64 -> hashCode
-    1:1:boolean isSignatureAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):299:299 -> i
+    5:5:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):178 -> c
+    6:13:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):179:186 -> c
+    1:8:java.util.List getMemberClassesFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):204:211 -> d
+    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():53:53 -> e
+    2:2:boolean isEnclosingClassAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):142:142 -> e
+    1:3:boolean equals(java.lang.Object):70:72 -> equals
+    1:1:boolean isEnclosingMethodAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):147:147 -> f
+    1:1:boolean isInnerClassAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):151:151 -> g
+    2:2:com.android.tools.r8.graph.DexValue$DexValueType[] lambda$createAnnotationSynthesizedClassMap$2(int):443:443 -> g
+    1:1:boolean isMemberClassesAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):156:156 -> h
+    1:1:int hashCode():62:62 -> hashCode
+    1:1:boolean isSignatureAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):297:297 -> i
     com.android.tools.r8.utils.structural.StructuralItem self() -> k
-    1:1:com.android.tools.r8.graph.DexType getAnnotationType():59:59 -> t
-    1:1:java.lang.String toString():81:81 -> toString
-com.android.tools.r8.graph.DexAnnotationDirectory -> com.android.tools.r8.graph.q:
+    1:1:com.android.tools.r8.graph.DexType getAnnotationType():57:57 -> t
+    1:1:java.lang.String toString():79:79 -> toString
+com.android.tools.r8.graph.DexAnnotationDirectory -> com.android.tools.r8.graph.p:
     java.util.List methodAnnotations -> b
     java.util.List fieldAnnotations -> d
     com.android.tools.r8.graph.DexProgramClass clazz -> a
@@ -17239,7 +17290,7 @@
     7:7:int com.android.tools.r8.graph.DexMethod.acceptCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.structural.CompareToVisitor):50:50 -> a
     7:7:int lambda$sortMethodAnnotations$1(com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):49 -> a
     8:8:int lambda$sortFieldAnnotations$3(com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):59:59 -> a
-    9:9:int com.android.tools.r8.graph.DexField.acceptCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.structural.CompareToVisitor):155:155 -> a
+    9:9:int com.android.tools.r8.graph.DexField.acceptCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.structural.CompareToVisitor):143:143 -> a
     9:9:int lambda$sortFieldAnnotations$3(com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):59 -> a
     10:11:java.util.List sortFieldAnnotations(com.android.tools.r8.utils.structural.CompareToVisitor):59:60 -> a
     12:12:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):95:95 -> a
@@ -17251,7 +17302,7 @@
     1:11:boolean equals(java.lang.Object):72:82 -> equals
     1:4:int hashCode():87:90 -> hashCode
     1:1:com.android.tools.r8.graph.DexAnnotationSet getClazzAnnotations():45:45 -> t
-com.android.tools.r8.graph.DexAnnotationElement -> com.android.tools.r8.graph.r:
+com.android.tools.r8.graph.DexAnnotationElement -> com.android.tools.r8.graph.q:
     com.android.tools.r8.graph.DexString name -> c
     boolean $assertionsDisabled -> b
     com.android.tools.r8.graph.DexAnnotationElement[] EMPTY_ARRAY -> a
@@ -17262,13 +17313,13 @@
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):19:19 -> a
     3:3:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):71:71 -> a
     1:1:com.android.tools.r8.graph.DexValue lambda$specify$1(com.android.tools.r8.graph.DexAnnotationElement):19:19 -> b
+    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():34:34 -> e
     1:3:boolean equals(java.lang.Object):51:53 -> equals
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():34:34 -> f
     1:1:int hashCode():43:43 -> hashCode
     com.android.tools.r8.utils.structural.StructuralItem self() -> k
     1:1:com.android.tools.r8.graph.DexValue getValue():38:38 -> t
     1:1:java.lang.String toString():60:60 -> toString
-com.android.tools.r8.graph.DexAnnotationSet -> com.android.tools.r8.graph.s:
+com.android.tools.r8.graph.DexAnnotationSet -> com.android.tools.r8.graph.r:
     com.android.tools.r8.graph.DexAnnotationSet THE_EMPTY_ANNOTATIONS_SET -> d
     boolean $assertionsDisabled -> e
     int sorted -> g
@@ -17281,7 +17332,7 @@
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):37:37 -> a
     3:6:com.android.tools.r8.graph.DexType findDuplicateEntryType(java.util.List):59:62 -> a
     7:7:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):101:101 -> a
-    8:8:void com.android.tools.r8.graph.DexAnnotation.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):85:85 -> a
+    8:8:void com.android.tools.r8.graph.DexAnnotation.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):83:83 -> a
     8:8:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):102 -> a
     9:10:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):108:109 -> a
     11:12:void sort(com.android.tools.r8.naming.NamingLens):117:118 -> a
@@ -17295,7 +17346,7 @@
     42:42:com.android.tools.r8.graph.DexAnnotationSet removeIf(java.util.function.Predicate):185:185 -> a
     43:53:com.android.tools.r8.graph.DexAnnotationSet rewrite(java.util.function.Function):189:199 -> a
     1:8:com.android.tools.r8.graph.DexAnnotationSet getWithout(com.android.tools.r8.graph.DexType):141:148 -> b
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():51:51 -> f
+    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():51:51 -> e
     1:2:void forEach(java.util.function.Consumer):73:74 -> forEach
     1:3:boolean computeEquals(java.lang.Object):93:95 -> g
     1:1:boolean isEmpty():113:113 -> isEmpty
@@ -17304,7 +17355,7 @@
     1:1:int computeHashCode():88:88 -> t
     1:1:java.lang.String toString():204:204 -> toString
     1:1:com.android.tools.r8.graph.DexAnnotationSet empty():69:69 -> u
-com.android.tools.r8.graph.DexApplication -> com.android.tools.r8.graph.t:
+com.android.tools.r8.graph.DexApplication -> com.android.tools.r8.graph.s:
     com.android.tools.r8.naming.ClassNameMapper proguardMap -> c
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> f
     com.android.tools.r8.utils.Timing timing -> d
@@ -17312,30 +17363,30 @@
     com.android.tools.r8.utils.InternalOptions options -> e
     boolean $assertionsDisabled -> a
     com.android.tools.r8.com.google.common.collect.ImmutableList dataResourceProviders -> b
-    1:1:void <clinit>():24:24 -> <clinit>
-    1:7:void <init>(com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.Timing):44:50 -> <init>
+    1:1:void <clinit>():23:23 -> <clinit>
+    1:7:void <init>(com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.Timing):43:49 -> <init>
     com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType) -> a
-    1:1:com.android.tools.r8.graph.DexDefinitionSupplier getDefinitionsSupplier(com.android.tools.r8.synthesis.SyntheticDefinitionsProvider):58:58 -> a
-    2:2:java.util.List classesWithDeterministicOrder(java.util.List):117:117 -> a
-    3:4:com.android.tools.r8.graph.LazyLoadedDexApplication$Builder builder(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):226:227 -> a
-    5:5:com.android.tools.r8.graph.LazyLoadedDexApplication$Builder builder(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):232:232 -> a
-    5:5:com.android.tools.r8.graph.LazyLoadedDexApplication$Builder builder(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):226 -> a
-    6:6:com.android.tools.r8.graph.LazyLoadedDexApplication$Builder builder(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):232:232 -> a
-    7:7:com.android.tools.r8.graph.DirectMappedDexApplication asDirect():236:236 -> a
+    1:1:com.android.tools.r8.graph.DexDefinitionSupplier getDefinitionsSupplier(com.android.tools.r8.synthesis.SyntheticDefinitionsProvider):57:57 -> a
+    2:2:int lambda$classesWithDeterministicOrder$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):112:112 -> a
+    3:4:com.android.tools.r8.graph.LazyLoadedDexApplication$Builder builder(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):215:216 -> a
+    5:5:com.android.tools.r8.graph.LazyLoadedDexApplication$Builder builder(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):221:221 -> a
+    5:5:com.android.tools.r8.graph.LazyLoadedDexApplication$Builder builder(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):215 -> a
+    6:6:com.android.tools.r8.graph.LazyLoadedDexApplication$Builder builder(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):221:221 -> a
+    7:7:com.android.tools.r8.graph.DirectMappedDexApplication asDirect():225:225 -> a
     com.android.tools.r8.graph.DexApplication$Builder builder() -> b
     com.android.tools.r8.graph.DexProgramClass programDefinitionFor(com.android.tools.r8.graph.DexType) -> b
-    1:3:java.util.List classes():102:104 -> c
-    1:1:java.util.List classesWithDeterministicOrder():108:108 -> d
-    1:1:com.android.tools.r8.naming.ClassNameMapper getProguardMap():129:129 -> e
+    1:3:java.util.List classes():101:103 -> c
+    1:6:java.util.List classesWithDeterministicOrder():107:112 -> d
+    1:1:com.android.tools.r8.naming.ClassNameMapper getProguardMap():125:125 -> e
     java.util.List programClasses() -> f
     com.android.tools.r8.graph.DirectMappedDexApplication toDirect() -> g
-com.android.tools.r8.graph.DexApplication$1 -> com.android.tools.r8.graph.t$a:
+com.android.tools.r8.graph.DexApplication$1 -> com.android.tools.r8.graph.s$a:
     com.android.tools.r8.graph.DexApplication val$self -> b
     com.android.tools.r8.synthesis.SyntheticDefinitionsProvider val$syntheticDefinitionsProvider -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.synthesis.SyntheticDefinitionsProvider,com.android.tools.r8.graph.DexApplication):58:58 -> <init>
-    1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():66:66 -> a
-    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):61:61 -> c
-com.android.tools.r8.graph.DexApplication$Builder -> com.android.tools.r8.graph.t$b:
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.synthesis.SyntheticDefinitionsProvider,com.android.tools.r8.graph.DexApplication):57:57 -> <init>
+    1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():65:65 -> a
+    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):60:60 -> c
+com.android.tools.r8.graph.DexApplication$Builder -> com.android.tools.r8.graph.s$b:
     java.util.List programClasses -> b
     com.android.tools.r8.utils.Timing timing -> f
     java.util.List dataResourceProviders -> c
@@ -17344,63 +17395,61 @@
     com.android.tools.r8.utils.InternalOptions options -> d
     boolean $assertionsDisabled -> a
     java.util.Collection synthesizedClasses -> h
-    1:1:void <clinit>():132:132 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):146:146 -> <init>
-    2:18:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):134:150 -> <init>
-    19:19:void <init>(com.android.tools.r8.graph.DexApplication):155:155 -> <init>
-    20:49:void <init>(com.android.tools.r8.graph.DexApplication):134:163 -> <init>
-    com.android.tools.r8.graph.DirectMappedDexApplication$Builder asDirect() -> a
-    1:3:com.android.tools.r8.graph.DexApplication$Builder setProguardMap(com.android.tools.r8.naming.ClassNameMapper):175:177 -> a
-    4:5:com.android.tools.r8.graph.DexApplication$Builder addDataResourceProvider(com.android.tools.r8.DataResourceProvider):188:189 -> a
-    6:7:com.android.tools.r8.graph.DexApplication$Builder setHighestSortingString(com.android.tools.r8.graph.DexString):193:194 -> a
-    8:9:com.android.tools.r8.graph.DexApplication$Builder addProgramClass(com.android.tools.r8.graph.DexProgramClass):198:199 -> a
-    10:11:com.android.tools.r8.graph.DexApplication$Builder addProgramClasses(java.util.Collection):203:204 -> a
-    com.android.tools.r8.graph.DexApplication build() -> b
-    1:4:com.android.tools.r8.graph.DexApplication$Builder replaceProgramClasses(java.util.Collection):181:184 -> b
-    5:8:com.android.tools.r8.graph.DexApplication$Builder addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):208:211 -> b
-    1:1:java.util.List getProgramClasses():215:215 -> c
-    1:1:java.util.Collection getSynthesizedClasses():219:219 -> d
-    com.android.tools.r8.graph.DexApplication$Builder self() -> e
-com.android.tools.r8.graph.DexApplication$ReorderBox -> com.android.tools.r8.graph.t$c:
+    1:1:void <clinit>():128:128 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):148:148 -> <init>
+    2:18:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):136:152 -> <init>
+    19:19:void <init>(com.android.tools.r8.graph.DexApplication):157:157 -> <init>
+    20:49:void <init>(com.android.tools.r8.graph.DexApplication):136:165 -> <init>
+    com.android.tools.r8.graph.DexApplication build() -> a
+    1:3:com.android.tools.r8.graph.DexApplication$Builder setProguardMap(com.android.tools.r8.naming.ClassNameMapper):169:171 -> a
+    4:7:com.android.tools.r8.graph.DexApplication$Builder replaceProgramClasses(java.util.List):175:178 -> a
+    8:9:com.android.tools.r8.graph.DexApplication$Builder addDataResourceProvider(com.android.tools.r8.DataResourceProvider):182:183 -> a
+    10:11:com.android.tools.r8.graph.DexApplication$Builder setHighestSortingString(com.android.tools.r8.graph.DexString):187:188 -> a
+    12:13:com.android.tools.r8.graph.DexApplication$Builder addProgramClass(com.android.tools.r8.graph.DexProgramClass):192:193 -> a
+    1:4:com.android.tools.r8.graph.DexApplication$Builder addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):197:200 -> b
+    5:5:java.util.Collection getProgramClasses():204:204 -> b
+    1:1:java.util.Collection getSynthesizedClasses():208:208 -> c
+    com.android.tools.r8.graph.DexApplication$Builder self() -> d
+com.android.tools.r8.graph.DexApplication$ReorderBox -> com.android.tools.r8.graph.s$c:
     java.util.List classes -> a
-    1:2:void <init>(java.util.List):81:82 -> <init>
-    1:1:java.util.List getClasses():95:95 -> a
-    1:3:boolean reorderClasses():87:89 -> b
-com.android.tools.r8.graph.DexByteCodeWriter -> com.android.tools.r8.internal.Y9:
+    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.v9:
     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):27:29 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions):25:27 -> <init>
     java.lang.String getFileEnding() -> a
     java.io.PrintStream lambda$write$1(java.io.PrintStream,com.android.tools.r8.graph.DexClass) -> a
     void lambda$write$2(java.io.PrintStream) -> a
     void writeField(com.android.tools.r8.graph.DexEncodedField,java.io.PrintStream) -> a
     void writeMethod(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream) -> a
-    1:1:com.android.tools.r8.graph.DexByteCodeWriter$OutputStreamProvider oneFilePerClass(java.nio.file.Path):40:40 -> a
-    2:4:java.io.PrintStream lambda$oneFilePerClass$0(java.nio.file.Path,com.android.tools.r8.graph.DexClass):41:41 -> a
-    6:8:java.io.PrintStream lambda$oneFilePerClass$0(java.nio.file.Path,com.android.tools.r8.graph.DexClass):43:43 -> a
-    9:11:void com.android.tools.r8.graph.DexByteCodeWriter.ensureParentExists(java.nio.file.Path):33:35 -> a
-    9:11:java.io.PrintStream lambda$oneFilePerClass$0(java.nio.file.Path,com.android.tools.r8.graph.DexClass):45 -> a
-    12:12:java.io.PrintStream lambda$oneFilePerClass$0(java.nio.file.Path,com.android.tools.r8.graph.DexClass):46:46 -> a
-    13:20:void write(com.android.tools.r8.graph.DexByteCodeWriter$OutputStreamProvider,java.util.function.Consumer):72:79 -> a
-    21:22:boolean anyMethodMatches(com.android.tools.r8.graph.DexClass):86:87 -> a
-    23:30:void writeClass(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):91:98 -> a
-    31:31:void lambda$writeClass$3(java.io.PrintStream,com.android.tools.r8.graph.DexEncodedField):93:93 -> a
-    32:32:void lambda$writeClass$4(java.io.PrintStream,com.android.tools.r8.graph.ProgramMethod):96:96 -> a
+    1:1:com.android.tools.r8.graph.DexByteCodeWriter$OutputStreamProvider oneFilePerClass(java.nio.file.Path):38:38 -> a
+    2:4:java.io.PrintStream lambda$oneFilePerClass$0(java.nio.file.Path,com.android.tools.r8.graph.DexClass):39:39 -> a
+    6:8:java.io.PrintStream lambda$oneFilePerClass$0(java.nio.file.Path,com.android.tools.r8.graph.DexClass):41:41 -> a
+    9:11:void com.android.tools.r8.graph.DexByteCodeWriter.ensureParentExists(java.nio.file.Path):31:33 -> a
+    9:11:java.io.PrintStream lambda$oneFilePerClass$0(java.nio.file.Path,com.android.tools.r8.graph.DexClass):43 -> a
+    12:12:java.io.PrintStream lambda$oneFilePerClass$0(java.nio.file.Path,com.android.tools.r8.graph.DexClass):44:44 -> a
+    13:20:void write(com.android.tools.r8.graph.DexByteCodeWriter$OutputStreamProvider,java.util.function.Consumer):66:73 -> a
+    21:22:boolean anyMethodMatches(com.android.tools.r8.graph.DexClass):80:81 -> a
+    23:30:void writeClass(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):85:92 -> a
+    31:31:void lambda$writeClass$3(java.io.PrintStream,com.android.tools.r8.graph.DexEncodedField):87:87 -> a
+    32:32:void lambda$writeClass$4(java.io.PrintStream,com.android.tools.r8.graph.ProgramMethod):90:90 -> a
     void writeClassFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream) -> b
     void writeMethodsFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream) -> b
-    1:2:void write(java.nio.file.Path):51:52 -> b
-    3:5:void com.android.tools.r8.graph.DexByteCodeWriter.ensureParentExists(java.nio.file.Path):33:35 -> b
-    3:5:void write(java.nio.file.Path):54 -> b
-    6:9:void write(java.nio.file.Path):55:55 -> b
-    11:11:void write(java.nio.file.Path):57:57 -> b
-    12:17:void write(java.io.PrintStream):62:67 -> b
+    1:2:void write(java.nio.file.Path):49:50 -> b
+    3:5:void com.android.tools.r8.graph.DexByteCodeWriter.ensureParentExists(java.nio.file.Path):31:33 -> b
+    3:5:void write(java.nio.file.Path):52 -> b
+    6:9:void write(java.nio.file.Path):53:53 -> b
+    11:11:void write(java.nio.file.Path):55:55 -> b
+    12:12:void write(java.io.PrintStream):60:60 -> b
     void writeClassHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream) -> c
     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.Y9$a:
+com.android.tools.r8.graph.DexByteCodeWriter$OutputStreamProvider -> com.android.tools.r8.internal.v9$a:
     java.io.PrintStream get(com.android.tools.r8.graph.DexClass) -> a
-com.android.tools.r8.graph.DexCallSite -> com.android.tools.r8.graph.v:
+com.android.tools.r8.graph.DexCallSite -> com.android.tools.r8.graph.u:
     com.android.tools.r8.graph.DexString methodName -> e
     com.android.tools.r8.graph.DexMethod method -> j
     int instructionOffset -> k
@@ -17425,8 +17474,8 @@
     1:1:com.android.tools.r8.graph.DexString lambda$specify$2(com.android.tools.r8.graph.DexCallSite):52:52 -> c
     1:1:com.android.tools.r8.graph.DexProto lambda$specify$3(com.android.tools.r8.graph.DexCallSite):53:53 -> d
     1:1:com.android.tools.r8.graph.DexMethodHandle lambda$specify$4(com.android.tools.r8.graph.DexCallSite):54:54 -> e
+    2:2:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():112:112 -> e
     1:1:java.util.Collection lambda$specify$5(com.android.tools.r8.graph.DexCallSite):55:55 -> f
-    2:2:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():112:112 -> f
     boolean computeEquals(java.lang.Object) -> g
     com.android.tools.r8.utils.structural.StructuralItem self() -> k
     1:1:java.lang.String toSmaliString():179:179 -> r
@@ -17434,8 +17483,8 @@
     1:11:java.lang.String toString():142:152 -> toString
     1:14:com.android.tools.r8.graph.DexEncodedArray getEncodedArray():289:302 -> u
     1:1:java.lang.String getHash():183:183 -> v
-com.android.tools.r8.graph.DexCallSite$1 -> com.android.tools.r8.graph.u:
-com.android.tools.r8.graph.DexCallSite$HashBuilder -> com.android.tools.r8.graph.v$a:
+com.android.tools.r8.graph.DexCallSite$1 -> com.android.tools.r8.graph.t:
+com.android.tools.r8.graph.DexCallSite$HashBuilder -> com.android.tools.r8.graph.u$a:
     com.android.tools.r8.graph.DexCallSite this$0 -> d
     java.io.ByteArrayOutputStream bytes -> b
     boolean $assertionsDisabled -> a
@@ -17486,7 +17535,7 @@
     60:60:void write(java.util.List):239:239 -> a
     61:85:void write(java.util.List):236:260 -> a
     86:102:java.lang.String build():267:283 -> a
-com.android.tools.r8.graph.DexClass -> com.android.tools.r8.graph.w:
+com.android.tools.r8.graph.DexClass -> com.android.tools.r8.graph.v:
     com.android.tools.r8.graph.GenericSignature$ClassSignature classSignature -> r
     com.android.tools.r8.graph.ClassAccessFlags accessFlags -> f
     java.util.List nestMembers -> q
@@ -17508,254 +17557,231 @@
     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):49:120 -> <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):110:110 -> <init>
     boolean isDexClass() -> A
-    1:1:boolean isPublic():630:630 -> A0
-    1:1:java.lang.Iterable members():168:168 -> B0
-    2:2:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> B0
-    2:2:java.lang.Iterable members():168 -> B0
-    1:1:java.lang.Iterable methods():180:180 -> C0
-    1:5:java.util.List staticFields():293:297 -> D0
-    1:4:boolean verifyNoDuplicateFields():426:429 -> E0
+    1:4:boolean verifyNoDuplicateFields():417:420 -> A0
+    1:1:java.lang.Iterable virtualMethods():208:208 -> B0
     boolean isStaticMember() -> F
-    1:1:java.lang.Iterable virtualMethods():217:217 -> F0
-    1:3:java.lang.Iterable allImmediateSupertypes():757:759 -> G
-    4:7:java.lang.Iterable allImmediateSupertypes():758:761 -> G
-    1:1:java.util.List allMethodsSorted():252:252 -> H
+    1:3:java.lang.Iterable allImmediateSupertypes():739:741 -> G
+    4:7:java.lang.Iterable allImmediateSupertypes():740:743 -> G
+    1:1:java.util.List allMethodsSorted():243:243 -> H
     com.android.tools.r8.graph.DexClasspathClass asClasspathClass() -> I
     com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> J
-    1:1:void clearClassSignature():805:805 -> K
-    1:1:void clearEnclosingMethodAttribute():791:791 -> L
-    1:1:void clearInnerClasses():801:801 -> M
-    1:1:void clearInstanceFields():405:405 -> N
-    1:1:void clearNestHost():866:866 -> O
-    1:1:void clearNestMembers():870:870 -> P
-    1:2:boolean defaultValuesForStaticFieldsMayTriggerAllocation():769:770 -> Q
-    1:1:java.lang.Iterable directMethods():193:193 -> R
-    1:1:java.lang.Iterable fields():158:158 -> S
-    1:1:com.android.tools.r8.graph.ClassAccessFlags getAccessFlags():142:142 -> T
-    1:2:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():644:645 -> U
-    1:1:com.android.tools.r8.graph.GenericSignature$ClassSignature getClassSignature():834:834 -> V
-    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethodAttribute():783:783 -> W
-    1:2:com.android.tools.r8.graph.InnerClassAttribute getInnerClassAttributeForThisClass():813:814 -> X
-    1:1:java.util.List getInnerClasses():775:775 -> Y
-    1:1:com.android.tools.r8.graph.DexTypeList getInterfaces():146:146 -> Z
-    void accept(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer) -> a
+    1:1:void clearClassSignature():787:787 -> K
+    1:1:void clearEnclosingMethodAttribute():773:773 -> L
+    1:1:void clearInnerClasses():783:783 -> M
+    1:1:void clearInstanceFields():396:396 -> N
+    1:1:void clearNestHost():848:848 -> O
+    1:2:boolean defaultValuesForStaticFieldsMayTriggerAllocation():751:752 -> P
+    1:1:java.lang.Iterable directMethods():184:184 -> Q
+    1:1:java.lang.Iterable fields():153:153 -> R
+    1:1:com.android.tools.r8.graph.ClassAccessFlags getAccessFlags():137:137 -> S
+    1:2:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():626:627 -> T
+    1:1:com.android.tools.r8.graph.GenericSignature$ClassSignature getClassSignature():816:816 -> U
+    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethodAttribute():765:765 -> V
+    1:2:com.android.tools.r8.graph.InnerClassAttribute getInnerClassAttributeForThisClass():795:796 -> W
+    1:1:java.util.List getInnerClasses():757:757 -> X
+    1:1:com.android.tools.r8.graph.DexTypeList getInterfaces():141:141 -> Y
+    1:1:com.android.tools.r8.graph.MethodCollection getMethodCollection():167:167 -> Z
     boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set) -> a
     java.util.Iterator lambda$allImmediateSupertypes$2(java.util.Iterator) -> a
-    1:1:void forEachClassMethodMatching(java.util.function.Predicate,java.util.function.Consumer):136:136 -> a
-    2:2:void lambda$forEachClassMethodMatching$0(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):137:137 -> a
-    3:3:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):189:189 -> a
-    4:4:void addDirectMethods(java.util.Collection):201:201 -> a
-    5:5:void setDirectMethods(java.util.List):209:209 -> a
-    6:6:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):213:213 -> a
-    6:6:void setDirectMethods(java.util.List):209 -> a
-    7:7:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):213:213 -> a
-    8:8:void virtualizeMethods(java.util.Set):256:256 -> a
-    9:13:void forEachField(java.util.function.Consumer):275:279 -> a
-    14:19:void appendInstanceField(com.android.tools.r8.graph.DexEncodedField):363:368 -> a
-    20:22:void setInstanceField(int,com.android.tools.r8.graph.DexEncodedField):393:395 -> a
-    23:25:void setInstanceFields(com.android.tools.r8.graph.DexEncodedField[]):399:401 -> a
-    26:27:boolean verifyCorrectnessOfFieldHolders(java.lang.Iterable):419:420 -> a
-    28:28:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):441:441 -> a
-    28:28:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):468 -> a
-    29:29:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):436:436 -> a
-    29:29:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):469 -> a
-    30:30:com.android.tools.r8.graph.DexEncodedMember lookupMember(com.android.tools.r8.graph.DexMember):497:497 -> a
-    31:31:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):512:512 -> a
-    31:31:com.android.tools.r8.graph.DexEncodedMember lookupMember(com.android.tools.r8.graph.DexMember):497 -> a
-    32:32:com.android.tools.r8.graph.DexClassAndMethod lookupClassMethod(com.android.tools.r8.graph.DexMethod):503:503 -> a
-    33:33:com.android.tools.r8.graph.DexClassAndMethod toClassMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod):507:507 -> a
-    33:33:com.android.tools.r8.graph.DexClassAndMethod lookupClassMethod(com.android.tools.r8.graph.DexMethod):503 -> a
-    34:35:com.android.tools.r8.graph.DexEncodedMember lookupTarget(com.android.tools.r8.graph.DexEncodedMember[],com.android.tools.r8.graph.DexMember):554:555 -> a
-    36:36:boolean com.android.tools.r8.graph.DexField.match(com.android.tools.r8.graph.DexEncodedMember):21:21 -> a
-    36:36:com.android.tools.r8.graph.DexEncodedMember lookupTarget(com.android.tools.r8.graph.DexEncodedMember[],com.android.tools.r8.graph.DexMember):555 -> a
-    37:39:com.android.tools.r8.graph.DexEncodedMethod getInitializer(com.android.tools.r8.graph.DexType[]):670:672 -> a
-    40:40:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):730:730 -> a
-    41:41:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):729:729 -> a
-    42:42:boolean classInitializationMayHaveSideEffectsInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition):736:736 -> a
-    43:43:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):730:730 -> a
-    43:43:boolean classInitializationMayHaveSideEffectsInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition):736 -> a
-    44:44:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):729:729 -> a
-    44:44:boolean classInitializationMayHaveSideEffectsInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition):736 -> a
-    45:45:boolean lambda$classInitializationMayHaveSideEffectsInContext$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexType):737:737 -> a
-    46:46:boolean definesFinalizer(com.android.tools.r8.graph.DexItemFactory):765:765 -> a
-    47:47:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):484:484 -> a
-    47:47:boolean definesFinalizer(com.android.tools.r8.graph.DexItemFactory):765 -> a
-    48:48:void setEnclosingMethodAttribute(com.android.tools.r8.graph.EnclosingMethodAttribute):787:787 -> a
-    49:57:void replaceInnerClassAttributeForThisClass(com.android.tools.r8.graph.InnerClassAttribute):822:830 -> a
-    58:58:void setClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):838:838 -> a
-    59:60:void setNestHost(com.android.tools.r8.graph.DexType):874:875 -> a
-    61:61:void lambda$forEachNestMember$4(java.util.function.Consumer,com.android.tools.r8.graph.NestMemberClassAttribute):898:898 -> a
-    62:62:boolean isValid(com.android.tools.r8.utils.InternalOptions):946:946 -> a
-    63:66:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):238:241 -> a
-    63:66:boolean isValid(com.android.tools.r8.utils.InternalOptions):946 -> a
-    67:70:boolean isValid(com.android.tools.r8.utils.InternalOptions):947:950 -> a
-    1:1:com.android.tools.r8.graph.MethodCollection getMethodCollection():176:176 -> a0
+    1:1:void forEachClassMethodMatching(java.util.function.Predicate,java.util.function.Consumer):131:131 -> a
+    2:2:void lambda$forEachClassMethodMatching$0(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):132:132 -> a
+    3:3:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):180:180 -> a
+    4:4:void addDirectMethods(java.util.Collection):192:192 -> a
+    5:5:void setDirectMethods(java.util.List):200:200 -> a
+    6:6:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):204:204 -> a
+    6:6:void setDirectMethods(java.util.List):200 -> a
+    7:7:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):204:204 -> a
+    8:8:void virtualizeMethods(java.util.Set):247:247 -> a
+    9:13:void forEachField(java.util.function.Consumer):266:270 -> a
+    14:19:void appendInstanceField(com.android.tools.r8.graph.DexEncodedField):354:359 -> a
+    20:22:void setInstanceField(int,com.android.tools.r8.graph.DexEncodedField):384:386 -> a
+    23:25:void setInstanceFields(com.android.tools.r8.graph.DexEncodedField[]):390:392 -> a
+    26:27:boolean verifyCorrectnessOfFieldHolders(java.lang.Iterable):410:411 -> a
+    28:28:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):432:432 -> a
+    28:28:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):450 -> a
+    29:29:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):427:427 -> a
+    29:29:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):451 -> a
+    30:30:com.android.tools.r8.graph.DexEncodedMember lookupMember(com.android.tools.r8.graph.DexMember):479:479 -> a
+    31:31:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):494:494 -> a
+    31:31:com.android.tools.r8.graph.DexEncodedMember lookupMember(com.android.tools.r8.graph.DexMember):479 -> a
+    32:32:com.android.tools.r8.graph.DexClassAndMethod lookupClassMethod(com.android.tools.r8.graph.DexMethod):485:485 -> a
+    33:33:com.android.tools.r8.graph.DexClassAndMethod toClassMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod):489:489 -> a
+    33:33:com.android.tools.r8.graph.DexClassAndMethod lookupClassMethod(com.android.tools.r8.graph.DexMethod):485 -> a
+    34:35:com.android.tools.r8.graph.DexEncodedMember lookupTarget(com.android.tools.r8.graph.DexEncodedMember[],com.android.tools.r8.graph.DexMember):536:537 -> a
+    36:36:boolean com.android.tools.r8.graph.DexField.match(com.android.tools.r8.graph.DexEncodedMember):18:18 -> a
+    36:36:com.android.tools.r8.graph.DexEncodedMember lookupTarget(com.android.tools.r8.graph.DexEncodedMember[],com.android.tools.r8.graph.DexMember):537 -> a
+    37:39:com.android.tools.r8.graph.DexEncodedMethod getInitializer(com.android.tools.r8.graph.DexType[]):652:654 -> a
+    40:40:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):712:712 -> a
+    41:41:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):711:711 -> a
+    42:42:boolean classInitializationMayHaveSideEffectsInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition):718:718 -> a
+    43:43:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):712:712 -> a
+    43:43:boolean classInitializationMayHaveSideEffectsInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition):718 -> a
+    44:44:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):711:711 -> a
+    44:44:boolean classInitializationMayHaveSideEffectsInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition):718 -> a
+    45:45:boolean lambda$classInitializationMayHaveSideEffectsInContext$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexType):719:719 -> a
+    46:46:boolean definesFinalizer(com.android.tools.r8.graph.DexItemFactory):747:747 -> a
+    47:47:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):466:466 -> a
+    47:47:boolean definesFinalizer(com.android.tools.r8.graph.DexItemFactory):747 -> a
+    48:48:void setEnclosingMethodAttribute(com.android.tools.r8.graph.EnclosingMethodAttribute):769:769 -> a
+    49:57:void replaceInnerClassAttributeForThisClass(com.android.tools.r8.graph.InnerClassAttribute):804:812 -> a
+    58:58:void setClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):820:820 -> a
+    59:60:void setNestHost(com.android.tools.r8.graph.DexType):852:853 -> a
+    61:61:void lambda$forEachNestMember$4(java.util.function.Consumer,com.android.tools.r8.graph.NestMemberClassAttribute):876:876 -> a
+    62:62:boolean isValid(com.android.tools.r8.utils.InternalOptions):920:920 -> a
+    63:66:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):229:232 -> a
+    63:66:boolean isValid(com.android.tools.r8.utils.InternalOptions):920 -> a
+    67:70:boolean isValid(com.android.tools.r8.utils.InternalOptions):921:924 -> a
+    1:5:com.android.tools.r8.graph.DexType getNestHost():865:869 -> a0
     void addDependencies(com.android.tools.r8.dex.MixedSectionCollection) -> b
-    1:1:java.lang.Iterable directMethods(java.util.function.Predicate):197:197 -> b
-    2:2:void addVirtualMethods(java.util.Collection):225:225 -> b
-    3:3:void setVirtualMethods(java.util.List):229:229 -> b
-    4:4:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):233:233 -> b
-    4:4:void setVirtualMethods(java.util.List):229 -> b
-    5:5:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):233:233 -> b
-    6:11:void appendStaticField(com.android.tools.r8.graph.DexEncodedField):305:310 -> b
-    12:14:void setStaticField(int,com.android.tools.r8.graph.DexEncodedField):334:336 -> b
-    15:17:void setStaticFields(com.android.tools.r8.graph.DexEncodedField[]):340:342 -> b
-    18:18:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):441:441 -> b
-    19:19:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(com.android.tools.r8.graph.DexMethod):474:474 -> b
-    20:20:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):724:724 -> b
-    21:21:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):730:730 -> b
-    21:21:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):724 -> b
-    22:22:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):729:729 -> b
-    22:22:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):724 -> b
-    23:27:void forEachImmediateSupertype(java.util.function.Consumer):747:751 -> b
-    1:5:com.android.tools.r8.graph.DexType getNestHost():887:891 -> b0
-    1:3:java.lang.Iterable fields(java.util.function.Predicate):162:164 -> c
+    1:1:java.lang.Iterable directMethods(java.util.function.Predicate):188:188 -> b
+    2:2:void addVirtualMethods(java.util.Collection):216:216 -> b
+    3:3:void setVirtualMethods(java.util.List):220:220 -> b
+    4:4:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):224:224 -> b
+    4:4:void setVirtualMethods(java.util.List):220 -> b
+    5:5:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):224:224 -> b
+    6:11:void appendStaticField(com.android.tools.r8.graph.DexEncodedField):296:301 -> b
+    12:14:void setStaticField(int,com.android.tools.r8.graph.DexEncodedField):325:327 -> b
+    15:17:void setStaticFields(com.android.tools.r8.graph.DexEncodedField[]):331:333 -> b
+    18:18:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):432:432 -> b
+    19:19:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(com.android.tools.r8.graph.DexMethod):456:456 -> b
+    20:20:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):706:706 -> b
+    21:21:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):712:712 -> b
+    21:21:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):706 -> b
+    22:22:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):711:711 -> b
+    22:22:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):706 -> b
+    23:27:void forEachImmediateSupertype(java.util.function.Consumer):729:733 -> b
+    1:1:com.android.tools.r8.graph.NestHostClassAttribute getNestHostClassAttribute():880:880 -> b0
+    1:3:java.lang.Iterable fields(java.util.function.Predicate):157:159 -> c
     4:4:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> c
-    4:4:java.lang.Iterable fields(java.util.function.Predicate):162 -> c
-    5:5:void forEachMethod(java.util.function.Consumer):248:248 -> c
+    4:4:java.lang.Iterable fields(java.util.function.Predicate):157 -> c
+    5:5:void forEachMethod(java.util.function.Consumer):239:239 -> c
     6:6:void com.android.tools.r8.graph.MethodCollection.forEachMethod(java.util.function.Consumer):88:88 -> c
-    6:6:void forEachMethod(java.util.function.Consumer):248 -> c
-    7:16:void appendStaticFields(java.util.Collection):314:323 -> c
-    17:17:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):436:436 -> c
-    18:18:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):512:512 -> c
-    19:19:boolean lambda$defaultValuesForStaticFieldsMayTriggerAllocation$3(com.android.tools.r8.graph.DexEncodedField):771:771 -> c
-    20:24:java.util.List getDirectAndIndirectInstanceFields(com.android.tools.r8.graph.AppView):936:940 -> c
-    1:1:com.android.tools.r8.graph.NestHostClassAttribute getNestHostClassAttribute():902:902 -> c0
-    1:5:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):409:413 -> d
-    6:6:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(java.util.function.Predicate):479:479 -> d
-    7:7:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):484:484 -> d
-    8:8:boolean isFinal():575:575 -> d
-    8:8:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):579 -> d
-    9:10:void forEachNestMember(java.util.function.Consumer):897:898 -> d
-    1:1:java.util.List getNestMembersClassAttributes():906:906 -> d0
-    1:1:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):205:205 -> e
-    2:2:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(java.util.function.Predicate):489:489 -> e
-    3:10:boolean isResolvable(com.android.tools.r8.graph.AppView):696:703 -> e
-    11:12:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):330:331 -> e
-    11:12:boolean isResolvable(com.android.tools.r8.graph.AppView):703 -> e
-    13:16:boolean isResolvable(com.android.tools.r8.graph.AppView):709:712 -> e
-    1:1:com.android.tools.r8.graph.DexString getSourceFile():154:154 -> e0
-    1:1:java.lang.Iterable members(java.util.function.Predicate):172:172 -> f
-    2:2:java.lang.Iterable methods(java.util.function.Predicate):184:184 -> f
-    2:2:java.lang.Iterable members(java.util.function.Predicate):172 -> f
-    3:3:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> f
-    3:3:java.lang.Iterable members(java.util.function.Predicate):172 -> f
-    4:4:boolean isSerializable(com.android.tools.r8.graph.AppView):716:716 -> f
-    5:5:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isSerializable(com.android.tools.r8.graph.DexType):372:372 -> f
-    5:5:boolean isSerializable(com.android.tools.r8.graph.AppView):716 -> f
-    1:1:com.android.tools.r8.graph.DexType getSuperType():658:658 -> f0
-    1:1:java.lang.Iterable methods(java.util.function.Predicate):184:184 -> g
-    1:1:com.android.tools.r8.graph.DexType getType():654:654 -> g0
-    1:1:com.android.tools.r8.graph.AccessFlags getAccessFlags():36:36 -> getAccessFlags
-    1:1:com.android.tools.r8.origin.Origin getOrigin():650:650 -> getOrigin
-    1:2:void removeEnclosingMethodAttribute(java.util.function.Predicate):795:796 -> h
-    1:1:java.lang.String getTypeName():913:913 -> h0
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.getTypeName():171:171 -> h0
-    2:2:java.lang.String getTypeName():913 -> h0
-    1:1:void removeInnerClasses(java.util.function.Predicate):809:809 -> i
-    1:1:boolean hasClassInitializer():662:662 -> i0
-    1:1:java.lang.Iterable virtualMethods(java.util.function.Predicate):221:221 -> j
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInitializer():680:680 -> j0
-    1:1:boolean hasDefaultInitializer():666 -> j0
-    1:2:boolean hasStaticSynchronizedMethods():955:956 -> k0
-    3:3:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():505:505 -> k0
-    3:3:boolean hasStaticSynchronizedMethods():956 -> k0
-    1:5:java.util.List instanceFields():355:359 -> l0
-    1:1:boolean isAbstract():567:567 -> m0
-    1:1:boolean isAnnotation():571:571 -> n0
-    1:4:boolean isAnonymousClass():855:858 -> o0
-    boolean isClasspathClass() -> p0
-    1:1:boolean isEnum():587:587 -> q0
-    1:1:boolean isFinal():575:575 -> r0
-    1:1:boolean isInANest():862:862 -> s0
-    1:1:boolean isInterface():583:583 -> t0
+    6:6:void forEachMethod(java.util.function.Consumer):239 -> c
+    7:16:void appendStaticFields(java.util.Collection):305:314 -> c
+    17:17:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):427:427 -> c
+    18:18:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):494:494 -> c
+    19:19:boolean lambda$defaultValuesForStaticFieldsMayTriggerAllocation$3(com.android.tools.r8.graph.DexEncodedField):753:753 -> c
+    20:24:java.util.List getDirectAndIndirectInstanceFields(com.android.tools.r8.graph.AppView):910:914 -> c
+    25:25:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> c
+    25:25:java.util.List getDirectAndIndirectInstanceFields(com.android.tools.r8.graph.AppView):914 -> c
+    1:1:java.util.List getNestMembersClassAttributes():884:884 -> c0
+    1:5:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):400:404 -> d
+    6:6:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(java.util.function.Predicate):461:461 -> d
+    7:7:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):466:466 -> d
+    8:8:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):561:561 -> d
+    9:10:void forEachNestMember(java.util.function.Consumer):875:876 -> d
+    1:1:com.android.tools.r8.graph.DexType getType():636:636 -> d0
+    1:1:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):196:196 -> e
+    2:2:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(java.util.function.Predicate):471:471 -> e
+    3:10:boolean isResolvable(com.android.tools.r8.graph.AppView):678:685 -> e
+    11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> e
+    11:11:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):363 -> e
+    11:11:boolean isResolvable(com.android.tools.r8.graph.AppView):685 -> e
+    12:12:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):364:364 -> e
+    12:12:boolean isResolvable(com.android.tools.r8.graph.AppView):685 -> e
+    13:16:boolean isResolvable(com.android.tools.r8.graph.AppView):691:694 -> e
+    1:1:boolean hasClassInitializer():644:644 -> e0
+    1:1:java.lang.Iterable methods(java.util.function.Predicate):175:175 -> f
+    2:2:boolean isSerializable(com.android.tools.r8.graph.AppView):698:698 -> f
+    3:3:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isSerializable(com.android.tools.r8.graph.DexType):322:322 -> f
+    3:3:boolean isSerializable(com.android.tools.r8.graph.AppView):698 -> f
+    1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInitializer():662:662 -> f0
+    1:1:boolean hasDefaultInitializer():648 -> f0
+    1:2:void removeEnclosingMethodAttribute(java.util.function.Predicate):777:778 -> g
+    1:2:boolean hasStaticSynchronizedMethods():929:930 -> g0
+    3:3:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():518:518 -> g0
+    3:3:boolean hasStaticSynchronizedMethods():930 -> g0
+    1:1:com.android.tools.r8.graph.ClassAccessFlags getAccessFlags():137:137 -> getAccessFlags
+    1:1:com.android.tools.r8.graph.AccessFlags getAccessFlags():36 -> getAccessFlags
+    1:1:com.android.tools.r8.origin.Origin getOrigin():632:632 -> getOrigin
+    1:1:void removeInnerClasses(java.util.function.Predicate):791:791 -> h
+    1:5:java.util.List instanceFields():346:350 -> h0
+    1:1:java.lang.Iterable virtualMethods(java.util.function.Predicate):212:212 -> i
+    1:1:boolean isAbstract():549:549 -> i0
+    1:1:boolean isAnnotation():553:553 -> j0
+    1:4:boolean isAnonymousClass():837:840 -> k0
+    boolean isClasspathClass() -> l0
+    1:1:boolean isEnum():569:569 -> m0
+    1:1:boolean isFinal():557:557 -> n0
+    1:1:boolean isInANest():844:844 -> o0
+    1:1:boolean isInterface():565:565 -> p0
+    boolean isLibraryClass() -> q0
+    1:3:boolean isLocalClass():824:826 -> r0
+    1:3:boolean isMemberClass():830:832 -> s0
+    1:1:boolean isNestHost():857:857 -> t0
     com.android.tools.r8.graph.DexClass asDexClass() -> u
-    boolean isLibraryClass() -> u0
-    1:3:boolean isLocalClass():842:844 -> v0
-    1:3:boolean isMemberClass():848:850 -> w0
-    1:1:boolean isNestHost():879:879 -> x0
-    1:1:boolean isNestMember():883:883 -> y0
-    1:1:com.android.tools.r8.graph.DexReference getReference():594:594 -> z
-    boolean isNotProgramClass() -> z0
-com.android.tools.r8.graph.DexClass$FieldSetter -> com.android.tools.r8.graph.w$a:
+    1:1:boolean isNestMember():861:861 -> u0
+    boolean isNotProgramClass() -> v0
+    1:1:boolean isPublic():612:612 -> w0
+    1:1:java.lang.Iterable members():163:163 -> x0
+    2:2:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> x0
+    2:2:java.lang.Iterable members():163 -> x0
+    1:1:java.lang.Iterable methods():171:171 -> y0
+    1:1:com.android.tools.r8.graph.DexReference getReference():576:576 -> z
+    1:5:java.util.List staticFields():284:288 -> z0
+com.android.tools.r8.graph.DexClass$FieldSetter -> com.android.tools.r8.graph.v$a:
     void setField(int,com.android.tools.r8.graph.DexEncodedField) -> a
-com.android.tools.r8.graph.DexClassAndField -> com.android.tools.r8.graph.x:
+com.android.tools.r8.graph.DexClassAndField -> com.android.tools.r8.graph.w:
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():7:7 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):10:13 -> <init>
-    1:2:com.android.tools.r8.graph.DexClassAndField create(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):17:18 -> a
-    3:3:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    3:3:com.android.tools.r8.graph.DexClassAndField create(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):20 -> a
-    4:6:com.android.tools.r8.graph.DexClassAndField create(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):21:23 -> a
-    7:7:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
-    7:7:com.android.tools.r8.graph.DexClassAndField create(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):23 -> a
-    8:9:com.android.tools.r8.graph.DexClassAndField create(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):23:24 -> a
-    1:1:com.android.tools.r8.graph.AccessFlags getAccessFlags():7:7 -> getAccessFlags
+    1:2:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):10:11 -> <init>
+    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():128:128 -> getAccessFlags
+    2:2:com.android.tools.r8.graph.FieldAccessFlags getAccessFlags():24 -> getAccessFlags
+    2:2:com.android.tools.r8.graph.AccessFlags getAccessFlags():7 -> getAccessFlags
     com.android.tools.r8.graph.ProgramField asProgramField() -> l
     boolean isProgramField() -> q
-    com.android.tools.r8.graph.LibraryField asLibraryField() -> t
-    1:1:com.android.tools.r8.graph.FieldAccessFlags getAccessFlags():29:29 -> u
-    1:1:com.android.tools.r8.graph.DexType getType():33:33 -> v
-    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():49:49 -> v
-    2:2:com.android.tools.r8.graph.DexType getType():33 -> v
-com.android.tools.r8.graph.DexClassAndMember -> com.android.tools.r8.graph.y:
+com.android.tools.r8.graph.DexClassAndMember -> com.android.tools.r8.graph.x:
     com.android.tools.r8.graph.DexClass holder -> b
     com.android.tools.r8.graph.DexEncodedMember definition -> c
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():10:10 -> <clinit>
     1:6:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMember):16:21 -> <init>
-    1:1:com.android.tools.r8.graph.DexEncodedMember getDefinition():39:39 -> c
-    1:1:com.android.tools.r8.graph.DexType getHolderType():35:35 -> e
-    1:1:boolean equals(java.lang.Object):77:77 -> equals
+    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):65:65 -> equals
     1:1:com.android.tools.r8.origin.Origin getOrigin():51:51 -> getOrigin
-    1:1:int hashCode():82:82 -> hashCode
+    1:1:int hashCode():70:70 -> hashCode
     1:1:com.android.tools.r8.graph.DexType getContextType():27:27 -> i
     1:1:com.android.tools.r8.graph.DexClass getHolder():31:31 -> n
     1:1:com.android.tools.r8.graph.DexMember getReference():47:47 -> r
-    1:1:java.lang.String toSourceString():67:67 -> s
-    1:1:java.lang.String toString():72:72 -> toString
-com.android.tools.r8.graph.DexClassAndMethod -> com.android.tools.r8.graph.z:
+    1:1:java.lang.String toSourceString():55:55 -> s
+    1:1:java.lang.String toString():60:60 -> toString
+com.android.tools.r8.graph.DexClassAndMethod -> com.android.tools.r8.graph.y:
     int $r8$clinit -> e
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():7:7 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):11:14 -> <init>
-    1:2:com.android.tools.r8.graph.DexClassAndMethod create(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):22:23 -> a
+    1:2:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):11:12 -> <init>
+    1:2:com.android.tools.r8.graph.DexClassAndMethod create(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):20:21 -> a
     3:3:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    3:3:com.android.tools.r8.graph.DexClassAndMethod create(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):25 -> a
-    4:6:com.android.tools.r8.graph.DexClassAndMethod create(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):26:28 -> a
+    3:3:com.android.tools.r8.graph.DexClassAndMethod create(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):22 -> a
+    4:6:com.android.tools.r8.graph.DexClassAndMethod create(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):23:25 -> a
     7:7:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
-    7:7:com.android.tools.r8.graph.DexClassAndMethod create(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):28 -> a
-    8:9:com.android.tools.r8.graph.DexClassAndMethod create(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):28:29 -> a
-    10:10:boolean isStructurallyEqualTo(com.android.tools.r8.graph.DexClassAndMethod):37:37 -> a
-    boolean isProgramMethod() -> d
-    com.android.tools.r8.graph.DexClassAndMethod asMethodTarget() -> g
+    7:7:com.android.tools.r8.graph.DexClassAndMethod create(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):25 -> a
+    8:9:com.android.tools.r8.graph.DexClassAndMethod create(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):25:26 -> a
+    10:10:boolean isStructurallyEqualTo(com.android.tools.r8.graph.DexClassAndMethod):35:35 -> a
+    boolean isProgramMethod() -> c
+    com.android.tools.r8.graph.DexClassAndMethod asMethodTarget() -> f
     1:1:com.android.tools.r8.graph.AccessFlags getAccessFlags():7:7 -> getAccessFlags
     boolean isMethodTarget() -> k
     com.android.tools.r8.graph.ProgramMethod asProgramMethod() -> p
     com.android.tools.r8.graph.LibraryMethod asLibraryMethod() -> t
-    1:1:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():42:42 -> u
-    1:1:com.android.tools.r8.graph.DexProto getProto():46:46 -> v
+    1:1:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():40:40 -> u
+    1:1:com.android.tools.r8.graph.DexProto getProto():44:44 -> v
     2:2:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexMethod.getProto():62:62 -> v
-    2:2:com.android.tools.r8.graph.DexProto getProto():46 -> v
-com.android.tools.r8.graph.DexClasspathClass -> com.android.tools.r8.graph.A:
+    2:2:com.android.tools.r8.graph.DexProto getProto():44 -> v
+com.android.tools.r8.graph.DexClasspathClass -> com.android.tools.r8.graph.z:
     boolean $assertionsDisabled -> s
-    1:1:void <clinit>():24:24 -> <clinit>
-    1:19:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,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.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean):46:64 -> <init>
+    1:1:void <clinit>():18:18 -> <clinit>
+    1:19:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,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.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean):39:57 -> <init>
     com.android.tools.r8.graph.DexClasspathClass asClasspathClass() -> I
-    1:1:void accept(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):72:72 -> a
-    2:5:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):131:134 -> a
-    6:18:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):148:160 -> a
-    19:19:boolean lambda$specify$1(com.android.tools.r8.graph.DexClasspathClass):157:157 -> a
-    1:1:void forEachClasspathMethodMatching(java.util.function.Predicate,java.util.function.Consumer):81:81 -> b
-    2:2:void lambda$forEachClasspathMethodMatching$0(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):82:82 -> b
-    3:3:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):93:93 -> b
-    4:4:com.android.tools.r8.graph.DexEncodedField[] lambda$specify$2(com.android.tools.r8.graph.DexClasspathClass):158:158 -> b
-    1:1:com.android.tools.r8.graph.DexEncodedField[] lambda$specify$3(com.android.tools.r8.graph.DexClasspathClass):159:159 -> c
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():144:144 -> f
-    com.android.tools.r8.utils.structural.StructuralItem self() -> k
-    1:1:java.lang.String toString():87:87 -> toString
-    boolean isNotProgramClass() -> z0
-com.android.tools.r8.graph.DexCode -> com.android.tools.r8.graph.B:
+    1:4:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):102:105 -> a
+    1:1:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):68:68 -> b
+    1:1:java.lang.String toString():62:62 -> toString
+    boolean isNotProgramClass() -> v0
+com.android.tools.r8.graph.DexCode -> com.android.tools.r8.graph.A:
     com.android.tools.r8.graph.DexDebugInfoForWriting debugInfoForWriting -> l
     com.android.tools.r8.code.Instruction[] instructions -> i
     int outgoingRegisterSize -> f
@@ -17813,8 +17839,8 @@
     1:1:int lambda$specify$2(com.android.tools.r8.graph.DexCode):59:59 -> c
     1:1:com.android.tools.r8.graph.DexCode$Try[] lambda$specify$3(com.android.tools.r8.graph.DexCode):60:60 -> d
     1:1:com.android.tools.r8.graph.DexCode$TryHandler[] lambda$specify$4(com.android.tools.r8.graph.DexCode):61:61 -> e
+    2:2:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():94:94 -> e
     1:1:com.android.tools.r8.graph.DexDebugInfo lambda$specify$5(com.android.tools.r8.graph.DexCode):62:62 -> f
-    2:2:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():94:94 -> f
     1:1:com.android.tools.r8.code.Instruction[] lambda$specify$6(com.android.tools.r8.graph.DexCode):63:63 -> g
     2:2:boolean computeEquals(java.lang.Object):208:208 -> g
     com.android.tools.r8.utils.structural.StructuralItem self() -> k
@@ -17824,7 +17850,7 @@
     1:2:int codeSizeInBytes():455:456 -> x
     1:2:int estimatedDexCodeSizeUpperBoundInBytes():126 -> x
     1:1:int estimatedSizeForInlining():121:121 -> y
-com.android.tools.r8.graph.DexCode$Try -> com.android.tools.r8.graph.B$a:
+com.android.tools.r8.graph.DexCode$Try -> com.android.tools.r8.graph.A$a:
     int instructionCount -> d
     int handlerIndex -> e
     boolean $assertionsDisabled -> a
@@ -17837,12 +17863,12 @@
     5:5:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):519:519 -> a
     1:1:int lambda$specify$1(com.android.tools.r8.graph.DexCode$Try):471:471 -> b
     1:1:int lambda$specify$2(com.android.tools.r8.graph.DexCode$Try):472:472 -> c
+    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():489:489 -> e
     1:1:boolean equals(java.lang.Object):503:503 -> equals
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():489:489 -> f
     1:1:int hashCode():498:498 -> hashCode
     com.android.tools.r8.utils.structural.StructuralItem self() -> k
     1:4:java.lang.String toString():508:511 -> toString
-com.android.tools.r8.graph.DexCode$TryHandler -> com.android.tools.r8.graph.B$b:
+com.android.tools.r8.graph.DexCode$TryHandler -> com.android.tools.r8.graph.A$b:
     com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair[] pairs -> b
     boolean $assertionsDisabled -> a
     int catchAllAddr -> c
@@ -17852,14 +17878,14 @@
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):532:532 -> a
     3:3:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):569:569 -> a
     1:1:com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair[] lambda$specify$1(com.android.tools.r8.graph.DexCode$TryHandler):532:532 -> b
+    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():547:547 -> e
     1:1:boolean equals(java.lang.Object):557:557 -> equals
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():547:547 -> f
     1:1:int hashCode():552:552 -> hashCode
     2:2:int com.android.tools.r8.utils.structural.HashCodeVisitor.run(com.android.tools.r8.utils.structural.StructuralItem):28:28 -> hashCode
     2:2:int hashCode():552 -> hashCode
     com.android.tools.r8.utils.structural.StructuralItem self() -> k
     1:16:java.lang.String toString():574:589 -> toString
-com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair -> com.android.tools.r8.graph.B$b$a:
+com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair -> com.android.tools.r8.graph.A$b$a:
     com.android.tools.r8.graph.DexType type -> b
     boolean $assertionsDisabled -> a
     int addr -> c
@@ -17874,12 +17900,12 @@
     6:6:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):632:632 -> a
     1:1:com.android.tools.r8.graph.DexType lambda$specify$0(com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair):598:598 -> b
     1:1:int lambda$specify$1(com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair):598:598 -> c
+    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():613:613 -> e
     1:1:boolean equals(java.lang.Object):642:642 -> equals
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():613:613 -> f
     1:1:int hashCode():637:637 -> hashCode
     com.android.tools.r8.utils.structural.StructuralItem self() -> k
     1:1:com.android.tools.r8.graph.DexType getType():617:617 -> t
-com.android.tools.r8.graph.DexDebugEntry -> com.android.tools.r8.internal.ba:
+com.android.tools.r8.graph.DexDebugEntry -> com.android.tools.r8.internal.y9:
     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
@@ -17894,7 +17920,7 @@
     1:11:void <init>(boolean,int,int,com.android.tools.r8.graph.DexString,boolean,boolean,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):34:44 -> <init>
     1:38:java.lang.String toString(boolean):53:90 -> a
     1:1:java.lang.String toString():49:49 -> toString
-com.android.tools.r8.graph.DexDebugEntryBuilder -> com.android.tools.r8.graph.C:
+com.android.tools.r8.graph.DexDebugEntryBuilder -> com.android.tools.r8.graph.B:
     com.android.tools.r8.graph.DexDebugPositionState positionState -> i
     java.util.Map locals -> d
     com.android.tools.r8.graph.DexDebugEntry pending -> f
@@ -17939,13 +17965,13 @@
     67:68:void com.android.tools.r8.graph.DexDebugEntryBuilder$LocalEntry.set(com.android.tools.r8.graph.DebugLocalInfo):29:30 -> a
     67:68:void startArgument(int,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):139 -> a
     69:72:com.android.tools.r8.graph.DexDebugEntryBuilder$LocalEntry getEntry(int):206:209 -> a
-com.android.tools.r8.graph.DexDebugEntryBuilder$1 -> com.android.tools.r8.graph.C$a:
-com.android.tools.r8.graph.DexDebugEntryBuilder$LocalEntry -> com.android.tools.r8.graph.C$b:
+com.android.tools.r8.graph.DexDebugEntryBuilder$1 -> com.android.tools.r8.graph.B$a:
+com.android.tools.r8.graph.DexDebugEntryBuilder$LocalEntry -> com.android.tools.r8.graph.B$b:
     com.android.tools.r8.graph.DebugLocalInfo current -> a
     com.android.tools.r8.graph.DebugLocalInfo last -> b
     1:1:void <init>():24:24 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexDebugEntryBuilder$1):24:24 -> <init>
-com.android.tools.r8.graph.DexDebugEvent -> com.android.tools.r8.graph.D:
+com.android.tools.r8.graph.DexDebugEvent -> com.android.tools.r8.graph.C:
     com.android.tools.r8.graph.DexDebugEvent[] EMPTY_ARRAY -> a
     1:1:void <clinit>():24:24 -> <clinit>
     1:1:void <init>():19:19 -> <init>
@@ -17958,12 +17984,12 @@
     4:5:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):71:72 -> a
     int internalAcceptCompareTo(com.android.tools.r8.graph.DexDebugEvent,com.android.tools.r8.utils.structural.CompareToVisitor) -> b
     void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor) -> b
+    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():60:60 -> e
     1:1:boolean equals(java.lang.Object):44:44 -> equals
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():60:60 -> f
     com.android.tools.r8.utils.structural.StructuralItem self() -> k
     com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame asSetInlineFrame() -> t
     int getCompareToId() -> u
-com.android.tools.r8.graph.DexDebugEvent$AdvanceLine -> com.android.tools.r8.graph.D$a:
+com.android.tools.r8.graph.DexDebugEvent$AdvanceLine -> com.android.tools.r8.graph.C$a:
     int delta -> b
     1:2:void <init>(int):229:230 -> <init>
     1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):225:225 -> a
@@ -17975,7 +18001,7 @@
     com.android.tools.r8.utils.structural.StructuralItem self() -> k
     1:1:java.lang.String toString():247:247 -> toString
     int getCompareToId() -> u
-com.android.tools.r8.graph.DexDebugEvent$AdvancePC -> com.android.tools.r8.graph.D$b:
+com.android.tools.r8.graph.DexDebugEvent$AdvancePC -> com.android.tools.r8.graph.C$b:
     boolean $assertionsDisabled -> b
     int delta -> c
     1:1:void <clinit>():88:88 -> <clinit>
@@ -17989,7 +18015,7 @@
     com.android.tools.r8.utils.structural.StructuralItem self() -> k
     1:1:java.lang.String toString():112:112 -> toString
     int getCompareToId() -> u
-com.android.tools.r8.graph.DexDebugEvent$Default -> com.android.tools.r8.graph.D$c:
+com.android.tools.r8.graph.DexDebugEvent$Default -> com.android.tools.r8.graph.C$c:
     boolean $assertionsDisabled -> b
     int value -> c
     1:1:void <clinit>():577:577 -> <clinit>
@@ -18005,7 +18031,7 @@
     int getCompareToId() -> u
     1:2:int getLineDelta():603:604 -> v
     1:2:int getPCDelta():598:599 -> w
-com.android.tools.r8.graph.DexDebugEvent$EndLocal -> com.android.tools.r8.graph.D$d:
+com.android.tools.r8.graph.DexDebugEvent$EndLocal -> com.android.tools.r8.graph.C$d:
     int registerNum -> b
     1:2:void <init>(int):368:369 -> <init>
     1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):364:364 -> a
@@ -18017,7 +18043,7 @@
     com.android.tools.r8.utils.structural.StructuralItem self() -> k
     1:1:java.lang.String toString():386:386 -> toString
     int getCompareToId() -> u
-com.android.tools.r8.graph.DexDebugEvent$RestartLocal -> com.android.tools.r8.graph.D$e:
+com.android.tools.r8.graph.DexDebugEvent$RestartLocal -> com.android.tools.r8.graph.C$e:
     int registerNum -> b
     1:2:void <init>(int):415:416 -> <init>
     1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):411:411 -> a
@@ -18029,7 +18055,7 @@
     com.android.tools.r8.utils.structural.StructuralItem self() -> k
     1:1:java.lang.String toString():433:433 -> toString
     int getCompareToId() -> u
-com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin -> com.android.tools.r8.graph.D$f:
+com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin -> com.android.tools.r8.graph.C$f:
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():182:182 -> <clinit>
     1:1:void <init>():184:184 -> <init>
@@ -18040,7 +18066,7 @@
     1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexDebugEvent,com.android.tools.r8.utils.structural.CompareToVisitor):215:215 -> b
     com.android.tools.r8.utils.structural.StructuralItem self() -> k
     int getCompareToId() -> u
-com.android.tools.r8.graph.DexDebugEvent$SetFile -> com.android.tools.r8.graph.D$g:
+com.android.tools.r8.graph.DexDebugEvent$SetFile -> com.android.tools.r8.graph.C$g:
     com.android.tools.r8.graph.DexString fileName -> b
     1:2:void <init>(com.android.tools.r8.graph.DexString):462:463 -> <init>
     1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):458:458 -> a
@@ -18059,7 +18085,7 @@
     com.android.tools.r8.utils.structural.StructuralItem self() -> k
     1:1:java.lang.String toString():485:485 -> toString
     int getCompareToId() -> u
-com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame -> com.android.tools.r8.graph.D$h:
+com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame -> com.android.tools.r8.graph.C$h:
     com.android.tools.r8.graph.DexMethod callee -> c
     com.android.tools.r8.ir.code.Position caller -> d
     boolean $assertionsDisabled -> b
@@ -18079,7 +18105,7 @@
     com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame asSetInlineFrame() -> t
     1:1:java.lang.String toString():538:538 -> toString
     int getCompareToId() -> u
-com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd -> com.android.tools.r8.graph.D$i:
+com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd -> com.android.tools.r8.graph.C$i:
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():137:137 -> <clinit>
     1:1:void <init>():139:139 -> <init>
@@ -18090,7 +18116,7 @@
     1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexDebugEvent,com.android.tools.r8.utils.structural.CompareToVisitor):171:171 -> b
     com.android.tools.r8.utils.structural.StructuralItem self() -> k
     int getCompareToId() -> u
-com.android.tools.r8.graph.DexDebugEvent$StartLocal -> com.android.tools.r8.graph.D$j:
+com.android.tools.r8.graph.DexDebugEvent$StartLocal -> com.android.tools.r8.graph.C$j:
     com.android.tools.r8.graph.DexString name -> c
     com.android.tools.r8.graph.DexString signature -> e
     com.android.tools.r8.graph.DexType type -> d
@@ -18116,7 +18142,7 @@
     com.android.tools.r8.utils.structural.StructuralItem self() -> k
     1:1:java.lang.String toString():336:336 -> toString
     int getCompareToId() -> u
-com.android.tools.r8.graph.DexDebugEventBuilder -> com.android.tools.r8.graph.E:
+com.android.tools.r8.graph.DexDebugEventBuilder -> com.android.tools.r8.graph.D:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.ir.code.Position emittedPosition -> j
     int startLine -> m
@@ -18173,7 +18199,7 @@
     159:159:void emitLocalChangeEvents(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,java.util.List,com.android.tools.r8.graph.DexItemFactory):298 -> a
     160:161:void emitLocalChangeEvents(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,java.util.List,com.android.tools.r8.graph.DexItemFactory):298:299 -> a
     1:4:boolean localsChanged():174:177 -> b
-com.android.tools.r8.graph.DexDebugEventVisitor -> com.android.tools.r8.graph.F:
+com.android.tools.r8.graph.DexDebugEventVisitor -> com.android.tools.r8.graph.E:
     void visit(com.android.tools.r8.graph.DexDebugEvent$AdvanceLine) -> a
     void visit(com.android.tools.r8.graph.DexDebugEvent$AdvancePC) -> a
     void visit(com.android.tools.r8.graph.DexDebugEvent$Default) -> a
@@ -18184,7 +18210,7 @@
     void visit(com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame) -> a
     void visit(com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd) -> a
     void visit(com.android.tools.r8.graph.DexDebugEvent$StartLocal) -> a
-com.android.tools.r8.graph.DexDebugInfo -> com.android.tools.r8.graph.G:
+com.android.tools.r8.graph.DexDebugInfo -> com.android.tools.r8.graph.F:
     com.android.tools.r8.graph.DexDebugEvent[] events -> f
     int startLine -> d
     boolean $assertionsDisabled -> c
@@ -18197,16 +18223,16 @@
     10:10:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):80:80 -> a
     1:1:com.android.tools.r8.graph.DexString[] lambda$specify$1(com.android.tools.r8.graph.DexDebugInfo):23:23 -> b
     1:1:com.android.tools.r8.graph.DexDebugEvent[] lambda$specify$2(com.android.tools.r8.graph.DexDebugInfo):24:24 -> c
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():44:44 -> f
+    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():44:44 -> e
     1:1:boolean computeEquals(java.lang.Object):64:64 -> g
     com.android.tools.r8.utils.structural.StructuralItem self() -> k
     1:3:int computeHashCode():57:59 -> t
     1:8:java.lang.String toString():85:92 -> toString
-com.android.tools.r8.graph.DexDebugInfoForWriting -> com.android.tools.r8.internal.ca:
+com.android.tools.r8.graph.DexDebugInfoForWriting -> com.android.tools.r8.internal.z9:
     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
-com.android.tools.r8.graph.DexDebugPositionState -> com.android.tools.r8.graph.H:
+com.android.tools.r8.graph.DexDebugPositionState -> com.android.tools.r8.graph.G:
     com.android.tools.r8.graph.DexString currentFile -> d
     com.android.tools.r8.graph.DexMethod currentMethod -> e
     boolean $assertionsDisabled -> a
@@ -18231,7 +18257,7 @@
     1:1:int getCurrentLine():94:94 -> c
     1:1:com.android.tools.r8.graph.DexMethod getCurrentMethod():102:102 -> d
     1:1:int getCurrentPc():90:90 -> e
-com.android.tools.r8.graph.DexDefinition -> com.android.tools.r8.graph.I:
+com.android.tools.r8.graph.DexDefinition -> com.android.tools.r8.graph.H:
     com.android.tools.r8.graph.DexAnnotationSet annotations -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():15:15 -> <clinit>
@@ -18273,7 +18299,7 @@
     2:2:void setAnnotations(com.android.tools.r8.graph.DexAnnotationSet):40:40 -> y
     2:2:void clearAnnotations():36 -> y
     com.android.tools.r8.graph.DexReference getReference() -> z
-com.android.tools.r8.graph.DexDefinitionSupplier -> com.android.tools.r8.internal.da:
+com.android.tools.r8.graph.DexDefinitionSupplier -> com.android.tools.r8.internal.A9:
     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.ProgramMethod):35:35 -> a
@@ -18283,7 +18309,7 @@
     1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):31:31 -> b
     2:2:com.android.tools.r8.graph.DexProgramClass definitionForProgramType(com.android.tools.r8.graph.DexType):82:82 -> b
     com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType) -> c
-com.android.tools.r8.graph.DexEncodedAnnotation -> com.android.tools.r8.graph.J:
+com.android.tools.r8.graph.DexEncodedAnnotation -> com.android.tools.r8.graph.I:
     com.android.tools.r8.graph.DexAnnotationElement[] elements -> c
     com.android.tools.r8.graph.DexType type -> b
     int sorted -> d
@@ -18305,8 +18331,8 @@
     9:9:int lambda$sort$2(com.android.tools.r8.graph.DexAnnotationElement,com.android.tools.r8.graph.DexAnnotationElement):98:98 -> a
     10:16:com.android.tools.r8.graph.DexEncodedAnnotation rewrite(java.util.function.Function,java.util.function.Function):113:119 -> a
     1:1:com.android.tools.r8.graph.DexAnnotationElement[] lambda$specify$1(com.android.tools.r8.graph.DexEncodedAnnotation):26:26 -> b
+    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():41:41 -> e
     1:3:boolean equals(java.lang.Object):86:88 -> equals
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():41:41 -> f
     1:1:com.android.tools.r8.graph.DexAnnotationElement getElement(int):58:58 -> g
     1:1:int hashCode():78:78 -> hashCode
     com.android.tools.r8.utils.structural.StructuralItem self() -> k
@@ -18319,14 +18345,14 @@
     10:10:int sortedHashCode():106:106 -> u
     10:10:void sort():102 -> u
     11:11:void sort():102:102 -> u
-com.android.tools.r8.graph.DexEncodedArray -> com.android.tools.r8.graph.K:
+com.android.tools.r8.graph.DexEncodedArray -> com.android.tools.r8.graph.J:
     com.android.tools.r8.graph.DexValue[] values -> a
     1:2:void <init>(com.android.tools.r8.graph.DexValue[]):14:15 -> <init>
     1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):26:26 -> a
     1:1:boolean equals(java.lang.Object):39:39 -> equals
     1:1:int hashCode():31:31 -> hashCode
     1:1:java.lang.String toString():44:44 -> toString
-com.android.tools.r8.graph.DexEncodedField -> com.android.tools.r8.graph.L:
+com.android.tools.r8.graph.DexEncodedField -> com.android.tools.r8.graph.K:
     com.android.tools.r8.graph.FieldAccessFlags accessFlags -> f
     com.android.tools.r8.graph.DexField field -> e
     com.android.tools.r8.graph.GenericSignature$FieldTypeSignature genericSignature -> i
@@ -18336,129 +18362,100 @@
     com.android.tools.r8.graph.DexValue staticValue -> g
     com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo optimizationInfo -> j
     boolean $assertionsDisabled -> d
-    1:3:void <clinit>():29:31 -> <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):60:60 -> <init>
-    2:29: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):40:67 -> <init>
-    30:30: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):80:80 -> <init>
-    1:1:boolean isStatic():209:209 -> E
-    1:1:boolean isStatic():209:209 -> F
-    1:1:boolean isStaticMember():226 -> F
-    1:1:com.android.tools.r8.kotlin.KotlinFieldLevelInfo getKotlinMemberInfo():129:129 -> G
-    1:1:com.android.tools.r8.kotlin.KotlinMemberLevelInfo getKotlinMemberInfo():29 -> G
-    1:1:com.android.tools.r8.graph.DexField getReference():164:164 -> I
-    1:1:com.android.tools.r8.graph.DexMember getReference():29 -> I
-    1:1:void clearGenericSignature():343:343 -> K
-    1:2:void clearStaticValue():253:254 -> L
-    1:1:com.android.tools.r8.graph.FieldAccessFlags getAccessFlags():134:134 -> M
-    1:1:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature getGenericSignature():334:334 -> N
-    1:1:com.android.tools.r8.kotlin.KotlinFieldLevelInfo getKotlinMemberInfo():129:129 -> O
-    1:1:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getMutableOptimizationInfo():114:114 -> P
-    2:2:boolean com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo.isDefaultFieldOptimizationInfo():0:0 -> P
-    2:2:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getMutableOptimizationInfo():114 -> P
-    3:7:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getMutableOptimizationInfo():115:119 -> P
-    8:8:boolean com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo.isMutableFieldOptimizationInfo():0:0 -> P
-    8:8:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getMutableOptimizationInfo():119 -> P
-    9:10:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getMutableOptimizationInfo():119:120 -> P
-    1:1:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo getOptimizationInfo():110:110 -> Q
-    1:1:com.android.tools.r8.graph.DexField getReference():164:164 -> R
-    1:2:com.android.tools.r8.graph.DexValue getStaticValue():258:259 -> S
-    1:1:boolean hasAnnotation():238:238 -> T
-    1:2:boolean hasExplicitStaticValue():242:243 -> U
-    1:1:boolean isDeprecated():98:98 -> V
-    1:1:boolean isPublic():221:221 -> W
-    1:1:boolean isVolatile():234:234 -> X
-    2:2:boolean com.android.tools.r8.graph.AccessFlags.isSet(int):255:255 -> X
-    2:2:boolean com.android.tools.r8.graph.FieldAccessFlags.isVolatile():90 -> X
-    2:2:boolean isVolatile():234 -> X
-    1:1:com.android.tools.r8.graph.DexValue access$000(com.android.tools.r8.graph.DexEncodedField):29:29 -> a
-    2:7:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):44:49 -> a
-    8:8:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):124:124 -> a
-    9:10:void setKotlinMemberInfo(com.android.tools.r8.kotlin.KotlinFieldLevelInfo):138:139 -> a
-    11:11:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):144:144 -> a
-    12:14:void setStaticValue(com.android.tools.r8.graph.DexValue):247:249 -> a
-    15:15: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):269:269 -> a
-    16:16:boolean isStatic():209:209 -> a
-    16:16: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):272 -> a
-    17:18: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):272:273 -> a
-    19:19:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo getOptimizationInfo():110:110 -> a
-    19:19: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):277 -> a
-    20:30: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):277:287 -> a
-    31:38: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):286:293 -> a
-    39:39:boolean isStatic():209:209 -> a
-    39:39: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):293 -> a
-    40:46: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):294:300 -> a
-    47:47:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField):308:308 -> a
-    48:48:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField,java.util.function.Consumer):312:312 -> a
-    48:48:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField):308 -> a
-    49:49:com.android.tools.r8.graph.DexEncodedField$Builder builder(com.android.tools.r8.graph.DexEncodedField):347:347 -> a
-    49:49:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField,java.util.function.Consumer):315 -> a
-    49:49:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField):308 -> a
-    50:50:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField,java.util.function.Consumer):315:315 -> a
-    50:50:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField):308 -> a
-    51:51:com.android.tools.r8.graph.DexEncodedField$Builder com.android.tools.r8.graph.DexEncodedField$Builder.apply(java.util.function.Consumer):381:381 -> a
-    51:51:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField,java.util.function.Consumer):315 -> a
-    51:51:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField):308 -> a
-    52:52:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField,java.util.function.Consumer):315:315 -> a
-    52:52:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField):308 -> a
-    53:53:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField,java.util.function.Consumer):312:312 -> a
-    54:54:com.android.tools.r8.graph.DexEncodedField$Builder builder(com.android.tools.r8.graph.DexEncodedField):347:347 -> a
-    54:54:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField,java.util.function.Consumer):315 -> a
-    55:55:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField,java.util.function.Consumer):315:315 -> a
-    56:56:com.android.tools.r8.graph.DexEncodedField$Builder com.android.tools.r8.graph.DexEncodedField$Builder.apply(java.util.function.Consumer):381:381 -> a
-    56:56:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField,java.util.function.Consumer):315 -> a
-    57:57:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField,java.util.function.Consumer):315:315 -> a
-    58:65:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):319:326 -> a
-    66:66:boolean com.android.tools.r8.graph.DexValue.isDexValueNull():0:0 -> a
-    66:66:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):326 -> a
-    67:67:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):327:327 -> a
-    68:69:void setGenericSignature(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):338:339 -> a
-    1:1:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo access$100(com.android.tools.r8.graph.DexEncodedField):29:29 -> b
-    1:1:com.android.tools.r8.graph.DexField lambda$specify$0(com.android.tools.r8.graph.DexEncodedField):44:44 -> c
-    1:1:com.android.tools.r8.graph.FieldAccessFlags lambda$specify$1(com.android.tools.r8.graph.DexEncodedField):45:45 -> d
-    1:1:com.android.tools.r8.graph.DexValue lambda$specify$2(com.android.tools.r8.graph.DexEncodedField):46:46 -> e
-    1:1:boolean lambda$specify$3(com.android.tools.r8.graph.DexEncodedField):47:47 -> f
-    2:2:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():85:85 -> f
-    1:1:boolean lambda$specify$4(com.android.tools.r8.graph.DexEncodedField):49:49 -> g
-    1:1:com.android.tools.r8.graph.AccessFlags getAccessFlags():29:29 -> getAccessFlags
+    1:3:void <clinit>():27:29 -> <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):58:58 -> <init>
+    2:29: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):38:65 -> <init>
+    1:1:boolean isStatic():199:199 -> E
+    1:1:boolean isStatic():199:199 -> F
+    1:1:boolean isStaticMember():220 -> F
+    1:1:com.android.tools.r8.kotlin.KotlinFieldLevelInfo getKotlinMemberInfo():123:123 -> G
+    1:1:com.android.tools.r8.kotlin.KotlinMemberLevelInfo getKotlinMemberInfo():27 -> G
+    1:1:com.android.tools.r8.graph.DexField getReference():158:158 -> I
+    1:1:com.android.tools.r8.graph.DexMember getReference():27 -> I
+    1:1:void clearGenericSignature():340:340 -> J
+    1:2:void clearStaticValue():247:248 -> K
+    1:1:com.android.tools.r8.graph.FieldAccessFlags getAccessFlags():128:128 -> L
+    1:1:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature getGenericSignature():331:331 -> M
+    1:1:com.android.tools.r8.kotlin.KotlinFieldLevelInfo getKotlinMemberInfo():123:123 -> N
+    1:1:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getMutableOptimizationInfo():108:108 -> O
+    2:2:boolean com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo.isDefaultFieldOptimizationInfo():0:0 -> O
+    2:2:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getMutableOptimizationInfo():108 -> O
+    3:7:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getMutableOptimizationInfo():109:113 -> O
+    8:8:boolean com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo.isMutableFieldOptimizationInfo():0:0 -> O
+    8:8:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getMutableOptimizationInfo():113 -> O
+    9:10:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getMutableOptimizationInfo():113:114 -> O
+    1:1:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo getOptimizationInfo():104:104 -> P
+    1:1:com.android.tools.r8.graph.DexField getReference():158:158 -> Q
+    1:2:com.android.tools.r8.graph.DexValue getStaticValue():252:253 -> R
+    1:1:boolean hasAnnotation():232:232 -> S
+    1:2:boolean hasExplicitStaticValue():236:237 -> T
+    1:1:boolean isDeprecated():92:92 -> U
+    1:1:boolean isPrivate():207:207 -> V
+    1:1:boolean isVolatile():228:228 -> W
+    2:2:boolean com.android.tools.r8.graph.AccessFlags.isSet(int):255:255 -> W
+    2:2:boolean com.android.tools.r8.graph.FieldAccessFlags.isVolatile():85 -> W
+    2:2:boolean isVolatile():228 -> W
+    1:1:com.android.tools.r8.graph.DexField lambda$specify$0(com.android.tools.r8.graph.DexEncodedField):42:42 -> a
+    2:7:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):42:47 -> a
+    8:9:boolean isProgramField(com.android.tools.r8.graph.DexDefinitionSupplier):96:97 -> a
+    10:10:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    10:10:boolean isProgramField(com.android.tools.r8.graph.DexDefinitionSupplier):97 -> a
+    11:11:boolean isProgramField(com.android.tools.r8.graph.DexDefinitionSupplier):98:98 -> a
+    12:12:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):118:118 -> a
+    13:14:void setKotlinMemberInfo(com.android.tools.r8.kotlin.KotlinFieldLevelInfo):132:133 -> a
+    15:15:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):138:138 -> a
+    16:18:void setStaticValue(com.android.tools.r8.graph.DexValue):241:243 -> a
+    19:19: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):263:263 -> a
+    20:20:boolean isStatic():199:199 -> a
+    20:20: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):266 -> a
+    21:22: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):266:267 -> a
+    23:23:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo getOptimizationInfo():104:104 -> a
+    23:23: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):271 -> a
+    24:34: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):271:281 -> a
+    35:42: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):280:287 -> a
+    43:43:boolean isStatic():199:199 -> a
+    43:43: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):287 -> a
+    44:44: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):288:288 -> a
+    45:45:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    45:45: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):288 -> a
+    46:51: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):289:294 -> a
+    52:57:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField):302:307 -> a
+    58:58: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):74:74 -> a
+    58:58:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField):307 -> a
+    59:59:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField):309:309 -> a
+    60:60:boolean com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo.isMutableFieldOptimizationInfo():0:0 -> a
+    60:60:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField):309 -> a
+    61:62:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField):310:311 -> a
+    63:70:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):316:323 -> a
+    71:71:boolean com.android.tools.r8.graph.DexValue.isDexValueNull():0:0 -> a
+    71:71:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):323 -> a
+    72:72:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):324:324 -> a
+    73:74:void setGenericSignature(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):335:336 -> a
+    1:1:com.android.tools.r8.graph.FieldAccessFlags lambda$specify$1(com.android.tools.r8.graph.DexEncodedField):43:43 -> b
+    1:1:com.android.tools.r8.graph.DexValue lambda$specify$2(com.android.tools.r8.graph.DexEncodedField):44:44 -> c
+    1:1:boolean lambda$specify$3(com.android.tools.r8.graph.DexEncodedField):45:45 -> d
+    1:1:boolean lambda$specify$4(com.android.tools.r8.graph.DexEncodedField):47:47 -> e
+    2:2:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():79:79 -> e
+    1:1:com.android.tools.r8.graph.FieldAccessFlags getAccessFlags():128:128 -> getAccessFlags
+    1:1:com.android.tools.r8.graph.AccessFlags getAccessFlags():27 -> getAccessFlags
     com.android.tools.r8.utils.structural.StructuralItem self() -> k
-    1:1:java.lang.String toSourceString():159:159 -> s
-    1:1:java.lang.String toString():149:149 -> toString
+    1:1:java.lang.String toSourceString():153:153 -> s
+    1:1:java.lang.String toString():143:143 -> toString
     com.android.tools.r8.graph.DexEncodedField asDexEncodedField() -> v
-    1:1:com.android.tools.r8.graph.DexField getReference():164:164 -> z
-    1:1:com.android.tools.r8.graph.DexReference getReference():29 -> z
-com.android.tools.r8.graph.DexEncodedField$Builder -> com.android.tools.r8.graph.L$a:
-    com.android.tools.r8.graph.DexAnnotationSet annotations -> b
-    com.android.tools.r8.graph.FieldAccessFlags accessFlags -> c
-    com.android.tools.r8.graph.DexField field -> a
-    com.android.tools.r8.graph.GenericSignature$FieldTypeSignature genericSignature -> d
-    com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo optimizationInfo -> f
-    com.android.tools.r8.graph.DexValue staticValue -> e
-    1:12:void <init>(com.android.tools.r8.graph.DexEncodedField):359:370 -> <init>
-    1:1:com.android.tools.r8.graph.DexEncodedField$Builder fixupOptimizationInfo(java.util.function.Consumer):374:374 -> a
-    2:2:boolean com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo.isMutableFieldOptimizationInfo():0:0 -> a
-    2:2:com.android.tools.r8.graph.DexEncodedField$Builder fixupOptimizationInfo(java.util.function.Consumer):374 -> a
-    3:3:com.android.tools.r8.graph.DexEncodedField$Builder fixupOptimizationInfo(java.util.function.Consumer):375:375 -> a
-    4:4:com.android.tools.r8.graph.DexEncodedField$Builder setField(com.android.tools.r8.graph.DexField):386:386 -> a
-    5:5:com.android.tools.r8.graph.DexEncodedField build():391:391 -> a
-    6:6: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):80:80 -> a
-    6:6:com.android.tools.r8.graph.DexEncodedField build():391 -> a
-    7:7:com.android.tools.r8.graph.DexEncodedField build():393:393 -> a
-    8:8:boolean com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo.isMutableFieldOptimizationInfo():0:0 -> a
-    8:8:com.android.tools.r8.graph.DexEncodedField build():393 -> a
-    9:9:com.android.tools.r8.graph.DexEncodedField build():394:394 -> a
-com.android.tools.r8.graph.DexEncodedMember -> com.android.tools.r8.internal.ea:
+    1:1:com.android.tools.r8.graph.DexField getReference():158:158 -> z
+    1:1:com.android.tools.r8.graph.DexReference getReference():27 -> z
+com.android.tools.r8.graph.DexEncodedMember -> com.android.tools.r8.internal.B9:
     1:1:void <init>(com.android.tools.r8.graph.DexAnnotationSet):12:12 -> <init>
     boolean isDexEncodedMember() -> C
     com.android.tools.r8.kotlin.KotlinMemberLevelInfo getKotlinMemberInfo() -> G
     1:1:com.android.tools.r8.graph.DexString getName():22:22 -> H
     com.android.tools.r8.graph.DexMember getReference() -> I
-    1:1:boolean isPrivate():39:39 -> J
-    1:1:com.android.tools.r8.graph.DexType getHolderType():18:18 -> e
-    1:2:boolean equals(java.lang.Object):49:50 -> equals
-    1:1:int hashCode():55:55 -> hashCode
+    1:1:com.android.tools.r8.graph.DexType getHolderType():18:18 -> d
+    1:2:boolean equals(java.lang.Object):45:46 -> equals
+    1:1:int hashCode():51:51 -> hashCode
     com.android.tools.r8.graph.DexEncodedMember asDexEncodedMember() -> w
     1:1:com.android.tools.r8.graph.DexReference getReference():8:8 -> z
-com.android.tools.r8.graph.DexEncodedMethod -> com.android.tools.r8.graph.M:
+com.android.tools.r8.graph.DexEncodedMethod -> com.android.tools.r8.graph.L:
     com.android.tools.r8.cf.CfVersion classFileVersion -> o
     com.android.tools.r8.graph.ParameterAnnotationsList parameterAnnotationsList -> j
     boolean deprecated -> i
@@ -18479,324 +18476,313 @@
     com.android.tools.r8.graph.MethodAccessFlags accessFlags -> h
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState compilationState -> l
     com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo callSiteOptimizationInfo -> n
-    1:51:void <clinit>():96:146 -> <clinit>
-    1:1: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):257:257 -> <init>
-    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):296:296 -> <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):318:318 -> <init>
-    4:177: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):156:329 -> <init>
-    1:2:boolean isProcessed():480:481 -> A0
-    1:2:boolean isPublicMethod():587:588 -> B0
-    1:2:boolean isPublicized():582:583 -> C0
-    1:1:boolean isDexEncodedMethod():1444:1444 -> D
-    1:1:boolean isSynchronized():505:505 -> D0
-    1:2:boolean isStatic():615:616 -> E
-    1:2:boolean isSyntheticMethod():629:630 -> E0
-    1:2:boolean isStaticMember():621:622 -> F
-    1:2:boolean isVirtualMethod():558:559 -> F0
-    1:1:com.android.tools.r8.kotlin.KotlinMethodLevelInfo getKotlinMemberInfo():643:643 -> G
-    1:1:com.android.tools.r8.kotlin.KotlinMemberLevelInfo getKotlinMemberInfo():96 -> G
-    1:2:void markNotProcessed():773:774 -> G0
-    1:2:java.lang.String qualifiedName():876:877 -> H0
-    1:1:com.android.tools.r8.graph.DexMember getReference():96:96 -> I
-    1:2:void removeCode():848:849 -> I0
-    1:1:com.android.tools.r8.graph.DexType returnType():410:410 -> J0
-    1:2:void abandonCallSiteOptimizationInfo():1482:1483 -> K
-    1:1:void setObsolete():201:201 -> K0
-    1:1:boolean belongsToDirectPool():634:634 -> L
-    1:1:boolean shouldNotHaveCode():835:835 -> L0
-    1:1:boolean belongsToVirtualPool():638:638 -> M
-    1:7:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():932:938 -> M0
-    8:8:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():175:175 -> M0
-    8:8:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():938 -> M0
-    9:9:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():939:939 -> M0
-    1:2:com.android.tools.r8.graph.DexCode buildEmptyThrowingDexCode():1021:1022 -> N
-    1:8:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1392:1399 -> N0
-    9:11:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1498:1500 -> N0
-    9:11:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1400 -> N0
-    12:12:void setObsolete():201:201 -> N0
-    12:12:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1401 -> N0
-    1:1:void checkIfObsolete():189:189 -> O
-    1:1:void unsetObsolete():247:247 -> O0
-    1:1:void clearGenericSignature():1514:1514 -> P
-    1:2:java.lang.String codeToString():1434:1435 -> Q
-    1:2:java.lang.String descriptor():881:882 -> R
-    1:1:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():206:206 -> S
-    1:2:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo getCallSiteOptimizationInfo():1487:1488 -> T
-    1:3:com.android.tools.r8.cf.CfVersion getClassFileVersion():853:855 -> U
-    1:2:com.android.tools.r8.graph.Code getCode():843:844 -> V
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState getCompilationState():220:220 -> W
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInterfaceMethodImplementation():224:224 -> X
-    1:1:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature getGenericSignature():1505:1505 -> Y
-    1:1:com.android.tools.r8.kotlin.KotlinMethodLevelInfo getKotlinMemberInfo():643:643 -> Z
-    1:1:boolean access$300(com.android.tools.r8.graph.DexEncodedMethod):96:96 -> 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):96:96 -> 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):96:96 -> a
-    4:13:void syntheticSpecify(com.android.tools.r8.utils.structural.StructuralSpecification):353:362 -> a
-    14:20:int compareCodeObject(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.Code,com.android.tools.r8.utils.structural.CompareToVisitor):369:375 -> a
-    21:24:void hashCodeObject(com.android.tools.r8.graph.Code,com.android.tools.r8.utils.structural.HashingVisitor):380:383 -> a
-    25:25:void com.android.tools.r8.utils.structural.StructuralItem.acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):86:86 -> a
-    25:25:void hashCodeObject(com.android.tools.r8.graph.Code,com.android.tools.r8.utils.structural.HashingVisitor):383 -> a
-    26:29:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):423:426 -> a
-    30:36:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):425:431 -> a
-    37:42:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):430:435 -> a
-    43:44:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethod(com.android.tools.r8.graph.DexDefinitionSupplier):452:453 -> a
-    43:44:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):471 -> a
-    45:45:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
-    45:45:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethod(com.android.tools.r8.graph.DexDefinitionSupplier):453 -> a
-    45:45:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):471 -> a
-    46:46:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethod(com.android.tools.r8.graph.DexDefinitionSupplier):455:455 -> a
-    46:46:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):471 -> a
-    47:50:com.android.tools.r8.graph.ProgramMethod asProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):461:464 -> a
-    51:51:boolean isOrWillBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):533:533 -> a
-    52:55:boolean willBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):523:526 -> a
-    52:55:boolean isOrWillBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):533 -> a
-    56:57:void setKotlinMemberInfo(com.android.tools.r8.kotlin.KotlinMethodLevelInfo):656:657 -> a
-    58:60: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):677:679 -> a
-    61:61: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):678:678 -> a
-    62:117: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):687:742 -> a
-    118:118: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):738:738 -> a
-    119:119: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):734:734 -> a
-    120:123: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):727:730 -> a
-    124:127: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):720:723 -> a
-    128: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):713:716 -> a
-    132:135: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):706:709 -> a
-    136:155:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):747:766 -> a
-    156:156:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):763:763 -> a
-    157:157:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):760:760 -> a
-    158:158:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):757:757 -> a
-    159:159:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):754:754 -> a
-    160:178:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):751:769 -> a
-    179:182:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):778:781 -> a
-    183:183:boolean hasParameterInfo():806:806 -> a
-    183:183:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):781 -> a
-    184:185:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):781:782 -> a
-    186:187:void setParameterInfo(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):801:802 -> a
-    186:187:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):782 -> a
-    188:188:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):784:784 -> a
-    189:191:void setCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.graph.AppView):788:790 -> a
-    192:195:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):794:797 -> a
-    196:197:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1464:1465 -> a
-    196:197:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):797 -> a
-    198:198:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):797:797 -> a
-    199:199:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):821:821 -> a
-    200:205:void collectMixedSectionItemsWithCodeMapping(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.dex.MethodToCodeObjectMapping):826:831 -> a
-    206:208:void downgradeClassFileVersion(com.android.tools.r8.cf.CfVersion):870:872 -> a
-    209:217:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):886:894 -> a
-    218:223:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):906:911 -> a
-    224:224:java.lang.String com.android.tools.r8.graph.DexItem.toSmaliString():44:44 -> a
-    224:224:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):911 -> a
-    225:226:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):911:912 -> a
-    227:227:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():114:114 -> a
-    227:227:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():110 -> a
-    227:227:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):912 -> a
-    228:234:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):912:918 -> a
-    235:290:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):342:397 -> a
-    235:290:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):919 -> a
-    291:294:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):919:922 -> a
-    295:304:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):949:958 -> a
-    305:312:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode(com.android.tools.r8.graph.DexMethod):1010:1017 -> a
-    313:313:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):1026:1026 -> a
-    314:329:com.android.tools.r8.graph.CfCode buildInstanceOfCfCode(com.android.tools.r8.graph.DexType,boolean):1032:1047 -> a
-    314:329:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):1027 -> a
-    330:337:com.android.tools.r8.graph.DexCode buildInstanceOfDexCode(com.android.tools.r8.graph.DexType,boolean):1051:1058 -> a
-    330:337:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):1028 -> a
-    338:342:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):1070:1074 -> a
-    343:348:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):1073:1078 -> a
-    349:363:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):1178:1192 -> a
-    364:376:com.android.tools.r8.graph.ProgramMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1197:1209 -> a
-    377:389:com.android.tools.r8.graph.ProgramMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1205:1217 -> a
-    390:392:void lambda$toInitializerForwardingBridge$8(com.android.tools.r8.graph.MethodAccessFlags):1212:1214 -> a
-    393:393:void com.android.tools.r8.graph.MethodAccessFlags.setConstructor():199:199 -> a
-    393:393:void lambda$toInitializerForwardingBridge$8(com.android.tools.r8.graph.MethodAccessFlags):1215 -> a
-    394:394:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.graph.ProgramField,boolean,com.android.tools.r8.graph.DexMethod):1226:1226 -> a
-    395:402:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.graph.ProgramField,boolean,com.android.tools.r8.graph.DexMethod):1223:1230 -> a
-    403:403:com.android.tools.r8.ir.synthetic.FieldAccessorBuilder com.android.tools.r8.ir.synthetic.FieldAccessorBuilder.apply(java.util.function.Consumer):39:39 -> a
-    403:403:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.graph.ProgramField,boolean,com.android.tools.r8.graph.DexMethod):1230 -> a
-    404:414:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.graph.ProgramField,boolean,com.android.tools.r8.graph.DexMethod):1231:1241 -> a
-    415:415: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):296:296 -> a
-    415:415: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):276 -> a
-    415:415:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.graph.ProgramField,boolean,com.android.tools.r8.graph.DexMethod):1241 -> a
-    416:416:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.graph.ProgramField,boolean,com.android.tools.r8.graph.DexMethod):1241:1241 -> a
-    417:418:com.android.tools.r8.graph.DexEncodedMethod toRenamedHolderMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1247:1248 -> a
-    419:419:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):283:283 -> a
-    419:419:com.android.tools.r8.graph.DexEncodedMethod toRenamedHolderMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1248 -> a
-    420:421:com.android.tools.r8.graph.DexEncodedMethod toRenamedHolderMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1248:1249 -> a
-    422:433: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):1260:1271 -> a
-    434:434: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):276:276 -> a
-    434:434: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):1271 -> a
-    435:438:void lambda$toStaticForwardingBridge$9(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.synthetic.ForwardMethodBuilder):1289:1292 -> a
-    439:445:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1321:1327 -> a
-    446:446:void com.android.tools.r8.graph.AccessFlags.demoteFromFinal():234:234 -> a
-    446:446:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1327 -> a
-    447:452:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1328:1333 -> a
-    453:453:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():175:175 -> a
-    453:453:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1333 -> a
-    454:456:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1336:1338 -> a
-    457:457:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode.builder(com.android.tools.r8.graph.DexMethod):24:24 -> a
-    457:457:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1338 -> a
-    458:478:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1340:1360 -> a
-    479:482:void lambda$toForwardingMethod$10(com.android.tools.r8.graph.UseRegistry):1349:1352 -> a
-    483:490:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1365:1372 -> a
-    491:491:void com.android.tools.r8.graph.MethodAccessFlags.unsetAbstract():179:179 -> a
-    491:491:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1373 -> a
-    492:492:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1375:1375 -> a
-    493:493:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode.builder(com.android.tools.r8.graph.DexMethod):24:24 -> a
-    493:493:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1375 -> a
-    494:504:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1376:1386 -> a
-    505:505: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):296:296 -> a
-    505:505: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):276 -> a
-    505:505:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1386 -> a
-    506:517:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1408:1419 -> a
-    518:528:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1418:1428 -> a
-    529:530:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):1477:1478 -> a
-    531:532:void joinCallSiteOptimizationInfo(com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo,com.android.tools.r8.graph.AppView):1493:1494 -> a
-    533:534:void setGenericSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):1509:1510 -> a
-    1:5:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo getMutableOptimizationInfo():1469:1473 -> a0
-    1:1:com.android.tools.r8.graph.Code access$400(com.android.tools.r8.graph.DexEncodedMethod):96:96 -> b
-    2:2:com.android.tools.r8.graph.ParameterAnnotationsList liveParameterAnnotations(com.android.tools.r8.graph.AppView):414:414 -> b
-    3:3:boolean lambda$liveParameterAnnotations$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexAnnotation):415:415 -> b
+    1:50:void <clinit>():98:147 -> <clinit>
+    1:1: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):258:258 -> <init>
+    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):297:297 -> <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):319:319 -> <init>
+    4:177: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):157:330 -> <init>
+    1:1:boolean isSynchronized():518:518 -> A0
+    1:2:boolean isSyntheticMethod():642:643 -> B0
+    1:2:boolean isVirtualMethod():571:572 -> C0
+    1:1:boolean isDexEncodedMethod():1466:1466 -> D
+    1:2:void markNotProcessed():786:787 -> D0
+    1:2:boolean isStatic():628:629 -> E
+    1:1:com.android.tools.r8.graph.DexTypeList parameters():411:411 -> E0
+    1:2:boolean isStaticMember():634:635 -> F
+    1:1:com.android.tools.r8.graph.DexProto proto():415:415 -> F0
+    1:1:com.android.tools.r8.kotlin.KotlinMethodLevelInfo getKotlinMemberInfo():656:656 -> G
+    1:1:com.android.tools.r8.kotlin.KotlinMemberLevelInfo getKotlinMemberInfo():98 -> G
+    1:2:java.lang.String qualifiedName():889:890 -> G0
+    1:2:void removeCode():861:862 -> H0
+    1:1:com.android.tools.r8.graph.DexMember getReference():98:98 -> I
+    1:1:com.android.tools.r8.graph.DexType returnType():419:419 -> I0
+    1:2:void abandonCallSiteOptimizationInfo():1504:1505 -> J
+    1:1:void setObsolete():202:202 -> J0
+    1:1:boolean belongsToDirectPool():647:647 -> K
+    1:1:boolean shouldNotHaveCode():848:848 -> K0
+    1:8:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():1019:1026 -> L
+    1:7:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():945:951 -> L0
+    8:8:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():171:171 -> L0
+    8:8:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():951 -> L0
+    9:9:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():952:952 -> L0
+    1:2:com.android.tools.r8.graph.DexCode buildEmptyThrowingDexCode():1030:1031 -> M
+    1:8:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1414:1421 -> M0
+    9:11:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1520:1522 -> M0
+    9:11:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1422 -> M0
+    12:12:void setObsolete():202:202 -> M0
+    12:12:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1423 -> M0
+    1:1:void checkIfObsolete():190:190 -> N
+    1:1:void unsetObsolete():248:248 -> N0
+    1:1:void clearGenericSignature():1536:1536 -> O
+    1:2:java.lang.String codeToString():1456:1457 -> P
+    1:2:java.lang.String descriptor():894:895 -> Q
+    1:1:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():207:207 -> R
+    1:2:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo getCallSiteOptimizationInfo():1509:1510 -> S
+    1:3:com.android.tools.r8.cf.CfVersion getClassFileVersion():866:868 -> T
+    1:2:com.android.tools.r8.graph.Code getCode():856:857 -> U
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState getCompilationState():221:221 -> V
+    1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInterfaceMethodImplementation():225:225 -> W
+    1:1:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature getGenericSignature():1527:1527 -> X
+    1:1:com.android.tools.r8.kotlin.KotlinMethodLevelInfo getKotlinMemberInfo():656:656 -> Y
+    1:5:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo getMutableOptimizationInfo():1491:1495 -> Z
+    1:1:boolean access$300(com.android.tools.r8.graph.DexEncodedMethod):98:98 -> 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):98:98 -> 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):98:98 -> a
+    4:13:void syntheticSpecify(com.android.tools.r8.utils.structural.StructuralSpecification):344:353 -> a
+    14:14:void hashSyntheticContent(com.android.tools.r8.com.google.common.hash.Hasher,com.android.tools.r8.utils.structural.RepresentativeMap):360:360 -> a
+    15:15:com.android.tools.r8.graph.DexType lambda$syntheticCompareTo$8(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):370:370 -> a
+    16:22:int compareCodeObject(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.Code,com.android.tools.r8.utils.structural.CompareToVisitor):376:382 -> a
+    23:28:void hashCodeObject(com.android.tools.r8.graph.Code,com.android.tools.r8.utils.structural.HashingVisitor):387:392 -> a
+    29:32:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):432:435 -> a
+    33:39:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):434:440 -> a
+    40:45:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):439:444 -> a
+    46:47:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethod(com.android.tools.r8.graph.DexDefinitionSupplier):461:462 -> a
+    46:47:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):480 -> a
+    48:48:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
+    48:48:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethod(com.android.tools.r8.graph.DexDefinitionSupplier):462 -> a
+    48:48:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):480 -> a
+    49:49:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethod(com.android.tools.r8.graph.DexDefinitionSupplier):464:464 -> a
+    49:49:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):480 -> a
+    50:53:com.android.tools.r8.graph.ProgramMethod asProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):470:473 -> a
+    54:54:boolean isOrWillBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):546:546 -> a
+    55:57:boolean willBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):536:538 -> a
+    55:57:boolean isOrWillBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):546 -> a
+    58:58:boolean isPrivate():510:510 -> a
+    58:58:boolean willBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):538 -> a
+    58:58:boolean isOrWillBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):546 -> a
+    59:60:boolean willBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):538:539 -> a
+    59:60:boolean isOrWillBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):546 -> a
+    61:62:void setKotlinMemberInfo(com.android.tools.r8.kotlin.KotlinMethodLevelInfo):669:670 -> a
+    63:65: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):690:692 -> a
+    66:66: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):691:691 -> a
+    67:122: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):700:755 -> a
+    123:123: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):751:751 -> a
+    124:124: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):747:747 -> a
+    125:128: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):740:743 -> a
+    129: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):733:736 -> 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):726:729 -> 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):719:722 -> a
+    141:160:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):760:779 -> a
+    161:161:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):776:776 -> a
+    162:162:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):773:773 -> a
+    163:163:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):770:770 -> a
+    164:164:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):767:767 -> a
+    165:183:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):764:782 -> a
+    184:187:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):791:794 -> a
+    188:188:boolean hasParameterInfo():819:819 -> a
+    188:188:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):794 -> a
+    189:190:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):794:795 -> a
+    191:192:void setParameterInfo(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):814:815 -> a
+    191:192:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):795 -> a
+    193:193:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):797:797 -> a
+    194:196:void setCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.graph.AppView):801:803 -> a
+    197:200:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):807:810 -> a
+    201:202:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1486:1487 -> a
+    201:202:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):810 -> a
+    203:203:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):810:810 -> a
+    204:204:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):834:834 -> a
+    205:210:void collectMixedSectionItemsWithCodeMapping(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.dex.MethodToCodeObjectMapping):839:844 -> a
+    211:213:void downgradeClassFileVersion(com.android.tools.r8.cf.CfVersion):883:885 -> a
+    214:222:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):899:907 -> a
+    223:228:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):919:924 -> a
+    229:229:java.lang.String com.android.tools.r8.graph.DexItem.toSmaliString():44:44 -> a
+    229:229:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):924 -> a
+    230:231:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):924:925 -> a
+    232:232:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():114:114 -> a
+    232:232:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():110 -> a
+    232:232:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):925 -> a
+    233:239:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):925:931 -> a
+    240:295:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):342:397 -> a
+    240:295:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):932 -> a
+    296:299:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):932:935 -> a
+    300:309:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):962:971 -> a
+    310:310:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):1035:1035 -> a
+    311:326:com.android.tools.r8.graph.CfCode buildInstanceOfCfCode(com.android.tools.r8.graph.DexType,boolean):1041:1056 -> a
+    311:326:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):1036 -> a
+    327:334:com.android.tools.r8.graph.DexCode buildInstanceOfDexCode(com.android.tools.r8.graph.DexType,boolean):1060:1067 -> a
+    327:334:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):1037 -> a
+    335:339:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):1079:1083 -> a
+    340:345:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):1082:1087 -> a
+    346:360:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):1187:1201 -> a
+    361:367:com.android.tools.r8.graph.ProgramMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1205:1211 -> a
+    368:368:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode.builder(com.android.tools.r8.graph.DexMethod):24:24 -> a
+    368:368:com.android.tools.r8.graph.ProgramMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1211 -> a
+    369:382:com.android.tools.r8.graph.ProgramMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1212:1225 -> a
+    383:383:void com.android.tools.r8.graph.MethodAccessFlags.setConstructor():195:195 -> a
+    383:383:com.android.tools.r8.graph.ProgramMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1225 -> a
+    384:384:com.android.tools.r8.graph.ProgramMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1226:1226 -> a
+    385:390: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):1231:1236 -> a
+    391:420: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):1233:1262 -> a
+    421:421: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):297:297 -> a
+    421:421: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):277 -> a
+    421:421: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):1262 -> a
+    422:422: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):1262:1262 -> a
+    423:423:com.android.tools.r8.ir.conversion.SourceCode lambda$createFieldAccessorBridge$11(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.ir.code.Position):1241:1241 -> a
+    424:427:void lambda$createFieldAccessorBridge$12(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):1244:1247 -> a
+    428:428:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstance():498:498 -> a
+    428:428:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():514 -> a
+    428:428:void lambda$createFieldAccessorBridge$12(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):1248 -> a
+    429:429:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():514:514 -> a
+    429:429:void lambda$createFieldAccessorBridge$12(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):1248 -> a
+    430:432:void lambda$createFieldAccessorBridge$12(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):1249:1251 -> a
+    433:433:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isStaticPut():506:506 -> a
+    433:433:void lambda$createFieldAccessorBridge$12(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):1251 -> a
+    434:435:void lambda$createFieldAccessorBridge$12(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):1251:1252 -> a
+    436:437:com.android.tools.r8.graph.DexEncodedMethod toRenamedHolderMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1268:1269 -> a
+    438:438:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):278:278 -> a
+    438:438:com.android.tools.r8.graph.DexEncodedMethod toRenamedHolderMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1269 -> a
+    439:440:com.android.tools.r8.graph.DexEncodedMethod toRenamedHolderMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1269:1270 -> a
+    441:452: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):1281:1292 -> a
+    453:453: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):277:277 -> a
+    453:453: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):1292 -> a
+    454:464:com.android.tools.r8.graph.DexEncodedMethod toPrivateSyntheticMethod(com.android.tools.r8.graph.DexMethod):1329:1339 -> a
+    465:471:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1343:1349 -> a
+    472:472:void com.android.tools.r8.graph.AccessFlags.demoteFromFinal():234:234 -> a
+    472:472:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1349 -> a
+    473:478:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1350:1355 -> a
+    479:479:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():171:171 -> a
+    479:479:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1355 -> a
+    480:480:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1358:1358 -> a
+    481:481:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    481:481:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1358 -> a
+    482:482:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1360:1360 -> a
+    483:483:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode.builder(com.android.tools.r8.graph.DexMethod):24:24 -> a
+    483:483:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1360 -> a
+    484:504:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1362:1382 -> a
+    505:508:void lambda$toForwardingMethod$14(com.android.tools.r8.graph.UseRegistry):1371:1374 -> a
+    509:516:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1387:1394 -> a
+    517:517:void com.android.tools.r8.graph.MethodAccessFlags.unsetAbstract():175:175 -> a
+    517:517:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1395 -> a
+    518:518:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1397:1397 -> a
+    519:519:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode.builder(com.android.tools.r8.graph.DexMethod):24:24 -> a
+    519:519:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1397 -> a
+    520:530:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1398:1408 -> a
+    531:531: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):277:277 -> a
+    531:531:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1408 -> a
+    532:543:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1430:1441 -> a
+    544:554:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1440:1450 -> a
+    555:556:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):1499:1500 -> a
+    557:558:void joinCallSiteOptimizationInfo(com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo,com.android.tools.r8.graph.AppView):1515:1516 -> a
+    559:560:void setGenericSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):1531:1532 -> a
+    1:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1486:1487 -> a0
+    1:1:com.android.tools.r8.graph.Code access$400(com.android.tools.r8.graph.DexEncodedMethod):98:98 -> b
+    2:2:com.android.tools.r8.graph.ParameterAnnotationsList liveParameterAnnotations(com.android.tools.r8.graph.AppView):423:423 -> b
+    3:3:boolean lambda$liveParameterAnnotations$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexAnnotation):424:424 -> b
     4:5:boolean com.android.tools.r8.shaking.AnnotationRemover.isAnnotationTypeLive(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.AppView):138:139 -> b
     4:5: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
-    4:5:boolean lambda$liveParameterAnnotations$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexAnnotation):415 -> b
+    4:5:boolean lambda$liveParameterAnnotations$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexAnnotation):424 -> b
     6:6: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
-    6:6:boolean lambda$liveParameterAnnotations$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexAnnotation):415 -> b
-    7:9:boolean isProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):439:441 -> b
-    10:12:void upgradeClassFileVersion(com.android.tools.r8.cf.CfVersion):864:866 -> b
-    13:13:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):968:968 -> b
-    14:16:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():987:989 -> b
-    14:16:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):969 -> b
-    17:17:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():1006:1006 -> b
-    17:17:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():990 -> b
-    17:17:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):969 -> b
-    18:22:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():990:994 -> b
-    18:22:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):969 -> b
-    23:23:void setObsolete():201:201 -> b
-    23:23:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():995 -> b
-    23:23:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):969 -> b
-    24:31:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodDex(boolean):974:981 -> b
-    24:31:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):970 -> b
-    32:32:void setObsolete():201:201 -> b
-    32:32:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodDex(boolean):982 -> b
-    32:32:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):970 -> b
-    33:41:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1278:1286 -> b
-    42:42:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.apply(java.util.function.Consumer):60:60 -> b
-    42:42:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1287 -> b
-    43:43:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1295:1295 -> b
-    44:44:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1284:1284 -> b
-    45:45:com.android.tools.r8.graph.MethodAccessFlags$Builder com.android.tools.r8.graph.MethodAccessFlags.builder():65:65 -> b
-    45:45:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1297 -> b
-    46:46:com.android.tools.r8.graph.MethodAccessFlags$Builder com.android.tools.r8.graph.MethodAccessFlags$Builder.setBridge():233:233 -> b
-    46:46:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1298 -> b
-    47:47:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1299:1299 -> b
-    48:50:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.AccessFlags$BuilderBase.setPublic(boolean):343:345 -> b
-    48:50:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.MethodAccessFlags$Builder.setPublic(boolean):0 -> b
-    48:50:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1299 -> b
-    51:51:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.AccessFlags$BuilderBase.setStatic():351:351 -> b
-    51:51:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.MethodAccessFlags$Builder.setStatic():0 -> b
-    51:51:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1300 -> b
-    52:52:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.AccessFlags$BuilderBase.setSynthetic():356:356 -> b
-    52:52:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1301 -> b
-    53:53:com.android.tools.r8.graph.AccessFlags com.android.tools.r8.graph.AccessFlags$BuilderBase.build():361:361 -> b
-    53:53:com.android.tools.r8.graph.AccessFlags com.android.tools.r8.graph.MethodAccessFlags$Builder.build():0 -> b
-    53:53:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1302 -> b
-    54:54:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1302:1302 -> b
-    55:62:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1296:1303 -> b
-    63:73:com.android.tools.r8.graph.DexEncodedMethod toPrivateSyntheticMethod(com.android.tools.r8.graph.DexMethod):1307:1317 -> b
-    1:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1464:1465 -> b0
-    1:1:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo access$500(com.android.tools.r8.graph.DexEncodedMethod):96:96 -> c
-    2:3:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1062:1063 -> c
-    4:8:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):1083:1087 -> c
-    4:8:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1063 -> c
-    9:16:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):1086:1093 -> c
-    9:16:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1063 -> c
-    17:23:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):1092:1098 -> c
-    17:23:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1063 -> c
-    24:39:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):1096:1111 -> c
-    24:39:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1063 -> c
-    40:40:void setObsolete():201:201 -> c
-    40:40:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):1112 -> c
-    40:40:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1063 -> c
-    41:41:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):1113:1113 -> c
-    41:41:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1063 -> c
-    42:42:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1065:1065 -> c
-    43:47:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1117:1121 -> c
-    43:47:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1065 -> c
-    48:56:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1120:1128 -> c
-    48:56:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1065 -> c
-    57:65:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1125:1133 -> c
-    57:65:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1065 -> c
-    66:74:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1130:1138 -> c
-    66:74:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1065 -> c
-    75:79:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1136:1140 -> c
-    75:79:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1065 -> c
-    80:81:boolean isStaticMember():621:622 -> c
-    80:81:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1141 -> c
-    80:81:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1065 -> c
-    82:104:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1145:1167 -> c
-    82:104:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1065 -> c
-    105:105:void setObsolete():201:201 -> c
-    105:105:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1168 -> c
-    105:105:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1065 -> c
-    106:106:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1169:1169 -> c
-    106:106:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1065 -> c
-    107:108:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod):1173:1174 -> c
-    1:1:java.util.Map getParameterInfo():810:810 -> c0
-    1:1:com.android.tools.r8.kotlin.KotlinMethodLevelInfo access$600(com.android.tools.r8.graph.DexEncodedMethod):96:96 -> d
-    1:1:com.android.tools.r8.graph.DexTypeList getParameters():402:402 -> d0
-    2:2:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethod.getParameters():58:58 -> d0
-    2:2:com.android.tools.r8.graph.DexTypeList getParameters():402 -> d0
-    1:1:com.android.tools.r8.cf.CfVersion access$700(com.android.tools.r8.graph.DexEncodedMethod):96:96 -> e
-    1:1:com.android.tools.r8.graph.DexProto getProto():388:388 -> e0
-    2:2:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexMethod.getProto():62:62 -> e0
-    2:2:com.android.tools.r8.graph.DexProto getProto():388 -> e0
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():347:347 -> f
-    2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder builder(com.android.tools.r8.graph.DexEncodedMethod):1522:1522 -> f
-    1:2:com.android.tools.r8.graph.DexMethod getReference():393:394 -> f0
-    1:3:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1498:1500 -> g
-    1:2:boolean hasAnnotation():1455:1456 -> g0
-    1:1:com.android.tools.r8.graph.AccessFlags getAccessFlags():96:96 -> getAccessFlags
-    1:1:com.android.tools.r8.graph.DexMethod lambda$syntheticSpecify$0(com.android.tools.r8.graph.DexEncodedMethod):353:353 -> h
-    1:2:boolean hasClassFileVersion():859:860 -> h0
-    1:1:com.android.tools.r8.graph.MethodAccessFlags lambda$syntheticSpecify$1(com.android.tools.r8.graph.DexEncodedMethod):354:354 -> i
-    1:1:boolean hasCode():839:839 -> i0
-    1:1:com.android.tools.r8.graph.ParameterAnnotationsList lambda$syntheticSpecify$2(com.android.tools.r8.graph.DexEncodedMethod):356:356 -> j
-    1:1:boolean hasParameterInfo():806:806 -> j0
-    com.android.tools.r8.utils.structural.StructuralItem self() -> k
-    1:1:com.android.tools.r8.cf.CfVersion lambda$syntheticSpecify$3(com.android.tools.r8.graph.DexEncodedMethod):357:357 -> k
-    1:1:boolean isAbstract():485:485 -> k0
-    1:1:boolean lambda$syntheticSpecify$4(com.android.tools.r8.graph.DexEncodedMethod):358:358 -> l
-    1:2:boolean isClassInitializer():542:543 -> l0
-    1:1:boolean lambda$syntheticSpecify$5(com.android.tools.r8.graph.DexEncodedMethod):360:360 -> m
-    1:1:boolean isD8R8Synthesized():185:185 -> m0
-    1:1:boolean lambda$syntheticSpecify$6(com.android.tools.r8.graph.DexEncodedMethod):361:361 -> n
-    1:1:boolean isDefaultMethod():548:548 -> n0
-    1:5:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):228:232 -> o
-    6:6:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():175:175 -> o
-    6:6:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):232 -> o
-    7:8:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):233:234 -> o
-    1:2:boolean isDirectMethod():605:606 -> o0
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder syntheticBuilder(com.android.tools.r8.graph.DexEncodedMethod):1518:1518 -> p
-    1:1:boolean isFinal():493:493 -> p0
-    1:2:boolean isInitializer():509:510 -> q0
-    1:2:boolean isInstanceInitializer():514:515 -> r0
-    1:2:java.lang.String toSourceString():927:928 -> s
-    1:1:com.android.tools.r8.utils.OptionalBool isLibraryMethodOverride():419:419 -> s0
-    1:1:boolean isNative():497:497 -> t0
-    1:2:java.lang.String toString():815:816 -> toString
-    1:2:boolean isNonAbstractNonNativeMethod():577:578 -> u0
-    1:2:boolean isNonAbstractVirtualMethod():572:573 -> v0
-    1:2:boolean isNonPrivateVirtualMethod():563:564 -> w0
-    1:1:com.android.tools.r8.graph.DexEncodedMethod asDexEncodedMethod():1450:1450 -> x
-    1:1:boolean isObsolete():195:195 -> x0
-    1:1:boolean isOnlyInlinedIntoNestMembers():669:669 -> y0
-    1:1:com.android.tools.r8.graph.DexReference getReference():96:96 -> z
-    1:2:boolean isPrivateMethod():597:598 -> z0
-com.android.tools.r8.graph.DexEncodedMethod$1 -> com.android.tools.r8.graph.M$a:
+    6:6:boolean lambda$liveParameterAnnotations$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexAnnotation):424 -> b
+    7:9:boolean isProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):448:450 -> b
+    10:12:void upgradeClassFileVersion(com.android.tools.r8.cf.CfVersion):877:879 -> b
+    13:13:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):981:981 -> b
+    14:21:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():1000:1007 -> b
+    14:21:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):982 -> b
+    22:22:void setObsolete():202:202 -> b
+    22:22:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():1008 -> b
+    22:22:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):982 -> b
+    23:30:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodDex(boolean):987:994 -> b
+    23:30:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):983 -> b
+    31:31:void setObsolete():202:202 -> b
+    31:31:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodDex(boolean):995 -> b
+    31:31:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):983 -> b
+    32:33:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod):1182:1183 -> b
+    34:34:void lambda$toInitializerForwardingBridge$10(com.android.tools.r8.graph.UseRegistry):1220:1220 -> b
+    35:40:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1298:1303 -> b
+    41:41:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode.builder(com.android.tools.r8.graph.DexMethod):24:24 -> b
+    41:41:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1303 -> b
+    42:62:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1305:1325 -> b
+    1:1:java.util.Map getParameterInfo():823:823 -> b0
+    1:1:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo access$500(com.android.tools.r8.graph.DexEncodedMethod):98:98 -> c
+    2:3:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1071:1072 -> c
+    4:8:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):1092:1096 -> c
+    4:8:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1072 -> c
+    9:16:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):1095:1102 -> c
+    9:16:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1072 -> c
+    17:23:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):1101:1107 -> c
+    17:23:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1072 -> c
+    24:39:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):1105:1120 -> c
+    24:39:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1072 -> c
+    40:40:void setObsolete():202:202 -> c
+    40:40:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):1121 -> c
+    40:40:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1072 -> c
+    41:41:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):1122:1122 -> c
+    41:41:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1072 -> c
+    42:42:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1074:1074 -> c
+    43:47:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1126:1130 -> c
+    43:47:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1074 -> c
+    48:56:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1129:1137 -> c
+    48:56:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1074 -> c
+    57:65:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1134:1142 -> c
+    57:65:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1074 -> c
+    66:74:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1139:1147 -> c
+    66:74:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1074 -> c
+    75:79:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1145:1149 -> c
+    75:79:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1074 -> c
+    80:81:boolean isStaticMember():634:635 -> c
+    80:81:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1150 -> c
+    80:81:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1074 -> c
+    82:104:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1154:1176 -> c
+    82:104:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1074 -> c
+    105:105:void setObsolete():202:202 -> c
+    105:105:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1177 -> c
+    105:105:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1074 -> c
+    106:106:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1178:1178 -> c
+    106:106:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1074 -> c
+    107:110:void lambda$toStaticForwardingBridge$13(com.android.tools.r8.graph.UseRegistry):1313:1316 -> c
+    1:2:com.android.tools.r8.graph.DexMethod getReference():402:403 -> c0
+    1:1:com.android.tools.r8.kotlin.KotlinMethodLevelInfo access$600(com.android.tools.r8.graph.DexEncodedMethod):98:98 -> d
+    1:2:boolean hasAnnotation():1477:1478 -> d0
+    1:1:com.android.tools.r8.cf.CfVersion access$700(com.android.tools.r8.graph.DexEncodedMethod):98:98 -> e
+    1:2:boolean hasClassFileVersion():872:873 -> e0
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder builder(com.android.tools.r8.graph.DexEncodedMethod):1544:1544 -> f
+    1:1:boolean hasCode():852:852 -> f0
+    1:3:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1520:1522 -> g
+    1:1:boolean hasParameterInfo():819:819 -> g0
+    1:1:com.android.tools.r8.graph.AccessFlags getAccessFlags():98:98 -> getAccessFlags
+    1:1:com.android.tools.r8.graph.DexMethod lambda$syntheticSpecify$0(com.android.tools.r8.graph.DexEncodedMethod):344:344 -> h
+    1:1:boolean isAbstract():494:494 -> h0
+    1:1:com.android.tools.r8.graph.MethodAccessFlags lambda$syntheticSpecify$1(com.android.tools.r8.graph.DexEncodedMethod):345:345 -> i
+    1:2:boolean isClassInitializer():555:556 -> i0
+    1:1:com.android.tools.r8.graph.DexAnnotationSet lambda$syntheticSpecify$2(com.android.tools.r8.graph.DexEncodedMethod):346:346 -> j
+    1:1:boolean isD8R8Synthesized():186:186 -> j0
+    1:1:com.android.tools.r8.graph.ParameterAnnotationsList lambda$syntheticSpecify$3(com.android.tools.r8.graph.DexEncodedMethod):347:347 -> k
+    1:1:boolean isDefaultMethod():561:561 -> k0
+    1:1:com.android.tools.r8.cf.CfVersion lambda$syntheticSpecify$4(com.android.tools.r8.graph.DexEncodedMethod):348:348 -> l
+    1:2:boolean isDirectMethod():618:619 -> l0
+    1:1:boolean lambda$syntheticSpecify$5(com.android.tools.r8.graph.DexEncodedMethod):349:349 -> m
+    1:1:boolean isFinal():502:502 -> m0
+    1:1:boolean lambda$syntheticSpecify$6(com.android.tools.r8.graph.DexEncodedMethod):351:351 -> n
+    1:2:boolean isInitializer():522:523 -> n0
+    1:1:boolean lambda$syntheticSpecify$7(com.android.tools.r8.graph.DexEncodedMethod):352:352 -> o
+    1:2:boolean isInstanceInitializer():527:528 -> o0
+    1:5:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):229:233 -> p
+    6:6:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():171:171 -> p
+    6:6:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):233 -> p
+    7:8:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):234:235 -> p
+    1:1:com.android.tools.r8.utils.OptionalBool isLibraryMethodOverride():428:428 -> p0
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder syntheticBuilder(com.android.tools.r8.graph.DexEncodedMethod):1540:1540 -> q
+    1:1:boolean isNative():506:506 -> q0
+    1:2:int syntheticCompareTo(com.android.tools.r8.graph.DexEncodedMethod):370:371 -> r
+    1:2:boolean isNonAbstractNonNativeMethod():590:591 -> r0
+    1:2:java.lang.String toSourceString():940:941 -> s
+    1:2:boolean isNonAbstractVirtualMethod():585:586 -> s0
+    1:2:boolean isNonPrivateVirtualMethod():576:577 -> t0
+    1:2:java.lang.String toString():828:829 -> toString
+    1:1:boolean isObsolete():196:196 -> u0
+    1:1:boolean isOnlyInlinedIntoNestMembers():682:682 -> v0
+    1:2:boolean isPrivateMethod():610:611 -> w0
+    1:1:com.android.tools.r8.graph.DexEncodedMethod asDexEncodedMethod():1472:1472 -> x
+    1:2:boolean isProcessed():489:490 -> x0
+    1:2:boolean isPublicMethod():600:601 -> y0
+    1:1:com.android.tools.r8.graph.DexReference getReference():98:98 -> z
+    1:2:boolean isPublicized():595:596 -> z0
+com.android.tools.r8.graph.DexEncodedMethod$1 -> com.android.tools.r8.graph.L$a:
     int[] $SwitchMap$com$android$tools$r8$ir$optimize$Inliner$Constraint -> b
     int[] $SwitchMap$com$android$tools$r8$graph$DexEncodedMethod$CompilationState -> a
-    1:1:void <clinit>():749:749 -> <clinit>
-    2:2:void <clinit>():701:701 -> <clinit>
-com.android.tools.r8.graph.DexEncodedMethod$Builder -> com.android.tools.r8.graph.M$b:
+    1:1:void <clinit>():762:762 -> <clinit>
+    2:2:void <clinit>():714:714 -> <clinit>
+com.android.tools.r8.graph.DexEncodedMethod$Builder -> com.android.tools.r8.graph.L$b:
     com.android.tools.r8.graph.ParameterAnnotationsList parameterAnnotations -> g
     boolean d8R8Synthesized -> m
     com.android.tools.r8.graph.GenericSignature$MethodTypeSignature genericSignature -> d
@@ -18810,38 +18796,36 @@
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState compilationState -> i
     com.android.tools.r8.graph.MethodAccessFlags accessFlags -> c
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():1525:1525 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$1):1525:1525 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod,boolean,com.android.tools.r8.graph.DexEncodedMethod$1):1525:1525 -> <init>
-    3:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod):1541:1541 -> <init>
-    4:4:void <init>(com.android.tools.r8.graph.DexEncodedMethod,boolean):1544:1544 -> <init>
-    5:40:void <init>(com.android.tools.r8.graph.DexEncodedMethod,boolean):1531:1566 -> <init>
-    41:41:void <init>(com.android.tools.r8.graph.DexEncodedMethod,boolean):1562:1562 -> <init>
-    1:1:com.android.tools.r8.graph.MethodAccessFlags access$000(com.android.tools.r8.graph.DexEncodedMethod$Builder):1525:1525 -> a
-    2:3:com.android.tools.r8.graph.DexEncodedMethod$Builder fixupOptimizationInfo(java.util.function.Consumer):1571:1572 -> a
-    4:4:com.android.tools.r8.graph.DexEncodedMethod$Builder setAccessFlags(com.android.tools.r8.graph.MethodAccessFlags):1583:1583 -> a
-    5:5:com.android.tools.r8.graph.DexEncodedMethod$Builder setMethod(com.android.tools.r8.graph.DexMethod):1588:1588 -> a
-    6:7:com.android.tools.r8.graph.DexEncodedMethod$Builder setCompilationState(com.android.tools.r8.graph.DexEncodedMethod$CompilationState):1593:1594 -> a
-    8:9:com.android.tools.r8.graph.DexEncodedMethod$Builder setIsLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):1599:1600 -> a
-    10:29:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1623:1642 -> a
-    30:30:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1618:1618 -> a
-    30:30:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1642 -> a
-    31:33:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1645:1647 -> a
-    34:34:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1618:1618 -> a
-    34:34:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1645 -> a
-    35:37:com.android.tools.r8.graph.DexEncodedMethod$Builder adjustOptimizationInfoAfterRemovingThisParameter():1667:1669 -> a
-    38:38:com.android.tools.r8.graph.DexEncodedMethod$Builder setCode(com.android.tools.r8.graph.Code):1675:1675 -> a
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder modifyAccessFlags(java.util.function.Consumer):1578:1578 -> b
-    2:7:com.android.tools.r8.graph.DexEncodedMethod build():1680:1685 -> b
-    8:10:com.android.tools.r8.graph.DexEncodedMethod build():1684:1686 -> b
-    11:11: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):296:296 -> b
-    11:11:com.android.tools.r8.graph.DexEncodedMethod build():1686 -> b
-    12:16:com.android.tools.r8.graph.DexEncodedMethod build():1696:1700 -> b
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1652:1652 -> c
+    1:1:void <clinit>():1547:1547 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$1):1547:1547 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod,boolean,com.android.tools.r8.graph.DexEncodedMethod$1):1547:1547 -> <init>
+    3:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod):1563:1563 -> <init>
+    4:4:void <init>(com.android.tools.r8.graph.DexEncodedMethod,boolean):1566:1566 -> <init>
+    5:40:void <init>(com.android.tools.r8.graph.DexEncodedMethod,boolean):1553:1588 -> <init>
+    41:41:void <init>(com.android.tools.r8.graph.DexEncodedMethod,boolean):1584:1584 -> <init>
+    1:1:com.android.tools.r8.graph.MethodAccessFlags access$000(com.android.tools.r8.graph.DexEncodedMethod$Builder):1547:1547 -> a
+    2:3:com.android.tools.r8.graph.DexEncodedMethod$Builder fixupOptimizationInfo(java.util.function.Consumer):1593:1594 -> a
+    4:4:void setMethod(com.android.tools.r8.graph.DexMethod):1604:1604 -> a
+    5:6:com.android.tools.r8.graph.DexEncodedMethod$Builder setCompilationState(com.android.tools.r8.graph.DexEncodedMethod$CompilationState):1608:1609 -> a
+    7:8:com.android.tools.r8.graph.DexEncodedMethod$Builder setIsLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):1614:1615 -> a
+    9:28:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1638:1657 -> a
+    29:29:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1633:1633 -> a
+    29:29:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1657 -> a
+    30:32:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1660:1662 -> a
+    33:33:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1633:1633 -> a
+    33:33:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1660 -> a
+    34:36:com.android.tools.r8.graph.DexEncodedMethod$Builder adjustOptimizationInfoAfterRemovingThisParameter():1682:1684 -> a
+    37:37:void setCode(com.android.tools.r8.graph.Code):1690:1690 -> a
+    1:6:com.android.tools.r8.graph.DexEncodedMethod build():1694:1699 -> b
+    7:9:com.android.tools.r8.graph.DexEncodedMethod build():1698:1700 -> 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):297:297 -> b
+    10:10:com.android.tools.r8.graph.DexEncodedMethod build():1700 -> b
+    11:15:com.android.tools.r8.graph.DexEncodedMethod build():1710:1714 -> b
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1667:1667 -> c
     2:2:void com.android.tools.r8.graph.AccessFlags.promoteToStatic():247:247 -> c
-    2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1652 -> c
-    1:5:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter():1657:1661 -> d
-com.android.tools.r8.graph.DexEncodedMethod$CompilationState -> com.android.tools.r8.graph.M$c:
+    2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1667 -> c
+    1:5:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter():1672:1676 -> d
+com.android.tools.r8.graph.DexEncodedMethod$CompilationState -> com.android.tools.r8.graph.L$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
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState PROCESSED_NOT_INLINING_CANDIDATE -> b
@@ -18850,57 +18834,50 @@
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState PROCESSED_INLINING_CANDIDATE_SAME_PACKAGE -> e
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState NOT_PROCESSED -> a
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState[] $VALUES -> h
-    1:24:void <clinit>():111:134 -> <clinit>
-    25:25:void <clinit>():107:107 -> <clinit>
-    1:1:void <init>(java.lang.String,int):107:107 -> <init>
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState[] values():107:107 -> a
-com.android.tools.r8.graph.DexField -> com.android.tools.r8.graph.N:
+    1:24:void <clinit>():112:135 -> <clinit>
+    25:25:void <clinit>():108:108 -> <clinit>
+    1:1:void <init>(java.lang.String,int):108:108 -> <init>
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState[] values():108:108 -> a
+com.android.tools.r8.graph.DexField -> com.android.tools.r8.graph.M:
     com.android.tools.r8.graph.DexType type -> h
-    1:5:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,boolean):26:30 -> <init>
-    1:1:java.lang.Iterable getReferencedTypes():150:150 -> D
-    1:5:com.android.tools.r8.references.FieldReference asFieldReference():195:195 -> E
-    1:1:com.android.tools.r8.graph.DexType getType():49:49 -> F
-    1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):21:21 -> a
-    2:2:int acceptCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.structural.CompareToVisitor):155:155 -> a
-    2:2:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):21 -> a
-    3:3:com.android.tools.r8.graph.DexClassAndMember lookupMemberOnClass(com.android.tools.r8.graph.DexClass):21:21 -> a
-    4:4:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):35:35 -> a
-    5:5:java.lang.Object apply(java.util.function.Function,java.util.function.Function):73:73 -> a
-    6:6:java.lang.Object apply(java.util.function.Function,java.util.function.Function,java.util.function.Function):81:81 -> a
-    7:7:void accept(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):89:89 -> a
-    8:8:void accept(java.util.function.BiConsumer,java.util.function.BiConsumer,java.util.function.BiConsumer,java.lang.Object):98:98 -> a
-    9:12:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):126:129 -> a
-    13:13:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):265:265 -> a
-    13:13:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):129 -> a
-    14:14:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):135:135 -> a
-    15:15:boolean match(com.android.tools.r8.graph.DexEncodedField):165:165 -> a
-    16:16:boolean match(com.android.tools.r8.graph.DexField):160:160 -> a
-    16:16:boolean match(com.android.tools.r8.graph.DexEncodedField):165 -> a
-    17:17:com.android.tools.r8.graph.DexField withHolder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):183:183 -> a
-    18:18:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):282:282 -> a
-    18:18:com.android.tools.r8.graph.ProgramField lookupOnProgramClass(com.android.tools.r8.graph.DexProgramClass):68 -> a
-    18:18:com.android.tools.r8.graph.ProgramMember lookupOnProgramClass(com.android.tools.r8.graph.DexProgramClass):21 -> a
-    19:19:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.toProgramFieldOrNull(com.android.tools.r8.graph.DexEncodedField):291:291 -> a
-    19:19:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):282 -> a
-    19:19:com.android.tools.r8.graph.ProgramField lookupOnProgramClass(com.android.tools.r8.graph.DexProgramClass):68 -> a
-    19:19:com.android.tools.r8.graph.ProgramMember lookupOnProgramClass(com.android.tools.r8.graph.DexProgramClass):21 -> a
-    1:1:com.android.tools.r8.graph.DexEncodedMember lookupOnClass(com.android.tools.r8.graph.DexClass):21:21 -> b
-    1:1:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.lookupClassField(com.android.tools.r8.graph.DexField):459:459 -> c
-    1:1:com.android.tools.r8.graph.DexClassAndField lookupMemberOnClass(com.android.tools.r8.graph.DexClass):63 -> c
-    2:2:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.toClassFieldOrNull(com.android.tools.r8.graph.DexEncodedField):463:463 -> c
-    2:2:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.lookupClassField(com.android.tools.r8.graph.DexField):459 -> c
-    2:2:com.android.tools.r8.graph.DexClassAndField lookupMemberOnClass(com.android.tools.r8.graph.DexClass):63 -> c
-    1:1:com.android.tools.r8.graph.DexEncodedField lookupOnClass(com.android.tools.r8.graph.DexClass):58:58 -> d
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():45:45 -> f
-    1:5:boolean computeEquals(java.lang.Object):110:114 -> g
+    1:5:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,boolean):23:27 -> <init>
+    1:1:java.lang.Iterable getReferencedTypes():138:138 -> D
+    1:5:com.android.tools.r8.references.FieldReference asFieldReference():183:183 -> E
+    1:1:com.android.tools.r8.graph.DexType getType():46:46 -> F
+    1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):18:18 -> a
+    2:2:int acceptCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.structural.CompareToVisitor):143:143 -> a
+    2:2:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):18 -> a
+    3:3:com.android.tools.r8.graph.DexEncodedMember lookupOnClass(com.android.tools.r8.graph.DexClass):18:18 -> a
+    4:4:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):32:32 -> a
+    5:5:java.lang.Object apply(java.util.function.Function,java.util.function.Function,java.util.function.Function):69:69 -> a
+    6:6:void accept(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):77:77 -> a
+    7:7:void accept(java.util.function.BiConsumer,java.util.function.BiConsumer,java.util.function.BiConsumer,java.lang.Object):86:86 -> a
+    8:11:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):114:117 -> a
+    12:12:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):265:265 -> a
+    12:12:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):117 -> a
+    13:13:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):123:123 -> a
+    14:14:boolean match(com.android.tools.r8.graph.DexEncodedField):153:153 -> a
+    15:15:boolean match(com.android.tools.r8.graph.DexField):148:148 -> a
+    15:15:boolean match(com.android.tools.r8.graph.DexEncodedField):153 -> a
+    16:16:com.android.tools.r8.graph.DexField withHolder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):171:171 -> a
+    17:17:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):232:232 -> a
+    17:17:com.android.tools.r8.graph.ProgramField lookupOnProgramClass(com.android.tools.r8.graph.DexProgramClass):56 -> a
+    17:17:com.android.tools.r8.graph.ProgramMember lookupOnProgramClass(com.android.tools.r8.graph.DexProgramClass):18 -> a
+    18:18:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.toProgramFieldOrNull(com.android.tools.r8.graph.DexEncodedField):241:241 -> a
+    18:18:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):232 -> a
+    18:18:com.android.tools.r8.graph.ProgramField lookupOnProgramClass(com.android.tools.r8.graph.DexProgramClass):56 -> a
+    18:18:com.android.tools.r8.graph.ProgramMember lookupOnProgramClass(com.android.tools.r8.graph.DexProgramClass):18 -> a
+    1:1:com.android.tools.r8.graph.DexEncodedField lookupOnClass(com.android.tools.r8.graph.DexClass):51:51 -> b
+    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():42:42 -> e
+    1:5:boolean computeEquals(java.lang.Object):98:102 -> g
     com.android.tools.r8.utils.structural.StructuralItem self() -> k
-    1:1:java.lang.String toSmaliString():174:174 -> r
-    1:1:java.lang.String toSourceString():179:179 -> s
-    1:3:int computeHashCode():103:105 -> t
-    1:1:java.lang.String toString():121:121 -> toString
+    1:1:java.lang.String toSmaliString():162:162 -> r
+    1:1:java.lang.String toSourceString():167:167 -> s
+    1:3:int computeHashCode():91:93 -> t
+    1:1:java.lang.String toString():109:109 -> toString
     com.android.tools.r8.graph.DexField asDexField() -> u
     boolean isDexField() -> y
-com.android.tools.r8.graph.DexItem -> com.android.tools.r8.graph.O:
+com.android.tools.r8.graph.DexItem -> com.android.tools.r8.graph.N:
     1:1:void <init>():11:11 -> <init>
     void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection) -> a
     1:1:void collectAll(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.graph.DexItem[]):14:14 -> a
@@ -18911,448 +18888,516 @@
     1:1:void lambda$collectAll$1(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.graph.DexItem):19:19 -> b
     1:1:java.lang.String toSmaliString():44:44 -> r
     1:1:java.lang.String toSourceString():48:48 -> s
-com.android.tools.r8.graph.DexItemFactory -> com.android.tools.r8.graph.P:
-    com.android.tools.r8.graph.DexString getSimpleNameName -> A0
-    com.android.tools.r8.graph.DexString unboxShortMethodName -> Q
-    com.android.tools.r8.graph.DexString intFieldUpdaterDescriptor -> b1
-    com.android.tools.r8.graph.DexType consumerType -> F2
+com.android.tools.r8.graph.DexItemFactory -> com.android.tools.r8.graph.O:
+    com.android.tools.r8.graph.DexString substringName -> A0
+    com.android.tools.r8.graph.DexString boxedByteDescriptor -> Q
+    com.android.tools.r8.graph.DexString assertionErrorDescriptor -> b1
+    com.android.tools.r8.graph.DexType floatArrayType -> F2
     java.util.Map setFiles -> s
-    com.android.tools.r8.graph.DexType javaUtilSetType -> g3
-    com.android.tools.r8.graph.DexItemFactory$ClassMethods classMethods -> F3
-    com.android.tools.r8.graph.DexString assertionsDisabled -> I0
-    com.android.tools.r8.graph.DexString enumValuesFieldName -> j1
-    com.android.tools.r8.graph.DexString wrapperFieldName -> r0
+    com.android.tools.r8.graph.DexType strictMathType -> g3
+    com.android.tools.r8.graph.DexString deserializeLambdaMethodName -> l5
+    com.android.tools.r8.graph.DexString finalizeMethodName -> I0
+    com.android.tools.r8.graph.DexString classLoaderDescriptor -> j1
+    com.android.tools.r8.graph.DexItemFactory$BooleanMembers booleanMembers -> x4
+    com.android.tools.r8.graph.DexString hashCodeMethodName -> r0
     com.android.tools.r8.graph.DexString doubleDescriptor -> A
+    com.android.tools.r8.graph.DexString optionalDoubleDescriptor -> R1
     com.android.tools.r8.graph.DexString unknownTypeName -> b
-    com.android.tools.r8.graph.DexType annotationDefault -> W3
-    com.android.tools.r8.graph.DexType stringConcatFactoryType -> x4
-    com.android.tools.r8.graph.DexType enumType -> V1
-    com.android.tools.r8.graph.DexType serviceLoaderConfigurationErrorType -> w2
-    com.android.tools.r8.graph.DexString getCanonicalNameName -> z0
-    com.android.tools.r8.graph.DexType serializableType -> p4
-    com.android.tools.r8.graph.DexType boxedNumberType -> N1
-    com.android.tools.r8.graph.DexType javaLangSystemType -> o2
-    com.android.tools.r8.graph.DexType boxedBooleanType -> F1
-    com.android.tools.r8.graph.DexString endsWithMethodName -> a0
-    com.android.tools.r8.graph.DexString unboxIntMethodName -> R
-    com.android.tools.r8.graph.DexType annotationCovariantReturnType -> h4
+    com.android.tools.r8.graph.DexType illegalArgumentExceptionType -> W3
+    com.android.tools.r8.graph.DexType floatType -> w2
+    com.android.tools.r8.graph.DexString cloneMethodName -> z0
+    com.android.tools.r8.graph.DexString icceDescriptor -> Z1
+    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 collectionType -> G3
+    com.android.tools.r8.graph.DexString boxedCharDescriptor -> R
+    com.android.tools.r8.graph.DexType javaUtilLocaleType -> h4
     java.util.Map setInlineFrames -> t
-    com.android.tools.r8.graph.DexType constructorType -> g2
-    com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods javaUtilArraysMethods -> Q3
-    com.android.tools.r8.graph.DexItemFactory$ByteMembers byteMembers -> t3
-    com.android.tools.r8.graph.DexString compareToMethodName -> i0
-    com.android.tools.r8.graph.DexItemFactory$JavaLangSystemMethods javaLangSystemMethods -> I3
-    com.android.tools.r8.graph.DexType voidType -> w1
-    com.android.tools.r8.graph.DexString classDescriptor -> Q0
+    com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods serviceLoaderMethods -> M5
+    com.android.tools.r8.graph.DexString newUpdaterName -> j2
+    com.android.tools.r8.graph.DexType listIteratorType -> H5
+    com.android.tools.r8.graph.DexString mapDescriptor -> I1
+    com.android.tools.r8.graph.DexString unboxFloatMethodName -> i0
+    java.util.Set libraryClassesWithoutStaticInitialization -> W5
+    com.android.tools.r8.graph.DexString optionalDescriptor -> Q1
+    com.android.tools.r8.graph.DexString valueString -> r2
+    com.android.tools.r8.graph.DexString getTypeNameName -> Q0
+    com.android.tools.r8.graph.DexString annotationDescriptor -> r1
     com.android.tools.r8.graph.DexString floatDescriptor -> B
-    com.android.tools.r8.graph.DexType javaIoFileType -> W2
-    com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods polymorphicMethods -> O3
-    com.android.tools.r8.graph.DexType booleanType -> o1
-    com.android.tools.r8.graph.DexString listDescriptor -> Y0
-    com.android.tools.r8.graph.DexType intConsumer -> O2
-    com.android.tools.r8.graph.DexType nestConstructorType -> p3
-    com.android.tools.r8.graph.DexString unboxLongMethodName -> S
-    com.android.tools.r8.graph.DexType javaUtilLoggingLoggerType -> f3
-    com.android.tools.r8.graph.DexString thisName -> i1
-    com.android.tools.r8.graph.DexType supplierType -> E2
-    com.android.tools.r8.graph.DexString newInstanceName -> H0
-    com.android.tools.r8.graph.DexItemFactory$ProxyMethods proxyMethods -> P3
-    com.android.tools.r8.graph.DexString objectArrayDescriptor -> P0
-    com.android.tools.r8.graph.DexString convertMethodName -> q0
-    com.android.tools.r8.graph.DexItemFactory$IntegerMembers integerMembers -> w3
-    com.android.tools.r8.graph.DexItemFactory$EnumMembers enumMembers -> H3
-    com.android.tools.r8.graph.DexType classArrayType -> U1
-    com.android.tools.r8.graph.DexType serviceLoaderType -> v2
+    com.android.tools.r8.graph.DexType annotationCovariantReturnType -> y5
+    com.android.tools.r8.graph.DexType stringArrayType -> W2
+    com.android.tools.r8.graph.DexType proxyType -> x3
+    com.android.tools.r8.graph.DexItemFactory$LongMembers longMembers -> C4
+    com.android.tools.r8.graph.DexProto deserializeLambdaMethodProto -> m5
+    com.android.tools.r8.graph.DexString invokeMethodName -> Y0
+    com.android.tools.r8.graph.DexString varHandleDescriptor -> z1
+    com.android.tools.r8.graph.DexType annotationInnerClass -> q5
+    com.android.tools.r8.graph.DexType boxedIntType -> O2
+    com.android.tools.r8.graph.DexType stringBuilderType -> p3
+    com.android.tools.r8.graph.DexString noClassDefFoundErrorDescriptor -> b2
+    com.android.tools.r8.graph.DexString methodHandleDescriptor -> A1
+    com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> D4
+    com.android.tools.r8.graph.DexString boxedDoubleDescriptor -> S
+    com.android.tools.r8.graph.DexType mathType -> f3
+    com.android.tools.r8.graph.DexString classDescriptor -> i1
+    com.android.tools.r8.graph.DexType doubleArrayType -> E2
+    com.android.tools.r8.graph.DexString getClassMethodName -> H0
+    com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildVersionMembers androidOsBuildVersionMembers -> W4
+    com.android.tools.r8.graph.DexString getSimpleNameName -> P0
+    com.android.tools.r8.graph.DexString javaLangSystemDescriptor -> q1
+    com.android.tools.r8.graph.DexItemFactory$StringMembers stringMembers -> G4
+    com.android.tools.r8.graph.DexString equalsMethodName -> q0
+    com.android.tools.r8.graph.DexType doubleType -> v2
     com.android.tools.r8.graph.DexString intDescriptor -> C
-    com.android.tools.r8.graph.DexString getNameName -> y0
-    com.android.tools.r8.graph.DexType boxedShortType -> M1
-    com.android.tools.r8.graph.DexType stringBufferType -> n2
-    com.android.tools.r8.graph.DexType enumerationType -> o4
-    com.android.tools.r8.graph.DexString throwableDescriptor -> a1
-    com.android.tools.r8.graph.DexType shortArrayType -> E1
-    com.android.tools.r8.graph.DexType classLoaderType -> f2
-    com.android.tools.r8.graph.DexString unboxFloatMethodName -> T
-    com.android.tools.r8.graph.DexType annotationSynthesizedClassMap -> g4
-    com.android.tools.r8.graph.DexString lastIndexOfMethodName -> h0
-    com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods npeMethods -> J3
-    com.android.tools.r8.graph.DexString internMethodName -> p0
-    com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods assertionErrorMethods -> E3
-    com.android.tools.r8.graph.DexType kotlinMetadataType -> V2
-    com.android.tools.r8.graph.DexType shortType -> v1
+    com.android.tools.r8.graph.DexType throwableType -> V3
+    com.android.tools.r8.graph.DexString illegalArgumentExceptionDescriptor -> Y1
+    com.android.tools.r8.graph.DexString compareToIgnoreCaseMethodName -> y0
+    com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods javaUtilArraysMethods -> d5
+    com.android.tools.r8.graph.DexType optionalDoubleType -> N3
+    com.android.tools.r8.graph.DexType androidOsParcelableCreatorType -> o4
+    com.android.tools.r8.graph.DexString runtimeExceptionDescriptor -> a1
+    com.android.tools.r8.graph.DexString boxedFloatDescriptor -> T
+    com.android.tools.r8.graph.DexType javaUtilListType -> g4
+    com.android.tools.r8.graph.DexString unboxLongMethodName -> h0
+    com.android.tools.r8.graph.DexString setDescriptor -> H1
+    com.android.tools.r8.graph.DexType abstractMapSimpleEntryType -> F3
+    com.android.tools.r8.graph.DexItemFactory$JavaUtilConcurrentTimeUnitMembers javaUtilConcurrentTimeUnitMembers -> f5
+    com.android.tools.r8.graph.DexString referenceFieldUpdaterDescriptor -> i2
+    com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields primitiveTypesBoxedTypeFields -> Q4
+    com.android.tools.r8.graph.DexType iteratorType -> G5
+    com.android.tools.r8.graph.DexString endsWithMethodName -> p0
+    java.util.Set libraryTypesAssumedToBePresent -> V5
+    com.android.tools.r8.graph.DexString runnableDescriptor -> P1
+    com.android.tools.r8.graph.DexString throwableArrayDescriptor -> q2
+    com.android.tools.r8.graph.DexType stringType -> V2
+    com.android.tools.r8.graph.DexType invocationHandlerType -> w3
     com.android.tools.r8.graph.DexString longDescriptor -> D
-    com.android.tools.r8.graph.DexString javaLangSystemDescriptor -> X0
-    com.android.tools.r8.graph.DexType longConsumer -> N2
-    com.android.tools.r8.graph.DexType androidViewViewType -> o3
+    com.android.tools.r8.graph.DexType annotationSynthesizedClassMap -> x5
+    com.android.tools.r8.graph.DexString assertionsDisabled -> X0
+    com.android.tools.r8.graph.DexString stringBufferDescriptor -> y1
+    com.android.tools.r8.graph.DexItemFactory$JavaIoFileMembers javaIoFileMembers -> a5
+    com.android.tools.r8.graph.DexType boxedFloatType -> N2
+    com.android.tools.r8.graph.DexType autoCloseableType -> o3
     java.util.Map strings -> f
-    com.android.tools.r8.graph.DexString getDeclaredConstructorName -> C0
+    com.android.tools.r8.graph.DexType annotationEnclosingMethod -> p5
+    com.android.tools.r8.graph.DexString exceptionInInitializerErrorDescriptor -> a2
+    com.android.tools.r8.graph.DexString valueOfMethodName -> C0
     java.util.concurrent.ConcurrentHashMap referenceTypes -> u
-    com.android.tools.r8.graph.DexString referenceFieldUpdaterDescriptor -> d1
-    com.android.tools.r8.graph.DexType javaUtilLoggingLevelType -> e3
-    com.android.tools.r8.graph.DexType comparatorType -> D2
-    com.android.tools.r8.graph.DexString invokeExactMethodName -> K0
-    com.android.tools.r8.graph.DexString throwableArrayDescriptor -> l1
-    com.android.tools.r8.graph.DexString deserializeLambdaMethodName -> U3
-    com.android.tools.r8.graph.DexString finalizeMethodName -> t0
-    com.android.tools.r8.graph.DexMethod metafactoryMethod -> u4
-    com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> y3
-    com.android.tools.r8.graph.DexItemFactory$DoubleMembers doubleMembers -> C3
-    com.android.tools.r8.graph.DexType objectArrayType -> T1
-    com.android.tools.r8.graph.DexType proxyType -> u2
-    com.android.tools.r8.graph.DexType listIteratorType -> n4
-    com.android.tools.r8.graph.DexString notifyAllMethodName -> M
-    com.android.tools.r8.graph.DexType boxedLongType -> L1
-    com.android.tools.r8.graph.DexType stringBuilderType -> m2
-    com.android.tools.r8.graph.DexItemFactory$ObjectMembers objectMembers -> z3
-    com.android.tools.r8.graph.DexString hashCodeMethodName -> c0
-    com.android.tools.r8.graph.DexType annotationSynthesizedClass -> f4
-    com.android.tools.r8.graph.DexType packageType -> e2
-    boolean skipNameValidationForTesting -> E4
-    com.android.tools.r8.graph.DexType longArrayType -> D1
-    com.android.tools.r8.graph.DexString cloneMethodName -> k0
-    com.android.tools.r8.graph.DexItemFactory$FloatMembers floatMembers -> v3
-    com.android.tools.r8.graph.DexType longType -> u1
-    com.android.tools.r8.graph.DexString classArrayDescriptor -> S0
-    com.android.tools.r8.graph.DexType npeType -> U2
-    com.android.tools.r8.graph.DexItemFactory$ShortMembers shortMembers -> A3
+    com.android.tools.r8.graph.DexString charSequenceArrayDescriptor -> d1
+    com.android.tools.r8.graph.DexType iterableType -> e3
+    com.android.tools.r8.graph.DexType charArrayType -> D2
+    com.android.tools.r8.graph.DexString nameMethodName -> K0
+    com.android.tools.r8.graph.DexString classArrayDescriptor -> l1
+    com.android.tools.r8.graph.DexItemFactory$JavaUtilComparatorMembers javaUtilComparatorMembers -> e5
+    com.android.tools.r8.graph.DexString equalsIgnoreCaseMethodName -> t0
+    com.android.tools.r8.graph.DexString optionalLongDescriptor -> T1
+    com.android.tools.r8.graph.DexType runtimeExceptionType -> U3
+    com.android.tools.r8.graph.DexType charType -> u2
+    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> v4
+    com.android.tools.r8.graph.DexItemFactory$ThrowableMethods throwableMethods -> I4
+    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 npeDescriptor -> d2
+    com.android.tools.r8.graph.DexString invocationHandlerDescriptor -> C1
+    com.android.tools.r8.graph.DexString unboxBooleanMethodName -> c0
+    com.android.tools.r8.graph.DexType javaUtilConcurrentTimeUnitType -> f4
+    com.android.tools.r8.graph.DexType lookupType -> F5
+    com.android.tools.r8.graph.DexType mapEntryType -> E3
+    com.android.tools.r8.graph.DexString classConstructorMethodName -> l2
+    com.android.tools.r8.graph.DexString collectionDescriptor -> K1
+    com.android.tools.r8.graph.DexString isEmptyMethodName -> k0
+    com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods atomicFieldUpdaterMethods -> R4
+    com.android.tools.r8.graph.DexString getFieldName -> S0
+    com.android.tools.r8.graph.DexString collectionsDescriptor -> t1
+    com.android.tools.r8.graph.DexType annotationSynthesizedClass -> w5
+    com.android.tools.r8.graph.DexType charSequenceArrayType -> U2
+    com.android.tools.r8.graph.DexType methodTypeType -> v3
+    com.android.tools.r8.graph.DexProto twrCloseResourceMethodProto -> k5
     com.android.tools.r8.utils.LRUCacheTable leastUpperBoundOfInterfacesTable -> w
-    com.android.tools.r8.graph.DexType doubleConsumer -> M2
-    com.android.tools.r8.graph.DexType androidUtilPropertyType -> n3
-    com.android.tools.r8.graph.DexString unboxBooleanMethodName -> N
-    com.android.tools.r8.graph.DexString longFieldUpdaterDescriptor -> c1
-    com.android.tools.r8.graph.DexString getTypeNameName -> B0
-    com.android.tools.r8.graph.DexType collectionType -> C2
-    com.android.tools.r8.graph.DexItemFactory$CharMembers charMembers -> u3
-    com.android.tools.r8.graph.DexType javaUtilLocaleType -> d3
-    com.android.tools.r8.graph.DexString enabledFieldName -> k1
-    com.android.tools.r8.graph.DexString invokeMethodName -> J0
-    com.android.tools.r8.graph.DexItemFactory$LongMembers longMembers -> x3
-    com.android.tools.r8.graph.DexString getClassMethodName -> s0
-    com.android.tools.r8.graph.DexType objectType -> S1
-    com.android.tools.r8.graph.DexType invocationHandlerType -> t2
-    com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods serviceLoaderMethods -> s4
-    com.android.tools.r8.graph.DexType boxedIntType -> K1
-    com.android.tools.r8.graph.DexType zipFileType -> l2
-    com.android.tools.r8.graph.DexString unboxByteMethodName -> O
-    com.android.tools.r8.graph.DexType iteratorType -> m4
-    com.android.tools.r8.graph.DexString unboxCharMethodName -> P
-    com.android.tools.r8.graph.DexString equalsMethodName -> b0
-    com.android.tools.r8.kotlin.Kotlin kotlin -> N3
-    com.android.tools.r8.graph.DexType classType -> d2
-    com.android.tools.r8.graph.DexType intArrayType -> C1
-    com.android.tools.r8.graph.DexType annotationThrows -> e4
-    com.android.tools.r8.graph.DexString compareToIgnoreCaseMethodName -> j0
-    com.android.tools.r8.graph.DexString twrCloseResourceMethodName -> S3
-    com.android.tools.r8.graph.DexString classLoaderDescriptor -> R0
-    com.android.tools.r8.graph.DexType noSuchMethodErrorType -> T2
-    com.android.tools.r8.graph.DexType intType -> t1
-    com.android.tools.r8.graph.DexString arraysDescriptor -> Z0
-    com.android.tools.r8.graph.DexType streamType -> L2
-    com.android.tools.r8.graph.DexType androidUtilLogType -> m3
-    com.android.tools.r8.graph.DexString getDeclaredFieldName -> E0
-    com.android.tools.r8.graph.DexString constructorMethodName -> f1
-    com.android.tools.r8.graph.DexType abstractMapSimpleEntryType -> B2
-    com.android.tools.r8.graph.DexType javaUtilListType -> c3
-    com.android.tools.r8.graph.DexString containsMethodName -> Y
+    com.android.tools.r8.graph.DexType annotationEnclosingClass -> o5
+    com.android.tools.r8.graph.DexType boxedDoubleType -> M2
+    com.android.tools.r8.graph.DexType methodType -> n3
+    com.android.tools.r8.graph.DexString longArrayDescriptor -> N
+    com.android.tools.r8.graph.DexString charSequenceDescriptor -> c1
+    com.android.tools.r8.graph.DexString trimName -> B0
+    com.android.tools.r8.graph.DexType byteArrayType -> C2
+    com.android.tools.r8.graph.DexType collectionsType -> d3
+    com.android.tools.r8.graph.DexString autoCloseableDescriptor -> k1
+    com.android.tools.r8.graph.DexString ordinalMethodName -> J0
+    com.android.tools.r8.graph.DexItemFactory$ConstructorMethods constructorMethods -> L4
+    com.android.tools.r8.graph.DexString optionalIntDescriptor -> S1
+    com.android.tools.r8.graph.DexString identityHashCodeName -> s0
+    com.android.tools.r8.graph.DexType byteType -> t2
+    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.DexItemFactory$JavaUtilLocaleMembers javaUtilLocaleMembers -> g5
+    com.android.tools.r8.graph.DexItemFactory$AndroidOsBundleMembers androidOsBundleMembers -> X4
+    com.android.tools.r8.graph.DexString shortArrayDescriptor -> O
+    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 methodTypeDescriptor -> B1
+    com.android.tools.r8.graph.DexString noSuchFieldErrorDescriptor -> c2
+    com.android.tools.r8.graph.DexType mapType -> D3
+    com.android.tools.r8.graph.DexType callSiteType -> E5
+    com.android.tools.r8.graph.DexType javaUtilComparatorType -> e4
+    com.android.tools.r8.graph.DexItemFactory$IllegalArgumentExceptionMethods illegalArgumentExceptionMethods -> P4
+    com.android.tools.r8.graph.DexString unboxDoubleMethodName -> j0
+    com.android.tools.r8.graph.DexString mapEntryDescriptor -> J1
+    com.android.tools.r8.graph.DexString constructorMethodName -> k2
+    com.android.tools.r8.graph.DexString nestConstructorDescriptor -> t4
+    com.android.tools.r8.graph.DexString getDeclaredConstructorName -> R0
+    com.android.tools.r8.graph.DexString objectsDescriptor -> s1
+    com.android.tools.r8.graph.DexType charSequenceType -> T2
+    com.android.tools.r8.graph.DexType methodHandleType -> u3
+    com.android.tools.r8.graph.DexType annotationThrows -> v5
+    com.android.tools.r8.graph.DexString invokeExactMethodName -> Z0
+    com.android.tools.r8.graph.DexType boxedCharType -> L2
+    com.android.tools.r8.graph.DexType fieldType -> m3
+    com.android.tools.r8.graph.DexType annotationDefault -> n5
+    com.android.tools.r8.graph.DexString internMethodName -> E0
+    com.android.tools.r8.graph.DexString stringArrayDescriptor -> f1
+    com.android.tools.r8.graph.DexType booleanArrayType -> B2
+    com.android.tools.r8.graph.DexType objectsType -> c3
+    com.android.tools.r8.graph.DexMethod metafactoryMethod -> O5
+    com.android.tools.r8.graph.DexString boxedVoidDescriptor -> Y
     com.android.tools.r8.graph.DexString charDescriptor -> z
-    com.android.tools.r8.graph.DexString charSequenceDescriptor -> M0
-    com.android.tools.r8.graph.DexString kindString -> n1
-    com.android.tools.r8.graph.DexType iterableType -> Z1
-    com.android.tools.r8.graph.DexMethod deserializeLambdaMethod -> w4
+    com.android.tools.r8.graph.DexString forNameMethodName -> M0
+    com.android.tools.r8.graph.DexString fieldDescriptor -> n1
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap advancePCs -> m
-    com.android.tools.r8.graph.DexString nameMethodName -> v0
-    com.android.tools.r8.graph.DexType stringArrayType -> R1
-    com.android.tools.r8.graph.DexType methodTypeType -> s2
-    com.android.tools.r8.graph.DexString boxedLongDescriptor -> I
+    com.android.tools.r8.graph.DexString indexOfMethodName -> v0
+    com.android.tools.r8.graph.DexString arraysDescriptor -> V1
+    com.android.tools.r8.graph.DexType longConsumer -> S3
+    com.android.tools.r8.graph.DexItemFactory$JavaLangSystemMethods javaLangSystemMethods -> N4
+    com.android.tools.r8.graph.DexType booleanType -> s2
+    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.DexType boxedFloatType -> J1
-    com.android.tools.r8.graph.DexType dalvikCriticalNativeAnnotation -> l4
-    com.android.tools.r8.graph.DexType closeableType -> k2
-    com.android.tools.r8.graph.DexType floatArrayType -> B1
-    com.android.tools.r8.graph.DexString equalsIgnoreCaseMethodName -> e0
-    com.android.tools.r8.graph.DexType annotationSourceDebugExtension -> d4
-    com.android.tools.r8.graph.DexType referenceFieldUpdaterType -> c2
+    com.android.tools.r8.graph.DexType consumerType -> K3
+    com.android.tools.r8.graph.DexType androidOsBuildType -> l4
+    java.util.List libraryMembersCollection -> i5
+    com.android.tools.r8.graph.DexItemFactory$CharMembers charMembers -> z4
+    com.android.tools.r8.graph.DexType comparableType -> L5
+    com.android.tools.r8.graph.DexString kotlinMetadataDescriptor -> f2
+    com.android.tools.r8.graph.DexItemFactory$ClassMethods classMethods -> K4
+    com.android.tools.r8.graph.DexString serviceLoaderDescriptor -> E1
+    com.android.tools.r8.graph.DexString unboxCharMethodName -> e0
+    com.android.tools.r8.graph.DexType setType -> C3
+    com.android.tools.r8.graph.DexType javaUtilCollectionsType -> d4
     com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin setEpilogueBegin -> q
-    com.android.tools.r8.graph.DexString startsWithMethodName -> Z
-    com.android.tools.r8.graph.DexString trimName -> m0
+    com.android.tools.r8.graph.DexString waitMethodName -> Z
+    com.android.tools.r8.graph.DexString callableDescriptor -> M1
+    com.android.tools.r8.graph.DexString thisName -> n2
+    com.android.tools.r8.graph.DexType metafactoryType -> D5
+    com.android.tools.r8.graph.DexString concatMethodName -> m0
+    java.util.Set libraryMethodsReturningReceiver -> S5
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap defaults -> n
-    com.android.tools.r8.graph.DexType floatType -> s1
-    com.android.tools.r8.graph.DexString fieldDescriptor -> U0
-    com.android.tools.r8.graph.DexType icceType -> S2
-    com.android.tools.r8.graph.DexString boxedNumberDescriptor -> J
-    java.util.Set libraryMethodsWithReturnValueDependingOnlyOnArguments -> B4
-    com.android.tools.r8.graph.DexType optionalLongType -> K2
-    com.android.tools.r8.graph.DexType androidSystemOsConstantsType -> l3
-    com.android.tools.r8.graph.DexType androidOsBundleType -> j3
-    com.android.tools.r8.graph.DexString newUpdaterName -> e1
-    com.android.tools.r8.graph.DexType optionalDoubleType -> I2
-    com.android.tools.r8.graph.DexString getFieldName -> D0
-    com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields primitiveTypesBoxedTypeFields -> L3
-    com.android.tools.r8.graph.DexType javaUtilConcurrentTimeUnitType -> b3
-    com.android.tools.r8.graph.DexString assertionErrorDescriptor -> L0
-    com.android.tools.r8.graph.DexString valueString -> m1
-    com.android.tools.r8.graph.DexType mapEntryType -> A2
-    com.android.tools.r8.graph.DexType collectionsType -> Y1
-    com.android.tools.r8.graph.DexType mapType -> z2
+    com.android.tools.r8.graph.DexString getMethodName -> U0
+    com.android.tools.r8.graph.DexString mathDescriptor -> v1
+    com.android.tools.r8.graph.DexType annotationSourceDebugExtension -> u5
+    com.android.tools.r8.com.google.common.collect.BiMap primitiveToBoxed -> N5
+    com.android.tools.r8.graph.DexType boxedVoidType -> S2
+    com.android.tools.r8.graph.DexType varHandleType -> t3
+    boolean skipNameValidationForTesting -> X5
+    com.android.tools.r8.graph.DexString charArrayDescriptor -> J
+    com.android.tools.r8.graph.DexType boxedByteType -> K2
+    com.android.tools.r8.graph.DexType constructorType -> l3
+    com.android.tools.r8.graph.DexType packageType -> j3
+    com.android.tools.r8.graph.DexString stringDescriptor -> e1
+    com.android.tools.r8.graph.DexType shortArrayType -> I2
+    com.android.tools.r8.graph.DexString toStringMethodName -> D0
+    com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods npeMethods -> O4
+    com.android.tools.r8.graph.DexItemFactory$AndroidSystemOsConstantsMembers androidSystemOsConstantsMembers -> Y4
+    com.android.tools.r8.graph.DexType annotationType -> b3
+    com.android.tools.r8.graph.DexString desiredAssertionStatusMethodName -> L0
+    com.android.tools.r8.graph.DexString constructorDescriptor -> m1
+    com.android.tools.r8.graph.DexType voidType -> A2
+    com.android.tools.r8.graph.DexItemFactory$ByteMembers byteMembers -> y4
+    com.android.tools.r8.graph.DexType shortType -> z2
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap endLocals -> o
-    com.android.tools.r8.graph.DexType annotationInnerClass -> Z3
-    com.android.tools.r8.graph.DexItemFactory$StringMembers stringMembers -> B3
-    com.android.tools.r8.graph.DexMethod metafactoryAltMethod -> v4
-    com.android.tools.r8.graph.DexString ordinalMethodName -> u0
+    com.android.tools.r8.graph.DexType kotlinMetadataType -> Z3
+    com.android.tools.r8.graph.DexItemFactory$ProxyMethods proxyMethods -> U4
+    com.android.tools.r8.graph.DexItemFactory$JavaMathBigIntegerMembers javaMathBigIntegerMembers -> b5
+    com.android.tools.r8.graph.DexString streamDescriptor -> U1
+    com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods assertionErrorMethods -> J4
+    com.android.tools.r8.graph.DexString contentEqualsMethodName -> u0
     java.util.Set possibleCompilerSynthesizedTypes -> e
-    com.android.tools.r8.graph.DexType stringType -> Q1
-    com.android.tools.r8.graph.DexType methodHandleType -> r2
-    com.android.tools.r8.graph.DexProto deserializeLambdaMethodProto -> V3
-    com.android.tools.r8.graph.DexString waitMethodName -> K
-    com.android.tools.r8.graph.DexType boxedDoubleType -> I1
-    com.android.tools.r8.graph.DexType autoCloseableType -> j2
-    com.android.tools.r8.graph.DexType dalvikFastNativeAnnotation -> k4
+    com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods polymorphicMethods -> T4
+    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.DexItemFactory$ShortMembers shortMembers -> F4
+    com.android.tools.r8.graph.DexType externalizableType -> K5
+    com.android.tools.r8.graph.DexType javaUtilSetType -> k4
     java.util.concurrent.ConcurrentHashMap classTypeInterfaces -> v
-    com.android.tools.r8.graph.DexString identityHashCodeName -> d0
-    java.util.Set libraryMethodsReturningNonNull -> A4
-    com.android.tools.r8.graph.DexType doubleArrayType -> A1
-    java.util.Set libraryMethodsReturningReceiver -> z4
-    com.android.tools.r8.graph.DexType strictMathType -> b2
-    com.android.tools.r8.graph.DexType annotationSignature -> c4
-    com.android.tools.r8.graph.DexString substringName -> l0
+    com.android.tools.r8.graph.DexString unboxByteMethodName -> d0
+    com.android.tools.r8.graph.DexString proxyDescriptor -> D1
+    com.android.tools.r8.graph.DexType supplierType -> J3
+    com.android.tools.r8.graph.DexString reflectiveOperationExceptionDescriptor -> e2
+    com.android.tools.r8.graph.DexType javaNioByteOrderType -> c4
+    com.android.tools.r8.graph.DexString lengthMethodName -> l0
+    com.android.tools.r8.graph.DexType listType -> B3
+    com.android.tools.r8.graph.DexString comparatorDescriptor -> L1
+    com.android.tools.r8.graph.DexString temporaryConstructorMethodPrefix -> m2
+    com.android.tools.r8.graph.DexType dalvikCriticalNativeAnnotation -> C5
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap restartLocals -> p
-    com.android.tools.r8.graph.DexType javaUtilCollectionsType -> Z2
-    com.android.tools.r8.graph.DexType charArrayType -> z1
-    com.android.tools.r8.graph.DexItemFactory$BooleanMembers booleanMembers -> s3
-    com.android.tools.r8.graph.DexString constructorDescriptor -> T0
-    com.android.tools.r8.graph.DexType illegalArgumentExceptionType -> R2
-    com.android.tools.r8.graph.DexType doubleType -> r1
+    com.android.tools.r8.graph.DexType classArrayType -> Z2
+    com.android.tools.r8.graph.DexString getDeclaredFieldName -> T0
+    com.android.tools.r8.graph.DexString iterableDescriptor -> u1
+    com.android.tools.r8.graph.DexType boxedNumberType -> R2
+    com.android.tools.r8.graph.DexType javaIoPrintStreamType -> s3
+    com.android.tools.r8.graph.DexItemFactory$JavaUtilLoggingLevelMembers javaUtilLoggingLevelMembers -> h5
     com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd setPrologueEnd -> r
-    com.android.tools.r8.graph.DexString notifyMethodName -> L
-    com.android.tools.r8.graph.DexType optionalIntType -> J2
-    com.android.tools.r8.graph.DexType androidOsParcelableCreatorType -> k3
-    com.android.tools.r8.graph.DexType androidOsBuildVersionType -> i3
-    com.android.tools.r8.graph.DexType optionalType -> H2
-    com.android.tools.r8.graph.DexItemFactory$IllegalArgumentExceptionMethods illegalArgumentExceptionMethods -> K3
-    com.android.tools.r8.graph.DexString unboxDoubleMethodName -> U
-    com.android.tools.r8.graph.DexString getDeclaredMethodName -> G0
-    com.android.tools.r8.graph.DexString temporaryConstructorMethodPrefix -> h1
-    com.android.tools.r8.graph.DexType javaUtilComparatorType -> a3
-    com.android.tools.r8.graph.DexItemFactory$ThrowableMethods throwableMethods -> D3
-    com.android.tools.r8.graph.DexString objectDescriptor -> O0
-    com.android.tools.r8.graph.DexType annotationEnclosingMethod -> Y3
-    com.android.tools.r8.graph.DexType objectsType -> X1
-    com.android.tools.r8.graph.DexType setType -> y2
+    com.android.tools.r8.graph.DexType annotationSignature -> t5
+    com.android.tools.r8.graph.DexString floatArrayDescriptor -> L
+    com.android.tools.r8.graph.DexType boxedBooleanType -> J2
+    com.android.tools.r8.graph.DexType classLoaderType -> k3
+    com.android.tools.r8.graph.DexType classType -> i3
+    com.android.tools.r8.graph.DexType longArrayType -> H2
+    com.android.tools.r8.graph.DexString boxedIntDescriptor -> U
+    com.android.tools.r8.graph.DexString twrCloseResourceMethodName -> j5
+    com.android.tools.r8.graph.DexString wrapperFieldName -> G0
+    com.android.tools.r8.graph.DexString objectArrayDescriptor -> h1
+    com.android.tools.r8.graph.DexItemFactory$JavaNioByteOrderMembers javaNioByteOrderMembers -> c5
+    com.android.tools.r8.graph.DexType enumType -> a3
+    com.android.tools.r8.graph.DexItemFactory$DoubleMembers doubleMembers -> H4
+    com.android.tools.r8.graph.DexMethod deserializeLambdaMethod -> Q5
+    com.android.tools.r8.graph.DexItemFactory$IntegerMembers integerMembers -> B4
+    com.android.tools.r8.graph.DexString getCanonicalNameName -> O0
+    com.android.tools.r8.graph.DexString enumDescriptor -> p1
+    com.android.tools.r8.graph.DexType npeType -> Y3
+    com.android.tools.r8.graph.DexType longType -> y2
     com.android.tools.r8.graph.DexString shortDescriptor -> E
-    com.android.tools.r8.graph.DexString forNameMethodName -> x0
-    com.android.tools.r8.graph.DexType comparableType -> r4
-    com.android.tools.r8.graph.DexType charSequenceArrayType -> P1
-    com.android.tools.r8.graph.DexType varHandleType -> q2
+    com.android.tools.r8.graph.DexString compareToMethodName -> x0
+    com.android.tools.r8.graph.DexString illegalAccessErrorDescriptor -> X1
+    com.android.tools.r8.graph.DexType streamType -> Q3
+    com.android.tools.r8.graph.DexType androidUtilPropertyType -> r4
+    com.android.tools.r8.graph.DexType stringConcatFactoryType -> R5
     java.util.Map types -> g
     boolean $assertionsDisabled -> d
-    com.android.tools.r8.graph.DexType annotationReachabilitySensitive -> j4
-    com.android.tools.r8.graph.DexType methodType -> i2
-    com.android.tools.r8.graph.DexType boxedCharType -> H1
-    com.android.tools.r8.graph.DexString isEmptyMethodName -> V
-    com.android.tools.r8.graph.DexString indexOfMethodName -> g0
-    com.android.tools.r8.graph.DexType annotationMethodParameters -> b4
-    com.android.tools.r8.graph.DexType mathType -> a2
-    java.util.Map libraryMethodsNonNullParamOrThrow -> y4
-    com.android.tools.r8.graph.DexType byteArrayType -> y1
-    com.android.tools.r8.graph.DexString toStringMethodName -> o0
-    java.util.List libraryMembersCollection -> R3
-    com.android.tools.r8.graph.DexType javaNioByteOrderType -> Y2
-    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> q3
+    com.android.tools.r8.graph.DexType javaUtilLoggingLoggerType -> j4
+    com.android.tools.r8.graph.DexType serializableType -> J5
+    com.android.tools.r8.graph.DexType callableType -> I3
+    com.android.tools.r8.graph.DexString longFieldUpdaterDescriptor -> h2
+    com.android.tools.r8.graph.DexString listDescriptor -> G1
+    com.android.tools.r8.graph.DexString boxedLongDescriptor -> V
+    com.android.tools.r8.graph.DexString unboxIntMethodName -> g0
+    com.android.tools.r8.graph.DexItemFactory$ObjectMembers objectMembers -> E4
+    com.android.tools.r8.graph.DexType javaMathBigIntegerType -> b4
+    com.android.tools.r8.graph.DexType dalvikFastNativeAnnotation -> B5
+    com.android.tools.r8.graph.DexType serviceLoaderConfigurationErrorType -> A3
+    com.android.tools.r8.graph.DexString consumerDescriptor -> O1
+    com.android.tools.r8.graph.DexString enabledFieldName -> p2
+    com.android.tools.r8.graph.DexString startsWithMethodName -> o0
+    java.util.Set libraryMethodsWithReturnValueDependingOnlyOnArguments -> U5
+    com.android.tools.r8.graph.DexType objectArrayType -> Y2
+    com.android.tools.r8.graph.DexType serviceLoaderRewrittenClassType -> z3
+    com.android.tools.r8.graph.DexItemFactory$EnumMembers enumMembers -> M4
     com.android.tools.r8.graph.DexString voidDescriptor -> F
-    com.android.tools.r8.graph.DexType charType -> q1
-    com.android.tools.r8.graph.DexString enumDescriptor -> W0
-    com.android.tools.r8.graph.DexType throwableType -> Q2
-    com.android.tools.r8.com.google.common.collect.BiMap primitiveToBoxed -> t4
+    com.android.tools.r8.graph.DexString newInstanceName -> W0
+    com.android.tools.r8.graph.DexString stringBuilderDescriptor -> x1
+    com.android.tools.r8.graph.DexType annotationMethodParameters -> s5
+    com.android.tools.r8.graph.DexType boxedShortType -> Q2
+    com.android.tools.r8.graph.DexType javaLangSystemType -> r3
     java.util.IdentityHashMap internalSentinels -> c
-    java.util.Set libraryClassesWithoutStaticInitialization -> D4
     java.util.Map fields -> h
-    com.android.tools.r8.graph.DexType runnableType -> G2
-    com.android.tools.r8.graph.DexType androidOsBuildType -> h3
-    com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods atomicFieldUpdaterMethods -> M3
-    com.android.tools.r8.graph.DexString classConstructorMethodName -> g1
-    com.android.tools.r8.graph.DexString getMethodName -> F0
-    com.android.tools.r8.graph.DexString lengthMethodName -> W
+    com.android.tools.r8.graph.DexType intArrayType -> G2
+    com.android.tools.r8.graph.DexType referenceFieldUpdaterType -> h3
+    com.android.tools.r8.graph.DexString objectDescriptor -> g1
+    com.android.tools.r8.kotlin.Kotlin kotlin -> S4
+    com.android.tools.r8.graph.DexString convertMethodName -> F0
+    com.android.tools.r8.graph.DexString boxedShortDescriptor -> W
     com.android.tools.r8.graph.DexString booleanDescriptor -> x
-    com.android.tools.r8.graph.DexString stringDescriptor -> N0
-    com.android.tools.r8.graph.DexType annotationType -> W1
-    com.android.tools.r8.graph.DexType listType -> x2
-    com.android.tools.r8.graph.DexType annotationEnclosingClass -> X3
+    com.android.tools.r8.graph.DexMethod metafactoryAltMethod -> P5
+    com.android.tools.r8.graph.DexString getNameName -> N0
+    com.android.tools.r8.graph.DexString methodDescriptor -> o1
+    com.android.tools.r8.graph.DexType intType -> x2
+    com.android.tools.r8.graph.DexType icceType -> X3
+    com.android.tools.r8.graph.DexString throwableDescriptor -> W1
     com.android.tools.r8.graph.DexString descriptorSeparator -> G
-    com.android.tools.r8.graph.DexString desiredAssertionStatusMethodName -> w0
+    com.android.tools.r8.graph.DexString lastIndexOfMethodName -> w0
+    com.android.tools.r8.graph.DexItemFactory$AndroidViewViewMembers androidViewViewMembers -> Z4
     java.util.Map protos -> i
-    com.android.tools.r8.graph.DexType charSequenceType -> O1
-    com.android.tools.r8.graph.DexType javaIoPrintStreamType -> p2
-    com.android.tools.r8.graph.DexType externalizableType -> q4
-    com.android.tools.r8.graph.DexProto twrCloseResourceMethodProto -> T3
-    com.android.tools.r8.graph.DexType fieldType -> h2
-    com.android.tools.r8.graph.DexItemFactory$ConstructorMethods constructorMethods -> G3
-    com.android.tools.r8.graph.DexType boxedByteType -> G1
-    com.android.tools.r8.graph.DexType annotationCovariantReturnTypes -> i4
-    com.android.tools.r8.graph.DexString contentEqualsMethodName -> f0
-    com.android.tools.r8.graph.DexString concatMethodName -> X
+    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 enumerationType -> I5
+    com.android.tools.r8.graph.DexType javaUtilLoggingLevelType -> i4
+    com.android.tools.r8.graph.DexString unboxShortMethodName -> f0
+    com.android.tools.r8.graph.DexString serviceLoaderConfigurationErrorDescriptor -> F1
+    com.android.tools.r8.graph.DexString intFieldUpdaterDescriptor -> g2
+    com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildMembers androidOsBuildMembers -> V4
+    com.android.tools.r8.graph.DexString boxedNumberDescriptor -> X
     com.android.tools.r8.graph.DexString byteDescriptor -> y
-    com.android.tools.r8.graph.DexType annotationMemberClasses -> a4
-    com.android.tools.r8.graph.DexString valueOfMethodName -> n0
-    com.android.tools.r8.graph.DexType javaMathBigIntegerType -> X2
-    com.android.tools.r8.graph.DexType booleanArrayType -> x1
+    com.android.tools.r8.graph.DexType annotationReachabilitySensitive -> A5
+    com.android.tools.r8.graph.DexType javaIoFileType -> a4
+    com.android.tools.r8.graph.DexString containsMethodName -> n0
+    java.util.Set libraryMethodsReturningNonNull -> T5
+    com.android.tools.r8.graph.DexString supplierDescriptor -> N1
+    com.android.tools.r8.graph.DexString enumValuesFieldName -> o2
+    com.android.tools.r8.graph.DexType objectType -> X2
+    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.DexItemFactory$StringBuildingMethods stringBufferMethods -> r3
-    com.android.tools.r8.graph.DexString methodDescriptor -> V0
-    com.android.tools.r8.graph.DexString boxedDoubleDescriptor -> H
-    com.android.tools.r8.graph.DexType runtimeExceptionType -> P2
+    com.android.tools.r8.graph.DexType annotationCovariantReturnTypes -> z5
+    com.android.tools.r8.graph.DexString getDeclaredMethodName -> V0
+    com.android.tools.r8.graph.DexString strictMathDescriptor -> w1
+    com.android.tools.r8.graph.DexItemFactory$FloatMembers floatMembers -> A4
+    com.android.tools.r8.graph.DexString booleanArrayDescriptor -> H
+    com.android.tools.r8.graph.DexType boxedLongType -> P2
+    com.android.tools.r8.graph.DexType stringBufferType -> q3
     java.util.Map methods -> j
-    com.android.tools.r8.graph.DexType byteType -> p1
-    java.util.Set libraryTypesAssumedToBePresent -> C4
-    1:45:void <clinit>():62:106 -> <clinit>
-    1:1:void <init>():110:110 -> <init>
-    2:545:void <init>():68:611 -> <init>
-    546:594:void <init>():601:649 -> <init>
-    595:611:void <init>():639:655 -> <init>
-    612:633:void <init>():652:673 -> <init>
-    634:654:void <init>():664:684 -> <init>
-    655:742:void <init>():677:764 -> <init>
-    743:743:void <init>():111:111 -> <init>
+    com.android.tools.r8.graph.DexType annotationMemberClasses -> r5
+    1:45:void <clinit>():63:107 -> <clinit>
+    1:1:void <init>():111:111 -> <init>
+    2:533:void <init>():69:600 -> <init>
+    534:582:void <init>():590:638 -> <init>
+    583:599:void <init>():628:644 -> <init>
+    600:621:void <init>():641:662 -> <init>
+    622:642:void <init>():653:673 -> <init>
+    643:718:void <init>():666:741 -> <init>
+    719:719:void <init>():112:112 -> <init>
     com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame lambda$createSetInlineFrame$7(com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame) -> a
-    1:1:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):115:115 -> 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):187:187 -> a
-    2:2:java.util.Optional lambda$internalCreateFreshFieldName$3(com.android.tools.r8.graph.DexField,java.util.function.Predicate,com.android.tools.r8.graph.DexString):2027 -> 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):2027:2027 -> a
-    4:4:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):291:291 -> a
-    4:4:java.util.Optional lambda$createInstanceInitializerWithFreshProto$4(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):2042 -> a
-    5:5:java.util.Optional lambda$createInstanceInitializerWithFreshProto$4(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):2042:2042 -> a
-    6:17:java.util.Set boxedValueOfMethods():624:635 -> a
-    18:20:com.android.tools.r8.graph.DexMethod lambda$boxedValueOfMethods$0(java.util.Map$Entry):627:629 -> a
-    21:21:void setSkipNameValidationForTesting(boolean):767:767 -> a
-    22:22:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1852:1852 -> a
-    23:23:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):115:115 -> a
-    23:23:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1853 -> a
-    24:25:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1853:1854 -> a
-    26:26:com.android.tools.r8.graph.DexString createString(int,byte[]):1860:1860 -> a
-    27:29:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):1873:1875 -> a
-    30:30:java.lang.String escapeMemberString(java.lang.String):1869:1869 -> a
-    30:30:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):1875 -> a
-    31:38:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):1875:1882 -> a
-    39:43:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType):1895:1899 -> a
-    44:44:com.android.tools.r8.graph.DexString createGloballyFreshMemberString(java.lang.String,com.android.tools.r8.graph.DexType):1923:1923 -> a
-    44:44:com.android.tools.r8.graph.DexString createGloballyFreshMemberString(java.lang.String):1936 -> a
-    45:45:com.android.tools.r8.graph.DexString lookupString(java.lang.String):2084:2084 -> a
-    45:45:com.android.tools.r8.graph.DexString createGloballyFreshMemberString(java.lang.String,com.android.tools.r8.graph.DexType):1924 -> a
-    45:45:com.android.tools.r8.graph.DexString createGloballyFreshMemberString(java.lang.String):1936 -> a
-    46:46:com.android.tools.r8.graph.DexString createGloballyFreshMemberString(java.lang.String,com.android.tools.r8.graph.DexType):1926:1926 -> a
-    46:46:com.android.tools.r8.graph.DexString createGloballyFreshMemberString(java.lang.String):1936 -> a
-    47:47:com.android.tools.r8.graph.DexType createFreshTypeName(com.android.tools.r8.graph.DexType,java.util.function.Predicate,int):1945:1945 -> a
-    48:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.addSuffixId(int,com.android.tools.r8.graph.DexItemFactory):419:420 -> a
-    48:49:com.android.tools.r8.graph.DexType createFreshTypeName(com.android.tools.r8.graph.DexType,java.util.function.Predicate,int):1945 -> a
-    50:50:com.android.tools.r8.graph.DexType createFreshTypeName(com.android.tools.r8.graph.DexType,java.util.function.Predicate,int):1946:1946 -> a
-    51:51: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):1966:1966 -> a
-    52:56: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):1968:1972 -> a
-    57:57: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):1989:1989 -> a
-    58:62:java.util.Optional lambda$createFreshMethodSignatureName$2(com.android.tools.r8.graph.DexProto,java.util.function.Predicate,com.android.tools.r8.graph.DexString):1991:1995 -> a
-    63:63:com.android.tools.r8.graph.DexField createFreshFieldName(com.android.tools.r8.graph.DexField,java.util.function.Predicate):2008:2008 -> a
-    64:64:com.android.tools.r8.graph.DexField createFreshFieldNameWithHolderSuffix(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2021:2021 -> a
-    65:65:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,java.util.List,java.util.function.Predicate):2038:2038 -> a
-    66:66:boolean com.android.tools.r8.graph.DexMethod.isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):266:266 -> a
-    66:66:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,java.util.List,java.util.function.Predicate):2038 -> a
-    67:68:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,java.util.List,java.util.function.Predicate):2038:2039 -> a
-    69:69:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2047:2047 -> a
-    70:70:boolean com.android.tools.r8.graph.DexMethod.isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):266:266 -> a
-    70:70:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2047 -> a
-    71:74:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2047:2050 -> a
-    75:75:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2048:2048 -> a
-    76:95:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexProto,java.util.List,java.util.function.Function):2056:2075 -> a
-    96:96:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexProto,java.util.List,java.util.function.Function):2074:2074 -> a
-    97:97:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.Class):2124:2124 -> a
-    98:100:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):2128:2130 -> a
-    98:100:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.Class):2123 -> a
-    101:105:void addPossiblySynthesizedType(com.android.tools.r8.graph.DexType):2149:2153 -> a
-    106:107:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):2179:2180 -> a
-    108:110: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):2184:2186 -> a
-    111:111:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):2190:2190 -> a
-    112:113: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):2195:2196 -> a
-    114:117:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2200:2203 -> a
-    118:123:com.android.tools.r8.graph.DexString createShorty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2278:2283 -> a
-    118:123:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2204 -> a
-    124:124:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2201:2201 -> a
-    125:125:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,java.util.List):2208:2208 -> a
-    126:129:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):2222:2225 -> a
-    130:132:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):2224:2226 -> a
-    133:135:com.android.tools.r8.graph.DexProto appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2230:2232 -> a
-    136:139:com.android.tools.r8.graph.DexProto appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2231:2234 -> a
-    140:144:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2244:2248 -> a
-    145:154:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):2265:2274 -> a
-    145:154:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2248 -> a
-    155:161:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2249:2255 -> a
-    162:166:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2254:2258 -> a
-    167:169: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):2287:2289 -> a
-    170:170:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):2293:2293 -> a
-    171:171:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):2301:2301 -> a
+    1:1:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):116:116 -> 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):175:175 -> a
+    2:2:java.util.Optional lambda$internalCreateFreshFieldName$3(com.android.tools.r8.graph.DexField,java.util.function.Predicate,com.android.tools.r8.graph.DexString):2008 -> 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):2008:2008 -> a
+    4:4:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):286:286 -> a
+    4:4:java.util.Optional lambda$createInstanceInitializerWithFreshProto$4(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):2023 -> a
+    5:5:java.util.Optional lambda$createInstanceInitializerWithFreshProto$4(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):2023:2023 -> a
+    6:17:java.util.Set boxedValueOfMethods():613:624 -> a
+    18:20:com.android.tools.r8.graph.DexMethod lambda$boxedValueOfMethods$0(java.util.Map$Entry):616:618 -> a
+    21:21:void setSkipNameValidationForTesting(boolean):744:744 -> a
+    22:22:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1833:1833 -> a
+    23:23:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):116:116 -> a
+    23:23:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1834 -> a
+    24:25:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1834:1835 -> a
+    26:26:com.android.tools.r8.graph.DexString createString(int,byte[]):1841:1841 -> a
+    27:29:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):1854:1856 -> a
+    30:30:java.lang.String escapeMemberString(java.lang.String):1850:1850 -> a
+    30:30:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):1856 -> a
+    31:38:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):1856:1863 -> a
+    39:43:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType):1876:1880 -> a
+    44:44:com.android.tools.r8.graph.DexString createGloballyFreshMemberString(java.lang.String,com.android.tools.r8.graph.DexType):1904:1904 -> a
+    44:44:com.android.tools.r8.graph.DexString createGloballyFreshMemberString(java.lang.String):1917 -> a
+    45:45:com.android.tools.r8.graph.DexString lookupString(java.lang.String):2065:2065 -> a
+    45:45:com.android.tools.r8.graph.DexString createGloballyFreshMemberString(java.lang.String,com.android.tools.r8.graph.DexType):1905 -> a
+    45:45:com.android.tools.r8.graph.DexString createGloballyFreshMemberString(java.lang.String):1917 -> a
+    46:46:com.android.tools.r8.graph.DexString createGloballyFreshMemberString(java.lang.String,com.android.tools.r8.graph.DexType):1907:1907 -> a
+    46:46:com.android.tools.r8.graph.DexString createGloballyFreshMemberString(java.lang.String):1917 -> a
+    47:47:com.android.tools.r8.graph.DexType createFreshTypeName(com.android.tools.r8.graph.DexType,java.util.function.Predicate,int):1926:1926 -> a
+    48:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.addSuffixId(int,com.android.tools.r8.graph.DexItemFactory):452:453 -> a
+    48:49:com.android.tools.r8.graph.DexType createFreshTypeName(com.android.tools.r8.graph.DexType,java.util.function.Predicate,int):1926 -> a
+    50:50:com.android.tools.r8.graph.DexType createFreshTypeName(com.android.tools.r8.graph.DexType,java.util.function.Predicate,int):1927:1927 -> a
+    51:51: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):1947:1947 -> a
+    52:56: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):1949:1953 -> a
+    57:57: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):1970:1970 -> a
+    58:62:java.util.Optional lambda$createFreshMethodSignatureName$2(com.android.tools.r8.graph.DexProto,java.util.function.Predicate,com.android.tools.r8.graph.DexString):1972:1976 -> a
+    63:63:com.android.tools.r8.graph.DexField createFreshFieldName(com.android.tools.r8.graph.DexField,java.util.function.Predicate):1989:1989 -> a
+    64:64:com.android.tools.r8.graph.DexField createFreshFieldNameWithHolderSuffix(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2002:2002 -> a
+    65:65:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,java.util.List,java.util.function.Predicate):2019:2019 -> a
+    66:66:boolean com.android.tools.r8.graph.DexMethod.isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):261:261 -> a
+    66:66:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,java.util.List,java.util.function.Predicate):2019 -> a
+    67:68:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,java.util.List,java.util.function.Predicate):2019:2020 -> a
+    69:69:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2028:2028 -> a
+    70:70:boolean com.android.tools.r8.graph.DexMethod.isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):261:261 -> a
+    70:70:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2028 -> a
+    71:74:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2028:2031 -> a
+    75:75:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2029:2029 -> a
+    76:95:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexProto,java.util.List,java.util.function.Function):2037:2056 -> a
+    96:96:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexProto,java.util.List,java.util.function.Function):2055:2055 -> a
+    97:97:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.Class):2105:2105 -> a
+    98:100:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):2109:2111 -> a
+    98:100:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.Class):2104 -> a
+    101:105:void addPossiblySynthesizedType(com.android.tools.r8.graph.DexType):2130:2134 -> a
+    106:107:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):2160:2161 -> a
+    108:110: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):2165:2167 -> a
+    111:111:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):2171:2171 -> a
+    112:113: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):2176:2177 -> a
+    114:117:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2181:2184 -> a
+    118:123:com.android.tools.r8.graph.DexString createShorty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2259:2264 -> a
+    118:123:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2185 -> a
+    124:124:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2182:2182 -> a
+    125:125:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,java.util.List):2189:2189 -> a
+    126:129:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):2203:2206 -> a
+    130:132:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):2205:2207 -> a
+    133:135:com.android.tools.r8.graph.DexProto appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2211:2213 -> a
+    136:139:com.android.tools.r8.graph.DexProto appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2212:2215 -> a
+    140:144:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2225:2229 -> a
+    145:154:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):2246:2255 -> a
+    145:154:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2229 -> a
+    155:161:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2230:2236 -> a
+    162:166:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2235:2239 -> a
+    167:169: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):2268:2270 -> a
+    170:170:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):2274:2274 -> a
+    171:171:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):2282:2282 -> a
     172:172:void com.android.tools.r8.graph.DexMethodHandle.<init>(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):211:211 -> a
-    172:172:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):2301 -> a
-    173:173:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):2302:2302 -> a
-    174:175: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):2311:2312 -> a
-    176:185: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[]):2320:2329 -> a
-    186:188:com.android.tools.r8.graph.DexDebugEvent$AdvanceLine createAdvanceLine(int):2337:2339 -> a
-    189:191:com.android.tools.r8.graph.DexDebugEvent$SetFile createSetFile(com.android.tools.r8.graph.DexString):2375:2377 -> a
-    192:194:com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame createSetInlineFrame(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):2382:2384 -> a
-    195:195:boolean isClassConstructor(com.android.tools.r8.graph.DexMethod):2392:2392 -> a
-    196: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):2425:2432 -> a
-    204:232: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):2431:2459 -> a
-    233:241:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$8(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):2439:2447 -> a
-    242:253:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$8(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):2446:2457 -> a
-    254:254:com.android.tools.r8.ir.analysis.type.InterfaceCollection getOrComputeLeastUpperBoundOfImplementedInterfaces(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):2464:2464 -> a
-    255:256:com.android.tools.r8.ir.analysis.type.InterfaceCollection lambda$getOrComputeLeastUpperBoundOfImplementedInterfaces$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):2467:2468 -> a
-    257:257:void forAllTypes(java.util.function.Consumer):2474:2474 -> a
-    1:1:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):291:291 -> b
-    1:1:java.util.Optional lambda$createInstanceInitializerWithFreshProto$5(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):2051 -> b
-    2:2:java.util.Optional lambda$createInstanceInitializerWithFreshProto$5(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):2051:2051 -> b
-    3:4:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):614:615 -> b
-    5:6:java.util.Map buildLibraryMethodsNonNullParamOrThrow():691:692 -> b
-    7:7:java.lang.Iterable com.android.tools.r8.graph.DexItemFactory$ObjectsMethods.requireNonNullMethods():1237:1237 -> b
-    7:7:java.util.Map buildLibraryMethodsNonNullParamOrThrow():692 -> b
-    8:11:java.util.Map buildLibraryMethodsNonNullParamOrThrow():692:695 -> b
-    12:15:com.android.tools.r8.graph.DexField internalCreateFreshFieldName(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2026:2026 -> b
-    16:16:com.android.tools.r8.graph.DexProto lambda$createInstanceInitializerWithFreshProto$6(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2075:2075 -> b
-    17:17:com.android.tools.r8.graph.DexString lookupString(int,byte[]):2080:2080 -> b
-    18:18:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.String):2119:2119 -> b
-    19:21:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):2128:2130 -> b
-    19:21:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.String):2119 -> b
-    22:24:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):2128:2130 -> b
-    25:25:void forEachPossiblyCompilerSynthesizedType(java.util.function.Consumer):2162:2162 -> b
-    26:28:com.android.tools.r8.graph.DexDebugEvent$AdvancePC createAdvancePC(int):2343:2345 -> b
-    29:29:boolean isConstructor(com.android.tools.r8.graph.DexMethod):2388:2388 -> b
-    1:1:boolean isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):775:775 -> c
-    2:3:com.android.tools.r8.graph.DexString createString(java.lang.String):1864:1865 -> c
-    4:4:boolean isPossiblyCompilerSynthesizedType(com.android.tools.r8.graph.DexType):2158:2158 -> c
-    5:5:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):2167:2167 -> c
-    6:8:com.android.tools.r8.graph.DexProto protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2212:2214 -> c
-    9:11:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int):2349:2351 -> c
-    12:14:void clearTypeElementsCache():2396:2398 -> c
-    1:9:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):2103:2111 -> d
-    10:10:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):2108:2108 -> d
-    11:11:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):115:115 -> d
-    11:11:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):2112 -> d
-    12:13:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):2112:2113 -> d
-    14:15:com.android.tools.r8.graph.DexType createSynthesizedType(java.lang.String):2137:2138 -> d
-    16:16:void registerTypeNeededForDesugaring(com.android.tools.r8.graph.DexType):2145:2145 -> d
-    17:17:com.android.tools.r8.graph.DexProto prependHolderToProto(com.android.tools.r8.graph.DexMethod):2218:2218 -> d
-    18:20:com.android.tools.r8.graph.DexDebugEvent$EndLocal createEndLocal(int):2355:2357 -> d
-    21:21:com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin createSetEpilogueBegin():2367:2367 -> d
-    1:1:com.android.tools.r8.graph.DexType createType(java.lang.String):2171:2171 -> e
-    2:2:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexString):2175:2175 -> e
-    3:5:com.android.tools.r8.graph.DexDebugEvent$RestartLocal createRestartLocal(int):2361:2363 -> e
-    6:6:com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd createSetPrologueEnd():2371:2371 -> e
-    1:1:com.android.tools.r8.graph.DexString lookupString(java.lang.String):2084:2084 -> f
-    2:6:java.util.List extractMarkers():2091:2095 -> f
-    1:1:boolean getSkipNameValidationForTesting():771:771 -> g
-    1:3:boolean verifyNoCachedTypeElements():2402:2404 -> h
-com.android.tools.r8.graph.DexItemFactory$1 -> com.android.tools.r8.graph.P$a:
-com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildMembers -> com.android.tools.r8.graph.P$b:
+    172:172:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):2282 -> a
+    173:173:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):2283:2283 -> a
+    174:175: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):2292:2293 -> a
+    176:185: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[]):2301:2310 -> a
+    186:188:com.android.tools.r8.graph.DexDebugEvent$AdvanceLine createAdvanceLine(int):2318:2320 -> a
+    189:191:com.android.tools.r8.graph.DexDebugEvent$SetFile createSetFile(com.android.tools.r8.graph.DexString):2356:2358 -> a
+    192:194:com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame createSetInlineFrame(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):2363:2365 -> a
+    195:195:boolean isClassConstructor(com.android.tools.r8.graph.DexMethod):2373:2373 -> a
+    196: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):2406:2413 -> a
+    204:232: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):2412:2440 -> a
+    233:241:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$8(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):2420:2428 -> a
+    242:253:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$8(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):2427:2438 -> a
+    254:254:java.util.Set getOrComputeLeastUpperBoundOfImplementedInterfaces(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):2445:2445 -> a
+    255:256:java.util.Set lambda$getOrComputeLeastUpperBoundOfImplementedInterfaces$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):2448:2449 -> a
+    257:257:void forAllTypes(java.util.function.Consumer):2455:2455 -> a
+    1:1:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):286:286 -> b
+    1:1:java.util.Optional lambda$createInstanceInitializerWithFreshProto$5(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):2032 -> b
+    2:2:java.util.Optional lambda$createInstanceInitializerWithFreshProto$5(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):2032:2032 -> b
+    3:4:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):603:604 -> b
+    5:8:com.android.tools.r8.graph.DexField internalCreateFreshFieldName(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2007:2007 -> b
+    9:9:com.android.tools.r8.graph.DexProto lambda$createInstanceInitializerWithFreshProto$6(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2056:2056 -> b
+    10:10:com.android.tools.r8.graph.DexString lookupString(int,byte[]):2061:2061 -> b
+    11:11:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.String):2100:2100 -> b
+    12:14:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):2109:2111 -> b
+    12:14:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.String):2100 -> b
+    15:17:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):2109:2111 -> b
+    18:18:void forEachPossiblyCompilerSynthesizedType(java.util.function.Consumer):2143:2143 -> b
+    19:21:com.android.tools.r8.graph.DexDebugEvent$AdvancePC createAdvancePC(int):2324:2326 -> b
+    22:22:boolean isConstructor(com.android.tools.r8.graph.DexMethod):2369:2369 -> b
+    23:25:void clearTypeElementsCache():2377:2379 -> b
+    1:1:boolean isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):752:752 -> c
+    2:3:com.android.tools.r8.graph.DexString createString(java.lang.String):1845:1846 -> c
+    4:4:boolean isPossiblyCompilerSynthesizedType(com.android.tools.r8.graph.DexType):2139:2139 -> c
+    5:5:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):2148:2148 -> c
+    6:8:com.android.tools.r8.graph.DexProto protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2193:2195 -> c
+    9:11:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int):2330:2332 -> c
+    12:12:com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin createSetEpilogueBegin():2348:2348 -> c
+    1:9:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):2084:2092 -> d
+    10:10:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):2089:2089 -> d
+    11:11:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):116:116 -> d
+    11:11:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):2093 -> d
+    12:13:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):2093:2094 -> d
+    14:15:com.android.tools.r8.graph.DexType createSynthesizedType(java.lang.String):2118:2119 -> d
+    16:16:void registerTypeNeededForDesugaring(com.android.tools.r8.graph.DexType):2126:2126 -> d
+    17:17:com.android.tools.r8.graph.DexProto prependHolderToProto(com.android.tools.r8.graph.DexMethod):2199:2199 -> d
+    18:20:com.android.tools.r8.graph.DexDebugEvent$EndLocal createEndLocal(int):2336:2338 -> d
+    21:21:com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd createSetPrologueEnd():2352:2352 -> d
+    1:5:java.util.List extractMarkers():2072:2076 -> e
+    6:6:com.android.tools.r8.graph.DexType createType(java.lang.String):2152:2152 -> e
+    7:7:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexString):2156:2156 -> e
+    8:10:com.android.tools.r8.graph.DexDebugEvent$RestartLocal createRestartLocal(int):2342:2344 -> e
+    1:1:boolean getSkipNameValidationForTesting():748:748 -> f
+    2:2:com.android.tools.r8.graph.DexString lookupString(java.lang.String):2065:2065 -> f
+    1:3:boolean verifyNoCachedTypeElements():2383:2385 -> g
+com.android.tools.r8.graph.DexItemFactory$1 -> com.android.tools.r8.graph.O$a:
+com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildMembers -> com.android.tools.r8.graph.O$b:
     com.android.tools.r8.graph.DexField TYPE -> q
     com.android.tools.r8.graph.DexField SUPPORTED_64_BIT_ABIS -> n
     com.android.tools.r8.graph.DexField SUPPORTED_32_BIT_ABIS -> m
     com.android.tools.r8.graph.DexField TIME -> p
     com.android.tools.r8.graph.DexField SUPPORTED_ABIS -> o
     com.android.tools.r8.graph.DexField MODEL -> j
+    com.android.tools.r8.graph.DexItemFactory this$0 -> r
     com.android.tools.r8.graph.DexField MANUFACTURER -> i
     com.android.tools.r8.graph.DexField SERIAL -> l
     com.android.tools.r8.graph.DexField PRODUCT -> k
@@ -19364,46 +19409,53 @@
     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):783:805 -> <init>
-    1:17:void forEachFinalField(java.util.function.Consumer):809:825 -> a
-com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildVersionMembers -> com.android.tools.r8.graph.P$c:
+    1:23:void <init>(com.android.tools.r8.graph.DexItemFactory):760:782 -> <init>
+    1:17:void forEachFinalField(java.util.function.Consumer):786:802 -> a
+com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildVersionMembers -> com.android.tools.r8.graph.O$c:
+    com.android.tools.r8.graph.DexItemFactory this$0 -> f
     com.android.tools.r8.graph.DexField SECURITY_PATCH -> e
     com.android.tools.r8.graph.DexField RELEASE -> b
     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):829:836 -> <init>
-    1:5:void forEachFinalField(java.util.function.Consumer):840:844 -> a
-com.android.tools.r8.graph.DexItemFactory$AndroidOsBundleMembers -> com.android.tools.r8.graph.P$d:
+    1:8:void <init>(com.android.tools.r8.graph.DexItemFactory):806:813 -> <init>
+    1:5:void forEachFinalField(java.util.function.Consumer):817:821 -> a
+com.android.tools.r8.graph.DexItemFactory$AndroidOsBundleMembers -> com.android.tools.r8.graph.O$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):848:852 -> <init>
-    1:2:void forEachFinalField(java.util.function.Consumer):856:857 -> a
-com.android.tools.r8.graph.DexItemFactory$AndroidSystemOsConstantsMembers -> com.android.tools.r8.graph.P$e:
+    1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):825:829 -> <init>
+    1:2:void forEachFinalField(java.util.function.Consumer):833:834 -> a
+com.android.tools.r8.graph.DexItemFactory$AndroidSystemOsConstantsMembers -> com.android.tools.r8.graph.O$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):861:864 -> <init>
-    1:2:void forEachFinalField(java.util.function.Consumer):868:869 -> a
-com.android.tools.r8.graph.DexItemFactory$AndroidViewViewMembers -> com.android.tools.r8.graph.P$f:
+    1:4:void <init>(com.android.tools.r8.graph.DexItemFactory):838:841 -> <init>
+    1:2:void forEachFinalField(java.util.function.Consumer):845:846 -> a
+com.android.tools.r8.graph.DexItemFactory$AndroidViewViewMembers -> com.android.tools.r8.graph.O$f:
+    com.android.tools.r8.graph.DexItemFactory this$0 -> f
     com.android.tools.r8.graph.DexField SELECTED_STATE_SET -> e
     com.android.tools.r8.graph.DexField EMPTY_STATE_SET -> b
     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):873:884 -> <init>
-    1:5:void forEachFinalField(java.util.function.Consumer):888:892 -> a
-com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods -> com.android.tools.r8.graph.P$g:
+    1:12:void <init>(com.android.tools.r8.graph.DexItemFactory):850:861 -> <init>
+    1:5:void forEachFinalField(java.util.function.Consumer):865:869 -> a
+com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods -> com.android.tools.r8.graph.O$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):1160:1160 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1164:1169 -> <init>
-com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods -> com.android.tools.r8.graph.P$h:
-    java.util.Set updaters -> b
-    com.android.tools.r8.graph.DexMethod referenceUpdater -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1484:1484 -> <init>
-    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):1490:1509 -> <init>
-    1:1:boolean isFieldUpdater(com.android.tools.r8.graph.DexMethod):1513:1513 -> a
-com.android.tools.r8.graph.DexItemFactory$BooleanMembers -> com.android.tools.r8.graph.P$i:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1137:1137 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1141:1146 -> <init>
+com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods -> com.android.tools.r8.graph.O$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):1465:1465 -> <init>
+    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):1471:1490 -> <init>
+    1:1:boolean isFieldUpdater(com.android.tools.r8.graph.DexMethod):1494:1494 -> a
+com.android.tools.r8.graph.DexItemFactory$BooleanMembers -> com.android.tools.r8.graph.O$i:
+    com.android.tools.r8.graph.DexItemFactory this$0 -> h
     com.android.tools.r8.graph.DexField TRUE -> b
     com.android.tools.r8.graph.DexMethod toString -> g
     com.android.tools.r8.graph.DexField FALSE -> a
@@ -19411,23 +19463,28 @@
     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):896:896 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):873:873 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):888:888 -> <init>
+    3:14:void <init>(com.android.tools.r8.graph.DexItemFactory):875:886 -> <init>
+    1:3:void forEachFinalField(java.util.function.Consumer):892:894 -> a
+com.android.tools.r8.graph.DexItemFactory$ByteMembers -> com.android.tools.r8.graph.O$j:
+    com.android.tools.r8.graph.DexItemFactory this$0 -> b
+    com.android.tools.r8.graph.DexMethod toString -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):898:898 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):903:903 -> <init>
+    3:4:void <init>(com.android.tools.r8.graph.DexItemFactory):900:901 -> <init>
+com.android.tools.r8.graph.DexItemFactory$CharMembers -> com.android.tools.r8.graph.O$k:
+    com.android.tools.r8.graph.DexItemFactory this$0 -> b
+    com.android.tools.r8.graph.DexMethod toString -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):906:906 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):911:911 -> <init>
-    3:14:void <init>(com.android.tools.r8.graph.DexItemFactory):898:909 -> <init>
-    1:3:void forEachFinalField(java.util.function.Consumer):915:917 -> a
-com.android.tools.r8.graph.DexItemFactory$ByteMembers -> com.android.tools.r8.graph.P$j:
-    com.android.tools.r8.graph.DexMethod toString -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):921:921 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):926:926 -> <init>
-    3:4:void <init>(com.android.tools.r8.graph.DexItemFactory):923:924 -> <init>
-com.android.tools.r8.graph.DexItemFactory$CharMembers -> com.android.tools.r8.graph.P$k:
-    com.android.tools.r8.graph.DexMethod toString -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):929:929 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):934:934 -> <init>
-    3:4:void <init>(com.android.tools.r8.graph.DexItemFactory):931:932 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ClassMethods -> com.android.tools.r8.graph.P$l:
-    com.android.tools.r8.graph.DexMethod newInstance -> l
-    com.android.tools.r8.graph.DexMethod getPackage -> k
+    3:4:void <init>(com.android.tools.r8.graph.DexItemFactory):908:909 -> <init>
+com.android.tools.r8.graph.DexItemFactory$ClassMethods -> com.android.tools.r8.graph.O$l:
+    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
@@ -19438,165 +19495,144 @@
     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 getMembers -> m
-    java.util.Set getNames -> n
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1242:1242 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1265:1265 -> <init>
-    3:62:void <init>(com.android.tools.r8.graph.DexItemFactory):1247:1306 -> <init>
-    1:1:boolean isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):1310:1310 -> a
-    1:1:boolean isReflectiveMemberLookup(com.android.tools.r8.graph.DexMethod):1314:1314 -> b
-com.android.tools.r8.graph.DexItemFactory$ConstructorMethods -> com.android.tools.r8.graph.P$m:
+    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):1219:1219 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1242:1242 -> <init>
+    3:62:void <init>(com.android.tools.r8.graph.DexItemFactory):1224:1283 -> <init>
+    1:1:boolean isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):1287:1287 -> a
+    1:1:boolean isReflectiveMemberLookup(com.android.tools.r8.graph.DexMethod):1291:1291 -> b
+com.android.tools.r8.graph.DexItemFactory$ConstructorMethods -> com.android.tools.r8.graph.O$m:
     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):1322:1322 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1326:1328 -> <init>
-com.android.tools.r8.graph.DexItemFactory$DoubleMembers -> com.android.tools.r8.graph.P$n:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1299:1299 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1303:1305 -> <init>
+com.android.tools.r8.graph.DexItemFactory$DoubleMembers -> com.android.tools.r8.graph.O$n:
+    com.android.tools.r8.graph.DexItemFactory this$0 -> c
     com.android.tools.r8.graph.DexMethod toString -> b
     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):1107:1107 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1114:1114 -> <init>
-    3:10:void <init>(com.android.tools.r8.graph.DexItemFactory):1111:1118 -> <init>
-    11:11:void <init>(com.android.tools.r8.graph.DexItemFactory):1116:1116 -> <init>
-com.android.tools.r8.graph.DexItemFactory$EnumMembers -> com.android.tools.r8.graph.P$o:
-    com.android.tools.r8.graph.DexMethod finalize -> l
-    com.android.tools.r8.graph.DexMethod constructor -> k
-    com.android.tools.r8.graph.DexMethod hashCode -> j
-    com.android.tools.r8.graph.DexMethod equals -> i
-    com.android.tools.r8.graph.DexMethod compareTo -> h
-    com.android.tools.r8.graph.DexMethod toString -> g
-    com.android.tools.r8.graph.DexMethod nameMethod -> f
-    com.android.tools.r8.graph.DexMethod ordinalMethod -> e
-    com.android.tools.r8.graph.DexMethod valueOf -> d
-    com.android.tools.r8.graph.DexField nameField -> b
-    com.android.tools.r8.graph.DexField ordinalField -> c
-    com.android.tools.r8.graph.DexItemFactory this$0 -> m
-    boolean $assertionsDisabled -> a
-    1:1:void <clinit>():1349:1349 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1349:1349 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1367:1367 -> <init>
-    3:46:void <init>(com.android.tools.r8.graph.DexItemFactory):1351:1394 -> <init>
-    1:1:boolean isEnumField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1407:1407 -> a
-    2:2:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():209:209 -> a
-    2:2:boolean isEnumField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1407 -> a
-    3:3:boolean isEnumField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1407:1407 -> a
-    4:4:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():164:164 -> a
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.getType():168 -> a
-    4:4:boolean isEnumField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1408 -> a
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():49:49 -> a
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.getType():168 -> a
-    5:5:boolean isEnumField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1408 -> a
-    6:6:boolean com.android.tools.r8.graph.DexEncodedField.isEnum():200:200 -> a
-    6:6:boolean isEnumField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1408 -> a
-    7:7:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():204:204 -> a
-    7:7:boolean isEnumField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1408 -> a
-    1:1:boolean isValuesFieldCandidate(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1412:1412 -> b
-    2:2:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():209:209 -> b
-    2:2:boolean isValuesFieldCandidate(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1412 -> b
-    3:3:boolean isValuesFieldCandidate(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1412:1412 -> b
-    4:4:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():164:164 -> b
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.getType():168 -> b
-    4:4:boolean isValuesFieldCandidate(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1413 -> b
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():49:49 -> b
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.getType():168 -> b
-    5:5:boolean isValuesFieldCandidate(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1413 -> b
-    6:6:boolean isValuesFieldCandidate(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1413:1413 -> b
-    7:7:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():164:164 -> b
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.getType():168 -> b
-    7:7:boolean isValuesFieldCandidate(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1414 -> b
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():49:49 -> b
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.getType():168 -> b
-    8:8:boolean isValuesFieldCandidate(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1414 -> b
-    9:9:boolean isValuesFieldCandidate(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1414:1414 -> b
-    10:10:boolean com.android.tools.r8.graph.DexEncodedField.isSynthetic():230:230 -> b
-    10:10:boolean isValuesFieldCandidate(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1415 -> b
-    11:11:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():204:204 -> b
-    11:11:boolean isValuesFieldCandidate(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1416 -> b
-com.android.tools.r8.graph.DexItemFactory$FloatMembers -> com.android.tools.r8.graph.P$p:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1084:1084 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1091:1091 -> <init>
+    3:10:void <init>(com.android.tools.r8.graph.DexItemFactory):1088:1095 -> <init>
+    11:11:void <init>(com.android.tools.r8.graph.DexItemFactory):1093:1093 -> <init>
+com.android.tools.r8.graph.DexItemFactory$EnumMembers -> com.android.tools.r8.graph.O$o:
+    com.android.tools.r8.graph.DexMethod finalize -> k
+    com.android.tools.r8.graph.DexMethod constructor -> j
+    com.android.tools.r8.graph.DexMethod hashCode -> i
+    com.android.tools.r8.graph.DexMethod equals -> h
+    com.android.tools.r8.graph.DexField ordinalField -> b
+    com.android.tools.r8.graph.DexMethod compareTo -> g
+    com.android.tools.r8.graph.DexField nameField -> a
+    com.android.tools.r8.graph.DexMethod toString -> f
+    com.android.tools.r8.graph.DexMethod nameMethod -> e
+    com.android.tools.r8.graph.DexItemFactory this$0 -> l
+    com.android.tools.r8.graph.DexMethod ordinalMethod -> d
+    com.android.tools.r8.graph.DexMethod valueOf -> c
+    1:1:void <clinit>():1326:1326 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1326:1326 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1344:1344 -> <init>
+    3:46:void <init>(com.android.tools.r8.graph.DexItemFactory):1328:1371 -> <init>
+com.android.tools.r8.graph.DexItemFactory$FloatMembers -> com.android.tools.r8.graph.O$p:
+    com.android.tools.r8.graph.DexItemFactory this$0 -> c
     com.android.tools.r8.graph.DexField TYPE -> a
     com.android.tools.r8.graph.DexMethod toString -> b
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):937:937 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):944:944 -> <init>
-    3:6:void <init>(com.android.tools.r8.graph.DexItemFactory):939:942 -> <init>
-    1:1:void forEachFinalField(java.util.function.Consumer):948:948 -> a
-com.android.tools.r8.graph.DexItemFactory$IllegalArgumentExceptionMethods -> com.android.tools.r8.graph.P$q:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):914:914 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):921:921 -> <init>
+    3:6:void <init>(com.android.tools.r8.graph.DexItemFactory):916:919 -> <init>
+    1:1:void forEachFinalField(java.util.function.Consumer):925:925 -> a
+com.android.tools.r8.graph.DexItemFactory$IllegalArgumentExceptionMethods -> com.android.tools.r8.graph.O$q:
+    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):1428:1432 -> <init>
-    6:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1431:1431 -> <init>
-com.android.tools.r8.graph.DexItemFactory$IntegerMembers -> com.android.tools.r8.graph.P$r:
+    1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):1409:1413 -> <init>
+    6:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1412:1412 -> <init>
+com.android.tools.r8.graph.DexItemFactory$IntegerMembers -> com.android.tools.r8.graph.O$r:
+    com.android.tools.r8.graph.DexItemFactory this$0 -> c
     com.android.tools.r8.graph.DexField TYPE -> a
     com.android.tools.r8.graph.DexMethod toString -> b
-    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1124:1129 -> <init>
-    1:1:void forEachFinalField(java.util.function.Consumer):1133:1133 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaIoFileMembers -> com.android.tools.r8.graph.P$s:
+    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1101:1106 -> <init>
+    1:1:void forEachFinalField(java.util.function.Consumer):1110:1110 -> a
+com.android.tools.r8.graph.DexItemFactory$JavaIoFileMembers -> com.android.tools.r8.graph.O$s:
+    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):952:955 -> <init>
-    1:2:void forEachFinalField(java.util.function.Consumer):959:960 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaLangSystemMethods -> com.android.tools.r8.graph.P$t:
+    1:4:void <init>(com.android.tools.r8.graph.DexItemFactory):929:932 -> <init>
+    1:2:void forEachFinalField(java.util.function.Consumer):936:937 -> a
+com.android.tools.r8.graph.DexItemFactory$JavaLangSystemMethods -> com.android.tools.r8.graph.O$t:
     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):1336:1336 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1339:1341 -> <init>
-com.android.tools.r8.graph.DexItemFactory$JavaMathBigIntegerMembers -> com.android.tools.r8.graph.P$u:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1313:1313 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1316:1318 -> <init>
+com.android.tools.r8.graph.DexItemFactory$JavaMathBigIntegerMembers -> com.android.tools.r8.graph.O$u:
+    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):964:968 -> <init>
-    1:2:void forEachFinalField(java.util.function.Consumer):972:973 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaNioByteOrderMembers -> com.android.tools.r8.graph.P$v:
+    1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):941:945 -> <init>
+    1:2:void forEachFinalField(java.util.function.Consumer):949:950 -> a
+com.android.tools.r8.graph.DexItemFactory$JavaNioByteOrderMembers -> com.android.tools.r8.graph.O$v:
+    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):977:982 -> <init>
-    1:2:void forEachFinalField(java.util.function.Consumer):986:987 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods -> com.android.tools.r8.graph.P$w:
+    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):954:959 -> <init>
+    1:2:void forEachFinalField(java.util.function.Consumer):963:964 -> a
+com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods -> com.android.tools.r8.graph.O$w:
     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):991:991 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.DexItemFactory):995:999 -> <init>
-    7:7:void <init>(com.android.tools.r8.graph.DexItemFactory):997:997 -> <init>
-com.android.tools.r8.graph.DexItemFactory$JavaUtilComparatorMembers -> com.android.tools.r8.graph.P$x:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):968:968 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.DexItemFactory):972:976 -> <init>
+    7:7:void <init>(com.android.tools.r8.graph.DexItemFactory):974:974 -> <init>
+com.android.tools.r8.graph.DexItemFactory$JavaUtilComparatorMembers -> com.android.tools.r8.graph.O$x:
+    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):1005:1010 -> <init>
-    1:2:void forEachFinalField(java.util.function.Consumer):1014:1015 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaUtilConcurrentTimeUnitMembers -> com.android.tools.r8.graph.P$y:
+    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):982:987 -> <init>
+    1:2:void forEachFinalField(java.util.function.Consumer):991:992 -> a
+com.android.tools.r8.graph.DexItemFactory$JavaUtilConcurrentTimeUnitMembers -> com.android.tools.r8.graph.O$y:
     com.android.tools.r8.graph.DexField NANOSECONDS -> f
     com.android.tools.r8.graph.DexField MINUTES -> e
+    com.android.tools.r8.graph.DexItemFactory this$0 -> h
     com.android.tools.r8.graph.DexField SECONDS -> g
     com.android.tools.r8.graph.DexField HOURS -> b
     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):1019:1034 -> <init>
-    1:7:void forEachFinalField(java.util.function.Consumer):1038:1044 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaUtilLocaleMembers -> com.android.tools.r8.graph.P$z:
+    1:16:void <init>(com.android.tools.r8.graph.DexItemFactory):996:1011 -> <init>
+    1:7:void forEachFinalField(java.util.function.Consumer):1015:1021 -> a
+com.android.tools.r8.graph.DexItemFactory$JavaUtilLocaleMembers -> com.android.tools.r8.graph.O$z:
+    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):1048:1052 -> <init>
-    1:3:void forEachFinalField(java.util.function.Consumer):1056:1058 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaUtilLoggingLevelMembers -> com.android.tools.r8.graph.P$A:
+    1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):1025:1029 -> <init>
+    1:3:void forEachFinalField(java.util.function.Consumer):1033:1035 -> a
+com.android.tools.r8.graph.DexItemFactory$JavaUtilLoggingLevelMembers -> com.android.tools.r8.graph.O$A:
     com.android.tools.r8.graph.DexField WARNING -> f
     com.android.tools.r8.graph.DexField SEVERE -> e
+    com.android.tools.r8.graph.DexItemFactory this$0 -> g
     com.android.tools.r8.graph.DexField FINE -> b
     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):1062:1075 -> <init>
-    1:6:void forEachFinalField(java.util.function.Consumer):1079:1084 -> a
-com.android.tools.r8.graph.DexItemFactory$LibraryMembers -> com.android.tools.r8.graph.P$B:
-    1:1:void <init>():778:778 -> <init>
+    1:14:void <init>(com.android.tools.r8.graph.DexItemFactory):1039:1052 -> <init>
+    1:6:void forEachFinalField(java.util.function.Consumer):1056:1061 -> a
+com.android.tools.r8.graph.DexItemFactory$LibraryMembers -> com.android.tools.r8.graph.O$B:
+    1:1:void <init>():755:755 -> <init>
     void forEachFinalField(java.util.function.Consumer) -> a
-com.android.tools.r8.graph.DexItemFactory$LongMembers -> com.android.tools.r8.graph.P$C:
+com.android.tools.r8.graph.DexItemFactory$LongMembers -> com.android.tools.r8.graph.O$C:
+    com.android.tools.r8.graph.DexItemFactory this$0 -> c
     com.android.tools.r8.graph.DexField TYPE -> a
     com.android.tools.r8.graph.DexMethod toString -> b
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1088:1088 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1096:1096 -> <init>
-    3:11:void <init>(com.android.tools.r8.graph.DexItemFactory):1090:1098 -> <init>
-    12:12:void <init>(com.android.tools.r8.graph.DexItemFactory):1097:1097 -> <init>
-    1:1:void forEachFinalField(java.util.function.Consumer):1103:1103 -> a
-com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods -> com.android.tools.r8.graph.P$D:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1065:1065 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1073:1073 -> <init>
+    3:11:void <init>(com.android.tools.r8.graph.DexItemFactory):1067:1075 -> <init>
+    12:12:void <init>(com.android.tools.r8.graph.DexItemFactory):1074:1074 -> <init>
+    1:1:void forEachFinalField(java.util.function.Consumer):1080:1080 -> a
+com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods -> com.android.tools.r8.graph.O$D:
+    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):1420:1425 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ObjectMembers -> com.android.tools.r8.graph.P$E:
+    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1401:1406 -> <init>
+com.android.tools.r8.graph.DexItemFactory$ObjectMembers -> com.android.tools.r8.graph.O$E:
     com.android.tools.r8.graph.DexMethod toString -> h
+    com.android.tools.r8.graph.DexItemFactory this$0 -> i
     com.android.tools.r8.graph.DexMethod finalize -> g
     com.android.tools.r8.graph.DexField clinitField -> a
     com.android.tools.r8.graph.DexMethod constructor -> f
@@ -19604,21 +19640,22 @@
     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):1174:1174 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1192:1192 -> <init>
-    3:23:void <init>(com.android.tools.r8.graph.DexItemFactory):1181:1201 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ObjectsMethods -> com.android.tools.r8.graph.P$F:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1151:1151 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1169:1169 -> <init>
+    3:23:void <init>(com.android.tools.r8.graph.DexItemFactory):1158:1178 -> <init>
+com.android.tools.r8.graph.DexItemFactory$ObjectsMethods -> com.android.tools.r8.graph.O$F:
+    com.android.tools.r8.graph.DexItemFactory this$0 -> e
     com.android.tools.r8.graph.DexMethod toStringWithObject -> 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):1206:1206 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1214:1214 -> <init>
-    3:13:void <init>(com.android.tools.r8.graph.DexItemFactory):1211:1221 -> <init>
-    14:21:void <init>(com.android.tools.r8.graph.DexItemFactory):1219:1226 -> <init>
-    22:22:void <init>(com.android.tools.r8.graph.DexItemFactory):1224:1224 -> <init>
-    1:1:boolean isRequireNonNullMethod(com.android.tools.r8.graph.DexMethod):1231:1231 -> a
-com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods -> com.android.tools.r8.graph.P$G:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1183:1183 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1191:1191 -> <init>
+    3:13:void <init>(com.android.tools.r8.graph.DexItemFactory):1188:1198 -> <init>
+    14:21:void <init>(com.android.tools.r8.graph.DexItemFactory):1196:1203 -> <init>
+    22:22:void <init>(com.android.tools.r8.graph.DexItemFactory):1201:1201 -> <init>
+    1:1:boolean isRequireNonNullMethod(com.android.tools.r8.graph.DexMethod):1208:1208 -> a
+com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods -> com.android.tools.r8.graph.O$G:
     com.android.tools.r8.graph.DexProto compareAndSetSignature -> c
     java.util.Set varHandleMethods -> d
     com.android.tools.r8.graph.DexItemFactory this$0 -> g
@@ -19626,55 +19663,74 @@
     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):1740:1775 -> <init>
-    1:11:com.android.tools.r8.graph.DexMethod canonicalize(com.android.tools.r8.graph.DexMethod):1783:1793 -> a
-    12:17:java.util.Set createStrings(java.lang.String[]):1800:1805 -> a
-com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields -> com.android.tools.r8.graph.P$H:
-    java.util.Map boxedFieldTypeToPrimitiveType -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1441:1441 -> <init>
-    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):1453:1472 -> <init>
-    1:1:com.android.tools.r8.graph.DexType boxedFieldTypeToPrimitiveType(com.android.tools.r8.graph.DexField):1476:1476 -> a
-com.android.tools.r8.graph.DexItemFactory$ProxyMethods -> com.android.tools.r8.graph.P$I:
+    1:36:void <init>(com.android.tools.r8.graph.DexItemFactory):1721:1756 -> <init>
+    1:11:com.android.tools.r8.graph.DexMethod canonicalize(com.android.tools.r8.graph.DexMethod):1764:1774 -> a
+    12:17:java.util.Set createStrings(java.lang.String[]):1781:1786 -> a
+com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields -> com.android.tools.r8.graph.O$H:
+    com.android.tools.r8.graph.DexField floatTYPE -> f
+    com.android.tools.r8.graph.DexField longTYPE -> e
+    com.android.tools.r8.graph.DexField doubleTYPE -> g
+    com.android.tools.r8.graph.DexField charTYPE -> b
+    com.android.tools.r8.graph.DexField byteTYPE -> a
+    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):1422:1422 -> <init>
+    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):1434:1453 -> <init>
+    1:1:com.android.tools.r8.graph.DexType boxedFieldTypeToPrimitiveType(com.android.tools.r8.graph.DexField):1457:1457 -> a
+com.android.tools.r8.graph.DexItemFactory$ProxyMethods -> com.android.tools.r8.graph.O$I:
     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):1809:1809 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1813:1818 -> <init>
-    8:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1815:1815 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods -> com.android.tools.r8.graph.P$J:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1790:1790 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1794:1799 -> <init>
+    8:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1796:1796 -> <init>
+com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods -> com.android.tools.r8.graph.O$J:
     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):1822:1822 -> <init>
-    2:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1829:1835 -> <init>
-    9:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1833:1841 -> <init>
-    18:23:void <init>(com.android.tools.r8.graph.DexItemFactory):1838:1843 -> <init>
-    1:1:boolean isLoadMethod(com.android.tools.r8.graph.DexMethod):1847:1847 -> a
-com.android.tools.r8.graph.DexItemFactory$ShortMembers -> com.android.tools.r8.graph.P$K:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1803:1803 -> <init>
+    2:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1810:1816 -> <init>
+    9:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1814:1822 -> <init>
+    18:23:void <init>(com.android.tools.r8.graph.DexItemFactory):1819:1824 -> <init>
+    1:1:boolean isLoadMethod(com.android.tools.r8.graph.DexMethod):1828:1828 -> a
+com.android.tools.r8.graph.DexItemFactory$ShortMembers -> com.android.tools.r8.graph.O$K:
+    com.android.tools.r8.graph.DexItemFactory this$0 -> b
     com.android.tools.r8.graph.DexMethod toString -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1517:1517 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1522:1522 -> <init>
-    3:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1519:1520 -> <init>
-com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods -> com.android.tools.r8.graph.P$L:
-    java.util.Set appendMethods -> i
-    java.util.Set appendPrimitiveMethods -> j
-    com.android.tools.r8.graph.DexMethod toString -> h
-    com.android.tools.r8.graph.DexMethod stringConstructor -> g
-    com.android.tools.r8.graph.DexMethod intConstructor -> f
-    com.android.tools.r8.graph.DexMethod defaultConstructor -> e
-    com.android.tools.r8.graph.DexItemFactory this$0 -> l
-    com.android.tools.r8.graph.DexMethod charSequenceConstructor -> d
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1498:1498 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1503:1503 -> <init>
+    3:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1500:1501 -> <init>
+com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods -> com.android.tools.r8.graph.O$L:
+    com.android.tools.r8.graph.DexMethod charSequenceConstructor -> o
+    com.android.tools.r8.graph.DexMethod appendStringBuffer -> n
+    com.android.tools.r8.graph.DexMethod appendString -> m
+    com.android.tools.r8.graph.DexMethod appendObject -> l
+    com.android.tools.r8.graph.DexMethod appendLong -> k
+    com.android.tools.r8.graph.DexMethod appendFloat -> j
+    java.util.Set appendMethods -> t
+    com.android.tools.r8.graph.DexMethod appendDouble -> i
+    java.util.Set appendPrimitiveMethods -> u
+    com.android.tools.r8.graph.DexMethod appendInt -> h
+    java.util.Set constructorMethods -> v
+    com.android.tools.r8.graph.DexMethod appendSubCharSequence -> g
+    com.android.tools.r8.graph.DexMethod appendCharSequence -> f
+    com.android.tools.r8.graph.DexMethod appendSubCharArray -> e
+    com.android.tools.r8.graph.DexMethod appendCharArray -> d
+    com.android.tools.r8.graph.DexMethod appendChar -> c
+    com.android.tools.r8.graph.DexMethod appendBoolean -> b
+    com.android.tools.r8.graph.DexItemFactory this$0 -> w
     boolean $assertionsDisabled -> a
-    com.android.tools.r8.graph.DexMethod appendString -> c
-    java.util.Set constructorMethods -> k
-    com.android.tools.r8.graph.DexMethod appendObject -> b
-    1:1:void <clinit>():1611:1611 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory$1):1611:1611 -> <init>
-    2:48:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):1635:1681 -> <init>
-    1:1:java.util.Set access$2200(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):1611:1611 -> a
-    2:2:boolean isAppendMethod(com.android.tools.r8.graph.DexMethod):1688:1688 -> a
-    3:29:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.graph.DexMethod,java.util.List):1709:1735 -> a
-    1:1:boolean isAppendPrimitiveMethod(com.android.tools.r8.graph.DexMethod):1696:1696 -> b
-com.android.tools.r8.graph.DexItemFactory$StringMembers -> com.android.tools.r8.graph.P$M:
+    com.android.tools.r8.graph.DexMethod toString -> s
+    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>():1592:1592 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory$1):1592:1592 -> <init>
+    2:48:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):1616:1662 -> <init>
+    1:1:java.util.Set access$2200(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):1592:1592 -> a
+    2:2:boolean isAppendMethod(com.android.tools.r8.graph.DexMethod):1669:1669 -> a
+    3:29:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.graph.DexMethod,java.util.List):1690:1716 -> a
+    1:1:boolean isAppendPrimitiveMethod(com.android.tools.r8.graph.DexMethod):1677:1677 -> b
+com.android.tools.r8.graph.DexItemFactory$StringMembers -> com.android.tools.r8.graph.O$M:
     com.android.tools.r8.graph.DexMethod lastIndexOfString -> o
     com.android.tools.r8.graph.DexMethod lastIndexOfInt -> n
     com.android.tools.r8.graph.DexMethod indexOfString -> m
@@ -19689,6 +19745,7 @@
     com.android.tools.r8.graph.DexMethod concat -> d
     com.android.tools.r8.graph.DexMethod length -> c
     com.android.tools.r8.graph.DexMethod isEmpty -> b
+    com.android.tools.r8.graph.DexItemFactory this$0 -> w
     com.android.tools.r8.graph.DexField CASE_INSENSITIVE_ORDER -> a
     com.android.tools.r8.graph.DexMethod trim -> v
     com.android.tools.r8.graph.DexMethod intern -> u
@@ -19697,140 +19754,132 @@
     com.android.tools.r8.graph.DexMethod hashCode -> r
     com.android.tools.r8.graph.DexMethod compareToIgnoreCase -> q
     com.android.tools.r8.graph.DexMethod compareTo -> p
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1525:1525 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1557:1557 -> <init>
-    3:77:void <init>(com.android.tools.r8.graph.DexItemFactory):1527:1601 -> <init>
-    1:1:void forEachFinalField(java.util.function.Consumer):1607:1607 -> a
-com.android.tools.r8.graph.DexItemFactory$ThrowableMethods -> com.android.tools.r8.graph.P$N:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1506:1506 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1538:1538 -> <init>
+    3:77:void <init>(com.android.tools.r8.graph.DexItemFactory):1508:1582 -> <init>
+    1:1:void forEachFinalField(java.util.function.Consumer):1588:1588 -> a
+com.android.tools.r8.graph.DexItemFactory$ThrowableMethods -> com.android.tools.r8.graph.O$N:
     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):1137:1137 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1144:1146 -> <init>
-    5:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1145:1148 -> <init>
-    9:16:void <init>(com.android.tools.r8.graph.DexItemFactory):1147:1154 -> <init>
-    17:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1152:1152 -> <init>
-com.android.tools.r8.graph.DexLibraryClass -> com.android.tools.r8.graph.Q:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1114:1114 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1121:1123 -> <init>
+    5:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1122:1125 -> <init>
+    9:16:void <init>(com.android.tools.r8.graph.DexItemFactory):1124:1131 -> <init>
+    17:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1129:1129 -> <init>
+com.android.tools.r8.graph.DexLibraryClass -> com.android.tools.r8.graph.P:
     int $r8$clinit -> t
     boolean $assertionsDisabled -> s
-    1:1:void <clinit>():20:20 -> <clinit>
-    1:28:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,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.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean):41:68 -> <init>
+    1:1:void <clinit>():19:19 -> <clinit>
+    1:28:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,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.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean):40:67 -> <init>
     com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> J
-    1:3:boolean verifyLibraryMethod(com.android.tools.r8.graph.DexEncodedMethod):76:78 -> a
-    4:4:void accept(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):93:93 -> a
-    5:10:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):143:148 -> a
-    1:1:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):109:109 -> b
-    1:1:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):83:83 -> e
-    2:2:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():209:209 -> e
-    2:2:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):84 -> e
-    3:3:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):84:84 -> e
-    1:1:java.lang.String toSourceString():103:103 -> s
-    1:1:java.lang.String toString():98:98 -> toString
-    boolean isNotProgramClass() -> z0
-com.android.tools.r8.graph.DexMember -> com.android.tools.r8.graph.S:
+    1:3:boolean verifyLibraryMethod(com.android.tools.r8.graph.DexEncodedMethod):75:77 -> a
+    4:9:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):134:139 -> a
+    1:1:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):100:100 -> b
+    1:1:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):82:82 -> e
+    2:2:boolean com.android.tools.r8.graph.DexEncodedField.isPrivate():207:207 -> e
+    2:2:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):82 -> e
+    3:3:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):82:82 -> e
+    4:4:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():199:199 -> e
+    4:4:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):83 -> e
+    5:5:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):83:83 -> e
+    1:1:java.lang.String toSourceString():94:94 -> s
+    1:1:java.lang.String toString():89:89 -> toString
+    boolean isNotProgramClass() -> v0
+com.android.tools.r8.graph.DexMember -> com.android.tools.r8.graph.Q:
     com.android.tools.r8.graph.DexString name -> g
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexType holder -> f
     1:1:void <clinit>():9:9 -> <clinit>
     1:5:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):15:19 -> <init>
-    1:1:com.android.tools.r8.graph.DexString getName():45:45 -> C
+    1:1:com.android.tools.r8.graph.DexString getName():43:43 -> C
     java.lang.Iterable getReferencedTypes() -> D
-    java.lang.Object apply(java.util.function.Function,java.util.function.Function) -> a
-    com.android.tools.r8.graph.DexClassAndMember lookupMemberOnClass(com.android.tools.r8.graph.DexClass) -> a
+    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):61:61 -> a
-    2:2:com.android.tools.r8.graph.DexType lambda$getReferencedBaseTypes$0(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):61:61 -> a
-    com.android.tools.r8.graph.DexEncodedMember lookupOnClass(com.android.tools.r8.graph.DexClass) -> b
-    1:1:com.android.tools.r8.graph.DexType getHolderType():41:41 -> e
-    1:1:com.android.tools.r8.graph.DexType getContextType():37:37 -> i
+    1:1:java.lang.Iterable getReferencedBaseTypes(com.android.tools.r8.graph.DexItemFactory):59:59 -> a
+    2:2:com.android.tools.r8.graph.DexType lambda$getReferencedBaseTypes$0(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):59:59 -> a
+    1:1:com.android.tools.r8.graph.DexType getHolderType():39:39 -> d
+    1:1:com.android.tools.r8.graph.DexType getContextType():35:35 -> i
     com.android.tools.r8.graph.DexMember asDexMember() -> v
     boolean isDexMember() -> z
-com.android.tools.r8.graph.DexMemberAnnotation -> com.android.tools.r8.graph.T:
+com.android.tools.r8.graph.DexMemberAnnotation -> com.android.tools.r8.graph.S:
     com.android.tools.r8.graph.DexItem annotations -> b
     com.android.tools.r8.graph.DexMember item -> a
     1:3:void <init>(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexItem):14:16 -> <init>
     1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):21:21 -> a
     1:3:boolean equals(java.lang.Object):34:36 -> equals
     1:1:int hashCode():26:26 -> hashCode
-com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation -> com.android.tools.r8.graph.T$a:
+com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation -> com.android.tools.r8.graph.S$a:
     1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexAnnotationSet):44:44 -> <init>
-com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation -> com.android.tools.r8.graph.T$b:
+com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation -> com.android.tools.r8.graph.S$b:
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexAnnotationSet):56:56 -> <init>
-com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation -> com.android.tools.r8.graph.T$c:
+com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation -> com.android.tools.r8.graph.S$c:
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ParameterAnnotationsList):69:69 -> <init>
-com.android.tools.r8.graph.DexMethod -> com.android.tools.r8.graph.U:
+com.android.tools.r8.graph.DexMethod -> com.android.tools.r8.graph.T:
     com.android.tools.r8.graph.DexProto proto -> h
     1:5:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,boolean):25:29 -> <init>
     boolean isDexMethod() -> A
-    1:1:java.lang.Iterable getReferencedTypes():181:181 -> D
+    1:1:java.lang.Iterable getReferencedTypes():176:176 -> D
     2:2:java.lang.Iterable com.android.tools.r8.graph.DexProto.getTypes():74:74 -> D
-    2:2:java.lang.Iterable getReferencedTypes():181 -> D
+    2:2:java.lang.Iterable getReferencedTypes():176 -> D
     3:3:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> D
     3:3:java.lang.Iterable com.android.tools.r8.graph.DexProto.getTypes():74 -> D
-    3:3:java.lang.Iterable getReferencedTypes():181 -> D
-    1:12:com.android.tools.r8.references.MethodReference asMethodReference():120:131 -> E
-    13:13:com.android.tools.r8.references.MethodReference asMethodReference():129:129 -> E
-    1:1:int getArity():137:137 -> F
+    3:3:java.lang.Iterable getReferencedTypes():176 -> D
+    1:12:com.android.tools.r8.references.MethodReference asMethodReference():115:126 -> E
+    13:13:com.android.tools.r8.references.MethodReference asMethodReference():124:124 -> E
+    1:1:int getArity():132:132 -> F
     1:1:com.android.tools.r8.graph.DexType getReturnType():66:66 -> G
-    1:1:com.android.tools.r8.graph.DexMethodSignature getSignature():141:141 -> H
+    1:1:com.android.tools.r8.graph.DexMethodSignature getSignature():136:136 -> H
     2:2:void com.android.tools.r8.graph.DexMethodSignature.<init>(com.android.tools.r8.graph.DexMethod):14:14 -> H
-    2:2:com.android.tools.r8.graph.DexMethodSignature getSignature():141 -> H
-    1:1:java.lang.String qualifiedName():221:221 -> I
-    1:1:java.lang.String toSourceStringWithoutHolder():235:235 -> J
+    2:2:com.android.tools.r8.graph.DexMethodSignature getSignature():136 -> H
+    1:1:java.lang.String qualifiedName():216:216 -> I
+    1:1:java.lang.String toSourceStringWithoutHolder():230:230 -> J
     1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):20:20 -> a
     2:2:int acceptCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.structural.CompareToVisitor):50:50 -> a
     2:2:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):20 -> a
-    3:3:com.android.tools.r8.graph.DexClassAndMember lookupMemberOnClass(com.android.tools.r8.graph.DexClass):20:20 -> a
+    3:3:com.android.tools.r8.graph.DexEncodedMember lookupOnClass(com.android.tools.r8.graph.DexClass):20:20 -> a
     4:4:com.android.tools.r8.graph.ProgramMember lookupOnProgramClass(com.android.tools.r8.graph.DexProgramClass):20:20 -> a
     5:5:com.android.tools.r8.graph.DexProto lambda$specify$0(com.android.tools.r8.graph.DexMethod):35:35 -> a
     6:6:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):35:35 -> a
     7:7:int acceptCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.structural.CompareToVisitor):50:50 -> a
-    8:8:java.lang.Object apply(java.util.function.Function,java.util.function.Function):71:71 -> a
-    9:9:java.lang.Object apply(java.util.function.Function,java.util.function.Function,java.util.function.Function):79:79 -> a
-    10:10:void accept(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):87:87 -> a
-    11:11:void accept(java.util.function.BiConsumer,java.util.function.BiConsumer,java.util.function.BiConsumer,java.lang.Object):96:96 -> a
-    12:14:boolean collectIndexedItemsExceptName(com.android.tools.r8.dex.IndexedItemCollection):152:154 -> a
-    12:14:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):146 -> a
-    15:15:void collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):161:161 -> a
-    15:15:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):147 -> a
-    16:16:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):265:265 -> a
-    16:16:void collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):161 -> a
-    16:16:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):147 -> a
-    17:17:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):166:166 -> a
-    18:32:java.lang.String toSourceString(boolean,boolean):243:257 -> a
-    33:33:com.android.tools.r8.graph.DexMethod withHolder(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):283:283 -> a
-    34:34:com.android.tools.r8.graph.DexMethod withProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):291:291 -> a
-    1:1:com.android.tools.r8.graph.DexEncodedMember lookupOnClass(com.android.tools.r8.graph.DexClass):20:20 -> b
-    2:2:com.android.tools.r8.graph.ProgramMethod lookupOnProgramClass(com.android.tools.r8.graph.DexProgramClass):111:111 -> b
-    3:3:boolean match(com.android.tools.r8.graph.DexMethod):212:212 -> b
-    1:1:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.DexClass.lookupClassMethod(com.android.tools.r8.graph.DexMethod):503:503 -> c
-    1:1:com.android.tools.r8.graph.DexClassAndMethod lookupMemberOnClass(com.android.tools.r8.graph.DexClass):106 -> c
-    2:2:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.DexClass.toClassMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod):507:507 -> c
-    2:2:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.DexClass.lookupClassMethod(com.android.tools.r8.graph.DexMethod):503 -> c
-    2:2:com.android.tools.r8.graph.DexClassAndMethod lookupMemberOnClass(com.android.tools.r8.graph.DexClass):106 -> c
-    1:1:com.android.tools.r8.graph.DexEncodedMember com.android.tools.r8.graph.DexClass.lookupMember(com.android.tools.r8.graph.DexMember):497:497 -> d
-    1:1:com.android.tools.r8.graph.DexEncodedMethod lookupOnClass(com.android.tools.r8.graph.DexClass):101 -> d
-    2:2:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):512:512 -> d
-    2:2:com.android.tools.r8.graph.DexEncodedMember com.android.tools.r8.graph.DexClass.lookupMember(com.android.tools.r8.graph.DexMember):497 -> d
-    2:2:com.android.tools.r8.graph.DexEncodedMethod lookupOnClass(com.android.tools.r8.graph.DexClass):101 -> d
-    3:3:com.android.tools.r8.graph.DexEncodedMethod lookupOnClass(com.android.tools.r8.graph.DexClass):101:101 -> d
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():40:40 -> f
+    8:8:java.lang.Object apply(java.util.function.Function,java.util.function.Function,java.util.function.Function):79:79 -> a
+    9:9:void accept(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):87:87 -> a
+    10:10:void accept(java.util.function.BiConsumer,java.util.function.BiConsumer,java.util.function.BiConsumer,java.lang.Object):96:96 -> a
+    11:13:boolean collectIndexedItemsExceptName(com.android.tools.r8.dex.IndexedItemCollection):147:149 -> a
+    11:13:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):141 -> a
+    14:14:void collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):156:156 -> a
+    14:14:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):142 -> a
+    15:15:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):265:265 -> a
+    15:15:void collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):156 -> a
+    15:15:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):142 -> a
+    16:16:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):161:161 -> a
+    17:31:java.lang.String toSourceString(boolean,boolean):238:252 -> a
+    32:32:com.android.tools.r8.graph.DexMethod withHolder(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):278:278 -> a
+    1:1:com.android.tools.r8.graph.ProgramMethod lookupOnProgramClass(com.android.tools.r8.graph.DexProgramClass):106:106 -> b
+    2:2:boolean match(com.android.tools.r8.graph.DexMethod):207:207 -> b
+    3:3:com.android.tools.r8.graph.DexEncodedMember com.android.tools.r8.graph.DexClass.lookupMember(com.android.tools.r8.graph.DexMember):479:479 -> b
+    3:3:com.android.tools.r8.graph.DexEncodedMethod lookupOnClass(com.android.tools.r8.graph.DexClass):101 -> b
+    4:4:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):494:494 -> b
+    4:4:com.android.tools.r8.graph.DexEncodedMember com.android.tools.r8.graph.DexClass.lookupMember(com.android.tools.r8.graph.DexMember):479 -> b
+    4:4:com.android.tools.r8.graph.DexEncodedMethod lookupOnClass(com.android.tools.r8.graph.DexClass):101 -> b
+    5:5:com.android.tools.r8.graph.DexEncodedMethod lookupOnClass(com.android.tools.r8.graph.DexClass):101:101 -> b
+    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():40:40 -> e
     1:1:com.android.tools.r8.graph.DexType getParameter(int):54:54 -> g
     2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProto.getParameter(int):83:83 -> g
     2:2:com.android.tools.r8.graph.DexType getParameter(int):54 -> g
-    3:7:boolean computeEquals(java.lang.Object):193:197 -> g
+    3:7:boolean computeEquals(java.lang.Object):188:192 -> g
     com.android.tools.r8.utils.structural.StructuralItem self() -> k
-    1:1:java.lang.String toSmaliString():226:226 -> r
+    1:1:java.lang.String toSmaliString():221:221 -> r
     2:2:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():114:114 -> r
     2:2:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():110 -> r
-    2:2:java.lang.String toSmaliString():226 -> r
-    3:3:java.lang.String toSmaliString():226:226 -> r
-    1:1:java.lang.String toSourceString():231:231 -> s
-    1:3:int computeHashCode():186:188 -> t
-    1:1:java.lang.String toString():116:116 -> toString
+    2:2:java.lang.String toSmaliString():221 -> r
+    3:3:java.lang.String toSmaliString():221:221 -> r
+    1:1:java.lang.String toSourceString():226:226 -> s
+    1:3:int computeHashCode():181:183 -> t
+    1:1:java.lang.String toString():111:111 -> toString
     com.android.tools.r8.graph.DexMethod asDexMethod() -> w
-com.android.tools.r8.graph.DexMethodHandle -> com.android.tools.r8.graph.V:
+com.android.tools.r8.graph.DexMethodHandle -> com.android.tools.r8.graph.U:
     com.android.tools.r8.graph.DexMethodHandle$MethodHandleType type -> e
     com.android.tools.r8.graph.DexMethod rewrittenTarget -> h
     boolean isInterface -> g
@@ -19865,13 +19914,13 @@
     60:60:com.android.tools.r8.graph.DexMethodHandle com.android.tools.r8.graph.JarApplicationReader.getMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):109:109 -> a
     60:60:com.android.tools.r8.graph.DexMethodHandle fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):232 -> a
     61:71:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):264:274 -> a
-    72:74:boolean com.android.tools.r8.graph.DexMethod.collectIndexedItemsExceptName(com.android.tools.r8.dex.IndexedItemCollection):152:154 -> a
+    72:74:boolean com.android.tools.r8.graph.DexMethod.collectIndexedItemsExceptName(com.android.tools.r8.dex.IndexedItemCollection):147:149 -> a
     72:74:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):274 -> a
     75:75:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):275:275 -> a
-    76:76:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):161:161 -> a
+    76:76:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):156:156 -> a
     76:76:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):275 -> a
     77:77:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):265:265 -> a
-    77:77:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):161 -> a
+    77:77:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):156 -> a
     77:77:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):275 -> a
     78:78:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):278:278 -> a
     79:79:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):286:286 -> a
@@ -19888,7 +19937,7 @@
     129:133:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):328:332 -> a
     1:1:boolean lambda$specify$1(com.android.tools.r8.graph.DexMethodHandle):331:331 -> b
     1:1:com.android.tools.r8.graph.DexMethod lambda$specify$2(com.android.tools.r8.graph.DexMethodHandle):332:332 -> c
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():324:324 -> f
+    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():324:324 -> e
     1:6:boolean computeEquals(java.lang.Object):242:247 -> g
     com.android.tools.r8.utils.structural.StructuralItem self() -> k
     1:1:java.lang.String toSmaliString():292:292 -> r
@@ -19911,7 +19960,7 @@
     4:4:boolean com.android.tools.r8.graph.DexMethodHandle$MethodHandleType.isStaticGet():132:132 -> y
     4:4:boolean isStaticHandle():304 -> y
     5:5:boolean isStaticHandle():304:304 -> y
-com.android.tools.r8.graph.DexMethodHandle$MethodHandleType -> com.android.tools.r8.graph.V$a:
+com.android.tools.r8.graph.DexMethodHandle$MethodHandleType -> com.android.tools.r8.graph.U$a:
     com.android.tools.r8.graph.DexMethodHandle$MethodHandleType INVOKE_DIRECT -> h
     com.android.tools.r8.graph.DexMethodHandle$MethodHandleType[] $VALUES -> k
     com.android.tools.r8.graph.DexMethodHandle$MethodHandleType INVOKE_CONSTRUCTOR -> g
@@ -19952,7 +20001,7 @@
     45:45:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):81 -> d
     46:46:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):81:81 -> d
     47:47:boolean isInvokeDirect():148:148 -> d
-    1:1:boolean isInvokeInstance():152:152 -> e
+    1:1:boolean isInvokeInstance():152:152 -> f
     1:1:boolean isInvokeInterface():156:156 -> g
     1:1:boolean isInvokeStatic():144:144 -> h
     1:1:boolean isMethodType():123:123 -> i
@@ -19966,7 +20015,7 @@
     20:20:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():175:175 -> j
     21:21:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():173:173 -> j
     22:22:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():171:171 -> j
-com.android.tools.r8.graph.DexMethodSignature -> com.android.tools.r8.internal.ha:
+com.android.tools.r8.graph.DexMethodSignature -> com.android.tools.r8.internal.E9:
     com.android.tools.r8.graph.DexString name -> c
     com.android.tools.r8.graph.DexProto proto -> b
     boolean $assertionsDisabled -> a
@@ -19976,7 +20025,7 @@
     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():726:726 -> a
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():676:676 -> 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.DexMethod com.android.tools.r8.graph.DexMethodSignature.withHolder(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):45: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
@@ -19984,7 +20033,7 @@
     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.W:
+com.android.tools.r8.graph.DexProgramClass -> com.android.tools.r8.graph.V:
     java.util.Collection synthesizedFrom -> v
     com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier checksumSupplier -> z
     com.android.tools.r8.graph.DexProgramClass[] EMPTY_ARRAY -> s
@@ -19993,187 +20042,175 @@
     boolean deprecated -> x
     com.android.tools.r8.ProgramResource$Kind originKind -> u
     boolean $assertionsDisabled -> t
-    1:9:void <clinit>():42:50 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,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.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier):100:100 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,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.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier):80:80 -> <init>
-    3:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,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.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier,java.util.Collection):124:124 -> <init>
-    4:97:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,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.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier,java.util.Collection):54:147 -> <init>
-    1:1:java.lang.Iterable directProgramMethods():208:208 -> G0
-    1:1:long getChecksum():824:824 -> H0
-    1:1:com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier getChecksumSupplier():828:828 -> I0
-    1:1:com.android.tools.r8.cf.CfVersion getInitialClassFileVersion():750:750 -> J0
-    1:1:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo():460:460 -> K0
-    1:1:com.android.tools.r8.ProgramResource$Kind getOriginKind():338:338 -> L0
-    1:1:com.android.tools.r8.graph.ProgramMethod getProgramClassInitializer():259:259 -> M0
-    1:1:com.android.tools.r8.graph.ProgramMethod getProgramDefaultInitializer():263:263 -> N0
-    2:2:com.android.tools.r8.graph.ProgramMethod getProgramInitializer(com.android.tools.r8.graph.DexType[]):267:267 -> N0
-    2:2:com.android.tools.r8.graph.ProgramMethod getProgramDefaultInitializer():263 -> N0
-    1:1:java.util.Collection getSynthesizedFrom():378:378 -> O0
-    1:1:boolean hasClassFileVersion():746:746 -> P0
-    1:1:boolean hasClassOrMemberAnnotations():579:579 -> Q0
-    2:3:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):598:599 -> Q0
-    2:3:boolean hasClassOrMemberAnnotations():580 -> Q0
-    4:6:boolean hasClassOrMemberAnnotations():580:582 -> Q0
-    7:7:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):600:600 -> Q0
-    7:7:boolean hasClassOrMemberAnnotations():580 -> Q0
-    1:1:boolean hasFields():566:566 -> R0
-    1:1:boolean hasMethods():570:570 -> S0
-    1:1:boolean hasMethodsOrFields():574 -> S0
-    2:2:boolean hasFields():566:566 -> S0
-    2:2:boolean hasMethodsOrFields():574 -> S0
-    1:1:boolean hasOnlyInternalizableAnnotations():586:586 -> T0
-    2:3:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):598:599 -> T0
-    2:3:boolean hasOnlyInternalizableAnnotations():586 -> T0
-    4:6:boolean hasOnlyInternalizableAnnotations():586:588 -> T0
-    7:7:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):600:600 -> T0
-    7:7:boolean hasOnlyInternalizableAnnotations():586 -> T0
-    1:1:boolean isDeprecated():758:758 -> U0
-    1:1:boolean originatesFromClassResource():346:346 -> V0
-    1:1:boolean originatesFromDexResource():342:342 -> W0
-    1:1:java.lang.Iterable programInstanceInitializers():225:225 -> X0
-    1:1:void setDeprecated():754:754 -> Y0
-    1:1:java.lang.Iterable virtualProgramMethods():216:216 -> Z0
+    1:9:void <clinit>():39:47 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,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.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier):97:97 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,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.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier):77:77 -> <init>
+    3:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,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.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier,java.util.Collection):121:121 -> <init>
+    4:97:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,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.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier,java.util.Collection):51:144 -> <init>
+    1:1:java.lang.Iterable directProgramMethods():167:167 -> C0
+    1:1:long getChecksum():774:774 -> D0
+    1:1:com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier getChecksumSupplier():778:778 -> E0
+    1:1:com.android.tools.r8.cf.CfVersion getInitialClassFileVersion():700:700 -> F0
+    1:1:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo():410:410 -> G0
+    1:1:com.android.tools.r8.ProgramResource$Kind getOriginKind():288:288 -> H0
+    1:1:com.android.tools.r8.graph.ProgramMethod getProgramClassInitializer():209:209 -> I0
+    1:1:com.android.tools.r8.graph.ProgramMethod getProgramDefaultInitializer():213:213 -> J0
+    2:2:com.android.tools.r8.graph.ProgramMethod getProgramInitializer(com.android.tools.r8.graph.DexType[]):217:217 -> J0
+    2:2:com.android.tools.r8.graph.ProgramMethod getProgramDefaultInitializer():213 -> J0
+    1:1:java.util.Collection getSynthesizedFrom():328:328 -> K0
+    1:1:boolean hasClassFileVersion():696:696 -> L0
+    1:1:boolean hasClassOrMemberAnnotations():529:529 -> M0
+    2:3:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):548:549 -> M0
+    2:3:boolean hasClassOrMemberAnnotations():530 -> M0
+    4:6:boolean hasClassOrMemberAnnotations():530:532 -> M0
+    7:7:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):550:550 -> M0
+    7:7:boolean hasClassOrMemberAnnotations():530 -> M0
+    1:1:boolean hasFields():516:516 -> N0
+    1:1:boolean hasMethods():520:520 -> O0
+    1:1:boolean hasMethodsOrFields():524 -> O0
+    2:2:boolean hasFields():516:516 -> O0
+    2:2:boolean hasMethodsOrFields():524 -> O0
+    1:1:boolean hasOnlyInternalizableAnnotations():536:536 -> P0
+    2:3:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):548:549 -> P0
+    2:3:boolean hasOnlyInternalizableAnnotations():536 -> P0
+    4:6:boolean hasOnlyInternalizableAnnotations():536:538 -> P0
+    7:7:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):550:550 -> P0
+    7:7:boolean hasOnlyInternalizableAnnotations():536 -> P0
+    1:1:boolean isDeprecated():708:708 -> Q0
+    1:1:boolean originatesFromClassResource():296:296 -> R0
+    1:1:boolean originatesFromDexResource():292:292 -> S0
+    1:1:java.lang.Iterable programInstanceInitializers():175:175 -> T0
+    1:1:void setDeprecated():704:704 -> U0
+    com.android.tools.r8.graph.DexProgramClass getContextClass() -> a
     1:3:void com.android.tools.r8.graph.ProgramField.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):17:19 -> a
-    1:3:void lambda$collectIndexedItems$23(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):372 -> a
-    4:4:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():209:209 -> a
+    1:3:void lambda$collectIndexedItems$10(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):322 -> a
+    4:4:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():199:199 -> a
     4:4:void com.android.tools.r8.graph.ProgramField.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):20 -> a
-    4:4:void lambda$collectIndexedItems$23(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):372 -> a
+    4:4:void lambda$collectIndexedItems$10(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):322 -> a
     5:6:void com.android.tools.r8.graph.ProgramField.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):20:21 -> a
-    5:6:void lambda$collectIndexedItems$23(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):372 -> a
+    5:6:void lambda$collectIndexedItems$10(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):322 -> a
     7:16: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
-    7:16:void lambda$collectIndexedItems$24(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):373 -> a
-    17:17:void accept(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):155:155 -> a
-    18:34:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):169:185 -> a
-    35:35:void lambda$forEachProgramField$11(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField):189:189 -> a
-    36:36:boolean lambda$forEachProgramInstanceInitializerMatching$18(java.util.function.Predicate,com.android.tools.r8.graph.DexEncodedMethod):245:245 -> a
-    37:37:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramFields$20(java.util.function.Function,com.android.tools.r8.graph.DexEncodedField):314:314 -> a
-    38:38:com.android.tools.r8.utils.TraversalContinuation traverseProgramFields(java.util.function.Function):314:314 -> a
-    39:44:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexClass.traverseFields(java.util.function.Function):284:289 -> a
-    39:44:com.android.tools.r8.utils.TraversalContinuation traverseProgramFields(java.util.function.Function):314 -> a
-    45:45:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramMethods$21(java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):319:319 -> a
-    46:47:com.android.tools.r8.utils.TraversalContinuation traverseProgramMethods(java.util.function.Function,java.util.function.Predicate):329:330 -> a
-    48:50:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramMethods$22(java.util.function.Predicate,java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):332:334 -> a
-    51:58:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):351:358 -> a
-    59:59:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):265:265 -> a
-    59:59:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):359 -> a
-    60:61:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):361:362 -> a
-    62:63:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):100:101 -> a
-    62:63:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):363 -> a
-    64:72:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):365:373 -> a
-    73:77:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):383:387 -> a
-    78:78:void lambda$addDependencies$25(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.graph.DexEncodedMethod):399:399 -> a
-    79:79:void com.android.tools.r8.graph.DexEncodedMethod.collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):821:821 -> a
-    79:79:void lambda$addDependencies$25(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.graph.DexEncodedMethod):399 -> a
-    80:80:com.android.tools.r8.graph.DexProgramClass asProgramClassOrNull(com.android.tools.r8.graph.DexClass):450:450 -> a
-    81:83:void setKotlinInfo(com.android.tools.r8.kotlin.KotlinClassLevelInfo):464:466 -> a
-    84:88:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):475:479 -> a
-    89:97:boolean internalClassMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):489:497 -> a
-    89:97:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):481 -> a
-    98:101:void addSynthesizedFrom(com.android.tools.r8.graph.DexProgramClass):604:607 -> a
-    102:102:int lambda$computeStaticValuesArray$26(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):617:617 -> a
-    103:105:boolean hasNonDefaultStaticFieldValues():635:637 -> a
-    103:105:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):613 -> a
-    106:120:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):616:630 -> a
-    121:121:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):653:653 -> a
-    122:123:void downgradeInitialClassFileVersion(com.android.tools.r8.cf.CfVersion):741:742 -> a
-    124:124:java.lang.Iterable asProgramClasses(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):782:782 -> a
-    com.android.tools.r8.graph.DexProgramClass getContextClass() -> b
-    1:1:void forEachProgramDirectMethodMatching(java.util.function.Predicate,java.util.function.Consumer):234:234 -> b
-    2:2:void lambda$forEachProgramDirectMethodMatching$17(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):235:235 -> b
-    3:3:com.android.tools.r8.graph.ProgramMethod getProgramInitializer(com.android.tools.r8.graph.DexType[]):267:267 -> b
-    4:4:com.android.tools.r8.utils.TraversalContinuation traverseProgramInstanceInitializers(java.util.function.Function):324:324 -> b
-    5:11:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):393:399 -> b
+    7:16:void lambda$collectIndexedItems$11(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):323 -> a
+    17:17:void lambda$forEachProgramField$0(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField):148:148 -> a
+    18:18:boolean lambda$forEachProgramInstanceInitializerMatching$5(java.util.function.Predicate,com.android.tools.r8.graph.DexEncodedMethod):195:195 -> a
+    19:19:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramFields$7(java.util.function.Function,com.android.tools.r8.graph.DexEncodedField):264:264 -> a
+    20:20:com.android.tools.r8.utils.TraversalContinuation traverseProgramFields(java.util.function.Function):264:264 -> a
+    21:26:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexClass.traverseFields(java.util.function.Function):275:280 -> a
+    21:26:com.android.tools.r8.utils.TraversalContinuation traverseProgramFields(java.util.function.Function):264 -> a
+    27:27:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramMethods$8(java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):269:269 -> a
+    28:29:com.android.tools.r8.utils.TraversalContinuation traverseProgramMethods(java.util.function.Function,java.util.function.Predicate):279:280 -> a
+    30:32:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramMethods$9(java.util.function.Predicate,java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):282:284 -> a
+    33:40:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):301:308 -> a
+    41:41:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):265:265 -> a
+    41:41:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):309 -> a
+    42:43:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):311:312 -> a
+    44:45:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):96:97 -> a
+    44:45:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):313 -> a
+    46:54:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):315:323 -> a
+    55:59:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):333:337 -> a
+    60:60:void lambda$addDependencies$12(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.graph.DexEncodedMethod):349:349 -> a
+    61:61:void com.android.tools.r8.graph.DexEncodedMethod.collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):834:834 -> a
+    61:61:void lambda$addDependencies$12(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.graph.DexEncodedMethod):349 -> a
+    62:62:com.android.tools.r8.graph.DexProgramClass asProgramClassOrNull(com.android.tools.r8.graph.DexClass):400:400 -> a
+    63:65:void setKotlinInfo(com.android.tools.r8.kotlin.KotlinClassLevelInfo):414:416 -> a
+    66:70:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):425:429 -> a
+    71:79:boolean internalClassMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):439:447 -> a
+    71:79:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):431 -> a
+    80:83:void addSynthesizedFrom(com.android.tools.r8.graph.DexProgramClass):554:557 -> a
+    84:84:int lambda$computeStaticValuesArray$13(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):567:567 -> a
+    85:87:boolean hasNonDefaultStaticFieldValues():585:587 -> a
+    85:87:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):563 -> a
+    88:102:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):566:580 -> a
+    103:103:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):603:603 -> a
+    104:105:void downgradeInitialClassFileVersion(com.android.tools.r8.cf.CfVersion):691:692 -> a
+    106:106:java.lang.Iterable asProgramClasses(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):732:732 -> a
+    com.android.tools.r8.graph.DexDefinition getDefinition() -> b
+    1:1:void forEachProgramDirectMethodMatching(java.util.function.Predicate,java.util.function.Consumer):184:184 -> b
+    2:2:void lambda$forEachProgramDirectMethodMatching$4(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):185:185 -> b
+    3:3:com.android.tools.r8.graph.ProgramMethod getProgramInitializer(com.android.tools.r8.graph.DexType[]):217:217 -> b
+    4:4:com.android.tools.r8.utils.TraversalContinuation traverseProgramInstanceInitializers(java.util.function.Function):274:274 -> b
+    5:11:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):343:349 -> b
     12:12:void com.android.tools.r8.graph.MethodCollection.forEachMethod(java.util.function.Consumer):88:88 -> b
-    12:12:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):399 -> b
-    13:18:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):400:405 -> b
-    19:19:void com.android.tools.r8.graph.DexTypeList.collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):107:107 -> b
-    19:19:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):405 -> b
-    20:20:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):551:551 -> b
-    21:23:boolean com.android.tools.r8.graph.DexType.internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):105:107 -> b
-    21:23:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):552 -> b
-    24:25:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):556:557 -> b
-    26:28:boolean com.android.tools.r8.graph.DexType.internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):105:107 -> b
-    26:28:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):557 -> b
-    29:29:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):645:645 -> b
-    30:32:void setInitialClassFileVersion(com.android.tools.r8.cf.CfVersion):735:737 -> b
-    33:35:boolean hasReachabilitySensitiveAnnotation(com.android.tools.r8.graph.DexItemFactory):770:772 -> b
-    36:36:java.util.Iterator lambda$asProgramClasses$27(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):783:783 -> b
-    37:37:long checksumFromType(com.android.tools.r8.graph.DexProgramClass):820:820 -> b
-    com.android.tools.r8.graph.DexDefinition getDefinition() -> c
-    1:1:void lambda$forEachProgramMethodMatching$12(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):204:204 -> c
-    2:2:void forEachProgramInstanceInitializerMatching(java.util.function.Predicate,java.util.function.Consumer):244:244 -> c
-    3:3:com.android.tools.r8.utils.TraversalContinuation traverseProgramMethods(java.util.function.Function):319:319 -> c
-    4:26:boolean internalInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):520:542 -> c
-    27:29:boolean hasAnnotations(com.android.tools.r8.graph.DexEncodedField[]):592:594 -> c
-    30:30:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):649:649 -> c
-    31:31:void addExtraInterfaces(java.util.List):681:681 -> c
-    32:35:void addExtraInterfacesToInterfacesArray(java.util.List):689:692 -> c
-    32:35:void addExtraInterfaces(java.util.List):684 -> c
+    12:12:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):349 -> b
+    13:18:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):350:355 -> b
+    19:19:void com.android.tools.r8.graph.DexTypeList.collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):103:103 -> b
+    19:19:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):355 -> b
+    20:20:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):501:501 -> b
+    21:21:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> b
+    21:21:boolean com.android.tools.r8.graph.DexType.internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):110 -> b
+    21:21:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):502 -> b
+    22:22:boolean com.android.tools.r8.graph.DexType.internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):112:112 -> b
+    22:22:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):502 -> b
+    23:24:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):506:507 -> b
+    25:25:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> b
+    25:25:boolean com.android.tools.r8.graph.DexType.internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):110 -> b
+    25:25:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):507 -> b
+    26:26:boolean com.android.tools.r8.graph.DexType.internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):112:112 -> b
+    26:26:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):507 -> b
+    27:27:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):595:595 -> b
+    28:30:void setInitialClassFileVersion(com.android.tools.r8.cf.CfVersion):685:687 -> b
+    31:33:boolean hasReachabilitySensitiveAnnotation(com.android.tools.r8.graph.DexItemFactory):720:722 -> b
+    34:34:java.util.Iterator lambda$asProgramClasses$14(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):733:733 -> b
+    35:35:long checksumFromType(com.android.tools.r8.graph.DexProgramClass):770:770 -> b
+    1:1:void lambda$forEachProgramMethodMatching$1(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):163:163 -> c
+    2:2:void forEachProgramInstanceInitializerMatching(java.util.function.Predicate,java.util.function.Consumer):194:194 -> c
+    3:3:com.android.tools.r8.utils.TraversalContinuation traverseProgramMethods(java.util.function.Function):269:269 -> c
+    4:26:boolean internalInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):470:492 -> c
+    27:29:boolean hasAnnotations(com.android.tools.r8.graph.DexEncodedField[]):542:544 -> c
+    30:30:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):599:599 -> c
+    31:31:void addExtraInterfaces(java.util.List):631:631 -> c
+    32:35:void addExtraInterfacesToInterfacesArray(java.util.List):639:642 -> c
+    32:35:void addExtraInterfaces(java.util.List):634 -> c
     36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.type():413:413 -> c
-    36:36:void addExtraInterfacesToInterfacesArray(java.util.List):692 -> c
-    36:36:void addExtraInterfaces(java.util.List):684 -> c
-    37:39:void addExtraInterfacesToInterfacesArray(java.util.List):692:694 -> c
-    37:39:void addExtraInterfaces(java.util.List):684 -> c
-    40:52:void addExtraInterfacesToSignatureIfPresent(java.util.List):699:711 -> c
-    40:52:void addExtraInterfaces(java.util.List):685 -> c
-    53:53:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):815:815 -> c
+    36:36:void addExtraInterfacesToInterfacesArray(java.util.List):642 -> c
+    36:36:void addExtraInterfaces(java.util.List):634 -> c
+    37:39:void addExtraInterfacesToInterfacesArray(java.util.List):642:644 -> c
+    37:39:void addExtraInterfaces(java.util.List):634 -> c
+    40:52:void addExtraInterfacesToSignatureIfPresent(java.util.List):649:661 -> c
+    40:52:void addExtraInterfaces(java.util.List):635 -> c
+    53:53:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):765:765 -> c
     54:54:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> c
-    54:54:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):815 -> c
-    55:55:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):815:815 -> c
-    1:1:com.android.tools.r8.graph.DexType lambda$specify$0(com.android.tools.r8.graph.DexProgramClass):169:169 -> d
-    2:2:void forEachProgramMethodMatching(java.util.function.Predicate,java.util.function.Consumer):203:203 -> d
-    3:3:com.android.tools.r8.graph.ProgramMethod lambda$directProgramMethods$13(com.android.tools.r8.graph.DexEncodedMethod):208:208 -> d
-    4:4:void lambda$forEachProgramVirtualMethodMatching$19(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):255:255 -> d
-    5:5:com.android.tools.r8.graph.ProgramField lookupProgramField(com.android.tools.r8.graph.DexField):282:282 -> d
-    6:6:com.android.tools.r8.graph.ProgramField toProgramFieldOrNull(com.android.tools.r8.graph.DexEncodedField):291:291 -> d
-    6:6:com.android.tools.r8.graph.ProgramField lookupProgramField(com.android.tools.r8.graph.DexField):282 -> d
-    7:7:boolean com.android.tools.r8.graph.DexClass.isFinal():575:575 -> d
-    7:7:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):425 -> d
-    8:14:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):428:434 -> d
-    15:15:void replaceInterfaces(java.util.List):662:662 -> d
-    16:22:void clearInterfaces():670:676 -> d
-    16:22:void replaceInterfaces(java.util.List):665 -> d
-    23:23:void replaceInterfaces(java.util.List):666:666 -> d
-    1:1:com.android.tools.r8.graph.DexType lambda$specify$1(com.android.tools.r8.graph.DexProgramClass):170:170 -> e
-    2:2:com.android.tools.r8.graph.ProgramMethod lambda$directProgramMethods$14(com.android.tools.r8.graph.DexEncodedMethod):212:212 -> e
-    3:3:void forEachProgramDirectMethod(java.util.function.Consumer):229:229 -> e
-    4:4:void forEachProgramVirtualMethodMatching(java.util.function.Predicate,java.util.function.Consumer):254:254 -> e
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():165:165 -> f
-    2:2:boolean lambda$specify$10(com.android.tools.r8.graph.DexProgramClass):185:185 -> f
-    3:3:void forEachProgramField(java.util.function.Consumer):189:189 -> f
-    4:4:com.android.tools.r8.graph.ProgramMethod lambda$virtualProgramMethods$15(com.android.tools.r8.graph.DexEncodedMethod):216:216 -> f
-    5:5:com.android.tools.r8.graph.ProgramMethod lookupProgramMethod(com.android.tools.r8.graph.DexMethod):286:286 -> f
-    1:1:com.android.tools.r8.graph.DexTypeList lambda$specify$2(com.android.tools.r8.graph.DexProgramClass):171:171 -> g
-    2:2:void forEachProgramMethod(java.util.function.Consumer):198:198 -> g
-    3:3:com.android.tools.r8.graph.ProgramMethod toProgramMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod):298:298 -> g
-    1:1:com.android.tools.r8.graph.ClassAccessFlags lambda$specify$3(com.android.tools.r8.graph.DexProgramClass):172:172 -> h
-    2:2:void forEachProgramVirtualMethod(java.util.function.Consumer):249:249 -> h
-    1:1:com.android.tools.r8.graph.DexString lambda$specify$4(com.android.tools.r8.graph.DexProgramClass):173:173 -> i
-    2:2:com.android.tools.r8.graph.DexType getContextType():726:726 -> i
-    1:1:com.android.tools.r8.cf.CfVersion lambda$specify$5(com.android.tools.r8.graph.DexProgramClass):174:174 -> j
-    com.android.tools.r8.utils.structural.StructuralItem self() -> k
-    1:1:boolean lambda$specify$6(com.android.tools.r8.graph.DexProgramClass):175:175 -> k
-    2:2:java.lang.Iterable directProgramMethods(java.util.function.Predicate):212:212 -> k
-    1:1:boolean lambda$specify$7(com.android.tools.r8.graph.DexProgramClass):180:180 -> l
+    54:54:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):765 -> c
+    55:55:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):765:765 -> c
+    1:1:void forEachProgramMethodMatching(java.util.function.Predicate,java.util.function.Consumer):162:162 -> d
+    2:2:com.android.tools.r8.graph.ProgramMethod lambda$directProgramMethods$2(com.android.tools.r8.graph.DexEncodedMethod):167:167 -> d
+    3:3:void lambda$forEachProgramVirtualMethodMatching$6(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):205:205 -> d
+    4:4:com.android.tools.r8.graph.ProgramField lookupProgramField(com.android.tools.r8.graph.DexField):232:232 -> d
+    5:5:com.android.tools.r8.graph.ProgramField toProgramFieldOrNull(com.android.tools.r8.graph.DexEncodedField):241:241 -> d
+    5:5:com.android.tools.r8.graph.ProgramField lookupProgramField(com.android.tools.r8.graph.DexField):232 -> d
+    6:15:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):375:384 -> d
+    16:16:void replaceInterfaces(java.util.List):612:612 -> d
+    17:23:void clearInterfaces():620:626 -> d
+    17:23:void replaceInterfaces(java.util.List):615 -> d
+    24:24:void replaceInterfaces(java.util.List):616:616 -> d
+    1:1:com.android.tools.r8.graph.ProgramMethod lambda$directProgramMethods$3(com.android.tools.r8.graph.DexEncodedMethod):171:171 -> e
+    2:2:void forEachProgramDirectMethod(java.util.function.Consumer):179:179 -> e
+    3:3:void forEachProgramVirtualMethodMatching(java.util.function.Predicate,java.util.function.Consumer):204:204 -> e
+    1:1:void forEachProgramField(java.util.function.Consumer):148:148 -> f
+    2:2:com.android.tools.r8.graph.ProgramMethod lookupProgramMethod(com.android.tools.r8.graph.DexMethod):236:236 -> f
+    3:3:com.android.tools.r8.graph.ProgramMethod toProgramMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod):248:248 -> f
+    1:1:void forEachProgramMethod(java.util.function.Consumer):157:157 -> g
+    1:1:void forEachProgramVirtualMethod(java.util.function.Consumer):199:199 -> h
+    1:1:com.android.tools.r8.graph.DexType getContextType():676:676 -> i
+    1:1:java.lang.Iterable directProgramMethods(java.util.function.Predicate):171:171 -> j
     com.android.tools.r8.graph.DexProgramClass asProgramClass() -> m
-    1:1:com.android.tools.r8.graph.DexEncodedField[] lambda$specify$8(com.android.tools.r8.graph.DexProgramClass):181:181 -> m
-    1:1:com.android.tools.r8.graph.DexEncodedField[] lambda$specify$9(com.android.tools.r8.graph.DexProgramClass):182:182 -> n
     boolean isProgramClass() -> o
-    1:1:java.lang.String toSourceString():416:416 -> s
-    1:1:java.lang.String toString():411:411 -> toString
-    boolean isNotProgramClass() -> z0
-com.android.tools.r8.graph.DexProgramClass$1 -> com.android.tools.r8.graph.W$a:
+    1:1:java.lang.String toSourceString():366:366 -> s
+    1:1:java.lang.String toString():361:361 -> toString
+    boolean isNotProgramClass() -> v0
+com.android.tools.r8.graph.DexProgramClass$1 -> com.android.tools.r8.graph.V$a:
     java.util.Iterator iterator -> b
     com.android.tools.r8.graph.DexProgramClass next -> a
-    com.android.tools.r8.graph.DexDefinitionSupplier val$definitions -> c
-    1:5:void <init>(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):783:787 -> <init>
-    1:5:com.android.tools.r8.graph.DexProgramClass findNext():802:806 -> f
-    1:1:boolean hasNext():791:791 -> hasNext
-    1:2:com.android.tools.r8.graph.DexProgramClass next():796:797 -> next
-    1:2:java.lang.Object next():783 -> next
-com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier -> com.android.tools.r8.graph.W$b:
+    java.lang.Iterable val$types -> c
+    com.android.tools.r8.graph.DexDefinitionSupplier val$definitions -> d
+    1:5:void <init>(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):733:737 -> <init>
+    1:5:com.android.tools.r8.graph.DexProgramClass findNext():752:756 -> e
+    1:1:boolean hasNext():741:741 -> hasNext
+    1:2:com.android.tools.r8.graph.DexProgramClass next():746:747 -> next
+    1:2:java.lang.Object next():733 -> next
+com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier -> com.android.tools.r8.graph.V$b:
     long getChecksum(com.android.tools.r8.graph.DexProgramClass) -> a
-com.android.tools.r8.graph.DexProto -> com.android.tools.r8.graph.X:
+com.android.tools.r8.graph.DexProto -> com.android.tools.r8.graph.W:
     com.android.tools.r8.graph.DexProto SENTINEL -> d
     com.android.tools.r8.graph.DexString shorty -> e
     com.android.tools.r8.graph.DexTypeList parameters -> g
@@ -20193,14 +20230,14 @@
     12:12:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):265:265 -> a
     12:12:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):97 -> a
     13:14:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):98:99 -> a
-    15:16:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):100:101 -> a
+    15:16:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):96:97 -> a
     15:16:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):99 -> a
     17:17:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):105:105 -> a
     18:25:java.lang.String toDescriptorString(com.android.tools.r8.naming.NamingLens):118:125 -> a
     1:1:com.android.tools.r8.graph.DexString lambda$specify$1(com.android.tools.r8.graph.DexProto):32:32 -> b
     2:2:java.lang.Iterable getParameterBaseTypes(com.android.tools.r8.graph.DexItemFactory):66:66 -> b
     3:3:com.android.tools.r8.graph.DexType lambda$getParameterBaseTypes$2(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):66:66 -> b
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():37:37 -> f
+    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():37:37 -> e
     1:5:boolean computeEquals(java.lang.Object):47:51 -> g
     6:6:com.android.tools.r8.graph.DexType getParameter(int):83:83 -> g
     com.android.tools.r8.utils.structural.StructuralItem self() -> k
@@ -20209,7 +20246,7 @@
     1:1:int computeHashCode():58:58 -> t
     1:1:java.lang.String toString():92:92 -> toString
     1:1:com.android.tools.r8.graph.DexType getReturnType():62:62 -> u
-com.android.tools.r8.graph.DexReference -> com.android.tools.r8.graph.Y:
+com.android.tools.r8.graph.DexReference -> com.android.tools.r8.graph.X:
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():12:12 -> <init>
@@ -20228,7 +20265,7 @@
     com.android.tools.r8.graph.DexType asDexType() -> x
     boolean isDexField() -> y
     boolean isDexMember() -> z
-com.android.tools.r8.graph.DexString -> com.android.tools.r8.graph.Z:
+com.android.tools.r8.graph.DexString -> com.android.tools.r8.graph.Y:
     boolean $assertionsDisabled -> e
     int size -> f
     byte[] content -> g
@@ -20262,7 +20299,7 @@
     1:5:boolean endsWith(com.android.tools.r8.graph.DexString):464:468 -> b
     1:5:boolean startsWith(com.android.tools.r8.graph.DexString):436:440 -> c
     1:1:int compareTo(java.lang.Object):20:20 -> compareTo
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():46:46 -> f
+    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():46:46 -> e
     1:3:boolean computeEquals(java.lang.Object):112:114 -> g
     4:6:boolean isValidSimpleName(int):411:413 -> g
     com.android.tools.r8.utils.structural.StructuralItem self() -> k
@@ -20287,7 +20324,7 @@
     2:16:boolean isValidMethodName():372 -> z
     17:17:boolean isValidMethodName(java.lang.String):337:337 -> z
     17:17:boolean isValidMethodName():372 -> z
-com.android.tools.r8.graph.DexString$1 -> com.android.tools.r8.graph.Z$a:
+com.android.tools.r8.graph.DexString$1 -> com.android.tools.r8.graph.Y$a:
     com.android.tools.r8.graph.DexString this$0 -> c
     boolean $assertionsDisabled -> a
     int i -> b
@@ -20296,93 +20333,93 @@
     1:24:char nextChar():72:95 -> a
     25:25:char nextChar():73:73 -> a
     1:1:boolean hasNext():100:100 -> hasNext
-com.android.tools.r8.graph.DexType -> com.android.tools.r8.graph.a0:
+com.android.tools.r8.graph.DexType -> com.android.tools.r8.graph.Z:
     java.lang.String toStringCache -> i
     java.util.List OLD_SYNTHESIZED_NAMES -> f
     com.android.tools.r8.graph.DexString descriptor -> h
     boolean $assertionsDisabled -> g
     com.android.tools.r8.graph.DexType[] EMPTY_ARRAY -> e
-    1:7:void <clinit>():26:32 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexString):44:44 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.DexString):42:46 -> <init>
-    1:16:int elementSizeForPrimitiveArrayType():335:350 -> C
-    1:1:com.android.tools.r8.graph.DexString getDescriptor():78:78 -> D
-    1:2:java.lang.String getInternalName():473:474 -> E
-    1:4:java.lang.String getName():454:457 -> F
-    1:1:int getNumberOfLeadingSquareBrackets():356:356 -> G
-    1:1:java.lang.String getPackageDescriptor():450:450 -> H
-    1:1:java.lang.String getPackageName():478:478 -> I
-    1:2:java.lang.String getSimpleName():461:462 -> J
-    1:1:java.lang.String getTypeName():171:171 -> K
-    1:1:boolean isArrayType():277:277 -> L
-    1:1:boolean isBooleanType():239:239 -> M
-    1:1:boolean isByteType():243:243 -> N
-    1:1:boolean isCharType():247:247 -> O
-    1:1:boolean isClassType():282:282 -> P
-    1:1:boolean isDoubleType():267:267 -> Q
-    1:1:boolean isFloatType():259:259 -> R
-    1:1:boolean isIntType():255:255 -> S
-    1:1:boolean isLegacySynthesizedTypeAllowedDuplication():304:304 -> T
-    2:3:boolean isSynthesizedTypeThatCouldBeDuplicated(java.lang.String):311:312 -> T
-    2:3:boolean isLegacySynthesizedTypeAllowedDuplication():305 -> T
-    4:5:boolean oldSynthesizedName(java.lang.String):316:317 -> T
-    4:5:boolean isLegacySynthesizedTypeAllowedDuplication():305 -> T
-    1:1:boolean isLongType():263:263 -> U
-    1:2:boolean isNullValueType():271:272 -> V
-    1:4:boolean isPrimitiveArrayType():293:296 -> W
-    1:1:boolean isPrimitiveType():231:231 -> X
-    1:2:boolean isReferenceType():287:288 -> Y
-    1:1:boolean isShortType():251:251 -> Z
-    1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):26:26 -> a
-    2:2:int acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):63:63 -> a
-    2:2:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):26 -> a
-    3:3:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):69:69 -> a
-    4:5:boolean classInitializationMayHaveSideEffectsInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition):96:97 -> a
-    6:6:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):112:112 -> a
-    7:17:boolean isAlwaysNull(com.android.tools.r8.shaking.AppInfoWithLiveness):116:126 -> a
-    18:18:boolean isSamePackage(com.android.tools.r8.graph.DexType):130:130 -> a
-    19:19:java.lang.Object apply(java.util.function.Function,java.util.function.Function,java.util.function.Function):150:150 -> a
-    20:20:void accept(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):158:158 -> a
-    21:21:void accept(java.util.function.BiConsumer,java.util.function.BiConsumer,java.util.function.BiConsumer,java.lang.Object):167:167 -> a
-    22:23:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):204:205 -> a
-    24:24:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):265:265 -> a
-    24:24:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):205 -> a
-    25:25:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):217:217 -> a
-    26:28:com.android.tools.r8.graph.DexType replaceBaseType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):391:393 -> a
-    29:29:com.android.tools.r8.graph.DexType toArrayType(int,com.android.tools.r8.graph.DexItemFactory):424:424 -> a
-    29:29:com.android.tools.r8.graph.DexType replaceBaseType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):393 -> a
-    30:34:com.android.tools.r8.graph.DexType addSuffix(java.lang.String,com.android.tools.r8.graph.DexItemFactory):408:412 -> a
-    35:39:com.android.tools.r8.graph.DexType toArrayElementType(com.android.tools.r8.graph.DexItemFactory):428:432 -> a
-    40:43:com.android.tools.r8.graph.DexType toArrayElementType(com.android.tools.r8.graph.DexItemFactory):430:433 -> a
-    44:52:java.lang.String getPackageOrName(boolean):437:445 -> a
-    1:1:boolean isVoidType():235:235 -> a0
-    1:8:com.android.tools.r8.graph.DexType toBaseType(com.android.tools.r8.graph.DexItemFactory):363:370 -> b
-    9:13:com.android.tools.r8.graph.DexType toBaseType(com.android.tools.r8.graph.DexItemFactory):368:372 -> b
-    14:21:com.android.tools.r8.graph.DexType replacePackage(java.lang.String,com.android.tools.r8.graph.DexItemFactory):397:404 -> b
-    1:1:boolean isWideType():300:300 -> b0
-    1:3:com.android.tools.r8.graph.DexType withSimpleName(java.lang.String,com.android.tools.r8.graph.DexItemFactory):466:468 -> c
+    1:7:void <clinit>():38:44 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexString):49:49 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.DexString):47:51 -> <init>
+    1:16:int elementSizeForPrimitiveArrayType():368:383 -> C
+    1:2:java.lang.String getInternalName():506:507 -> D
+    1:4:java.lang.String getName():487:490 -> E
+    1:1:int getNumberOfLeadingSquareBrackets():389:389 -> F
+    1:1:java.lang.String getPackageDescriptor():483:483 -> G
+    1:1:java.lang.String getPackageName():511:511 -> H
+    1:2:java.lang.String getSimpleName():494:495 -> I
+    1:1:boolean isArrayType():278:278 -> J
+    1:1:boolean isBooleanType():240:240 -> K
+    1:1:boolean isByteType():244:244 -> L
+    1:1:boolean isCharType():248:248 -> M
+    1:1:boolean isClassType():283:283 -> N
+    1:18:boolean isD8R8SynthesizedClassType():312:329 -> O
+    1:1:boolean isDoubleType():268:268 -> P
+    1:1:boolean isFloatType():260:260 -> Q
+    1:1:boolean isIntType():256:256 -> R
+    1:2:boolean isLegacySynthesizedTypeAllowedDuplication():333:334 -> S
+    3:4:boolean oldSynthesizedName(java.lang.String):349:350 -> S
+    3:4:boolean isLegacySynthesizedTypeAllowedDuplication():334 -> S
+    1:1:boolean isLongType():264:264 -> T
+    1:2:boolean isNullValueType():272:273 -> U
+    1:4:boolean isPrimitiveArrayType():294:297 -> V
+    1:1:boolean isPrimitiveType():232:232 -> W
+    1:2:boolean isReferenceType():288:289 -> X
+    1:1:boolean isShortType():252:252 -> Y
+    1:1:boolean isVoidType():236:236 -> Z
+    1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):38:38 -> a
+    2:2:int acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):68:68 -> a
+    2:2:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):38 -> a
+    3:3:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):74:74 -> a
+    4:4:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):117:117 -> a
+    5:15:boolean isAlwaysNull(com.android.tools.r8.shaking.AppInfoWithLiveness):121:131 -> a
+    16:16:boolean isSamePackage(com.android.tools.r8.graph.DexType):135:135 -> a
+    17:17:java.lang.Object apply(java.util.function.Function,java.util.function.Function,java.util.function.Function):155:155 -> a
+    18:18:void accept(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):163:163 -> a
+    19:19:void accept(java.util.function.BiConsumer,java.util.function.BiConsumer,java.util.function.BiConsumer,java.lang.Object):172:172 -> a
+    20:21:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):205:206 -> a
+    22:22:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):265:265 -> a
+    22:22:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):206 -> a
+    23:23:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):218:218 -> a
+    24:24:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    24:24:boolean classInitializationMayHaveSideEffectsInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition):101 -> a
+    25:25:boolean classInitializationMayHaveSideEffectsInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition):102:102 -> a
+    26:31:boolean isSynthesizedTypeThatCouldBeDuplicated(java.lang.String):340:345 -> a
+    32:34:com.android.tools.r8.graph.DexType replaceBaseType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):424:426 -> a
+    35:35:com.android.tools.r8.graph.DexType toArrayType(int,com.android.tools.r8.graph.DexItemFactory):457:457 -> a
+    35:35:com.android.tools.r8.graph.DexType replaceBaseType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):426 -> a
+    36:40:com.android.tools.r8.graph.DexType addSuffix(java.lang.String,com.android.tools.r8.graph.DexItemFactory):441:445 -> a
+    41:45:com.android.tools.r8.graph.DexType toArrayElementType(com.android.tools.r8.graph.DexItemFactory):461:465 -> a
+    46:49:com.android.tools.r8.graph.DexType toArrayElementType(com.android.tools.r8.graph.DexItemFactory):463:466 -> a
+    50:58:java.lang.String getPackageOrName(boolean):470:478 -> a
+    1:1:boolean isWideType():301:301 -> a0
+    1:8:com.android.tools.r8.graph.DexType toBaseType(com.android.tools.r8.graph.DexItemFactory):396:403 -> b
+    9:13:com.android.tools.r8.graph.DexType toBaseType(com.android.tools.r8.graph.DexItemFactory):401:405 -> b
+    14:21:com.android.tools.r8.graph.DexType replacePackage(java.lang.String,com.android.tools.r8.graph.DexItemFactory):430:437 -> b
+    1:4:java.lang.String toBinaryName():143:146 -> b0
+    5:8:java.lang.String toBinaryName():144:147 -> b0
+    1:3:com.android.tools.r8.graph.DexType withSimpleName(java.lang.String,com.android.tools.r8.graph.DexItemFactory):499:501 -> c
     4:4:java.lang.String com.android.tools.r8.utils.DescriptorUtils.replaceSimpleClassNameInDescriptor(java.lang.String,java.lang.String):314:314 -> c
-    4:4:com.android.tools.r8.graph.DexType withSimpleName(java.lang.String,com.android.tools.r8.graph.DexItemFactory):468 -> c
+    4:4:com.android.tools.r8.graph.DexType withSimpleName(java.lang.String,com.android.tools.r8.graph.DexItemFactory):501 -> c
     5:5:int com.android.tools.r8.utils.DescriptorUtils.getSimpleClassNameIndex(java.lang.String):327:327 -> c
     5:5:java.lang.String com.android.tools.r8.utils.DescriptorUtils.replaceSimpleClassNameInDescriptor(java.lang.String,java.lang.String):315 -> c
-    5:5:com.android.tools.r8.graph.DexType withSimpleName(java.lang.String,com.android.tools.r8.graph.DexItemFactory):468 -> c
+    5:5:com.android.tools.r8.graph.DexType withSimpleName(java.lang.String,com.android.tools.r8.graph.DexItemFactory):501 -> c
     6:6:java.lang.String com.android.tools.r8.utils.DescriptorUtils.replaceSimpleClassNameInDescriptor(java.lang.String,java.lang.String):315:315 -> c
-    6:6:com.android.tools.r8.graph.DexType withSimpleName(java.lang.String,com.android.tools.r8.graph.DexItemFactory):468 -> c
-    7:7:com.android.tools.r8.graph.DexType withSimpleName(java.lang.String,com.android.tools.r8.graph.DexItemFactory):467:467 -> c
-    1:4:java.lang.String toBinaryName():138:141 -> c0
-    5:8:java.lang.String toBinaryName():139:142 -> c0
-    1:1:java.lang.String toDescriptorString():134:134 -> d0
-    1:1:char toShorty():188:188 -> e0
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():57:57 -> f
-    1:2:boolean computeEquals(java.lang.Object):88:89 -> g
+    6:6:com.android.tools.r8.graph.DexType withSimpleName(java.lang.String,com.android.tools.r8.graph.DexItemFactory):501 -> c
+    7:7:com.android.tools.r8.graph.DexType withSimpleName(java.lang.String,com.android.tools.r8.graph.DexItemFactory):500:500 -> c
+    1:1:java.lang.String toDescriptorString():139:139 -> c0
+    1:1:char toShorty():189:189 -> d0
+    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():62:62 -> e
+    1:2:boolean computeEquals(java.lang.Object):93:94 -> g
     com.android.tools.r8.graph.DexType getContextType() -> i
     com.android.tools.r8.utils.structural.StructuralItem self() -> k
-    1:1:java.lang.String toSmaliString():194:194 -> r
-    1:9:java.lang.String toSourceString():176:184 -> s
-    1:1:int computeHashCode():83:83 -> t
-    1:1:java.lang.String toString():199:199 -> toString
+    1:1:java.lang.String toSmaliString():195:195 -> r
+    1:9:java.lang.String toSourceString():177:185 -> s
+    1:1:int computeHashCode():88:88 -> t
+    1:1:java.lang.String toString():200:200 -> toString
     com.android.tools.r8.graph.DexType asDexType() -> x
-com.android.tools.r8.graph.DexTypeList -> com.android.tools.r8.graph.b0:
+com.android.tools.r8.graph.DexTypeList -> com.android.tools.r8.graph.a0:
     com.android.tools.r8.graph.DexTypeList theEmptyTypeList -> a
     boolean $assertionsDisabled -> b
     com.android.tools.r8.graph.DexType[] values -> c
@@ -20391,20 +20428,19 @@
     3:5:void <init>(com.android.tools.r8.graph.DexType[]):40:42 -> <init>
     1:1:com.android.tools.r8.graph.DexType[] lambda$specify$0(com.android.tools.r8.graph.DexTypeList):29:29 -> a
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):29:29 -> a
-    3:3:boolean contains(com.android.tools.r8.graph.DexType):84:84 -> a
-    4:4:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):107:107 -> a
-    1:2:boolean equals(java.lang.Object):115:116 -> equals
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():80:80 -> f
-    1:2:void forEach(java.util.function.Consumer):89:90 -> forEach
-    1:1:com.android.tools.r8.graph.DexType get(int):58:58 -> g
-    1:1:int hashCode():96:96 -> hashCode
-    1:1:boolean isEmpty():120:120 -> isEmpty
-    1:1:java.util.Iterator iterator():145:145 -> iterator
+    3:3:boolean contains(com.android.tools.r8.graph.DexType):80:80 -> a
+    4:4:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):103:103 -> a
+    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():76:76 -> e
+    1:2:boolean equals(java.lang.Object):111:112 -> equals
+    1:2:void forEach(java.util.function.Consumer):85:86 -> forEach
+    1:1:int hashCode():92:92 -> hashCode
+    1:1:boolean isEmpty():116:116 -> isEmpty
+    1:1:java.util.Iterator iterator():141:141 -> iterator
     com.android.tools.r8.utils.structural.StructuralItem self() -> k
-    1:1:int size():124:124 -> size
+    1:1:int size():120:120 -> size
     1:1:com.android.tools.r8.graph.DexTypeList empty():33:33 -> t
-    1:8:java.lang.String toString():133:140 -> toString
-com.android.tools.r8.graph.DexValue -> com.android.tools.r8.graph.c0:
+    1:8:java.lang.String toString():129:136 -> toString
+com.android.tools.r8.graph.DexValue -> com.android.tools.r8.graph.b0:
     com.android.tools.r8.graph.DexValue[] EMPTY_ARRAY -> a
     1:1:void <clinit>():146:146 -> <clinit>
     1:1:void <init>():35:35 -> <init>
@@ -20457,7 +20493,7 @@
     1:1:boolean isDefault(com.android.tools.r8.graph.DexType):413:413 -> b
     boolean mayHaveSideEffects() -> b0
     void sort() -> c0
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():122:122 -> f
+    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():122:122 -> e
     com.android.tools.r8.utils.structural.StructuralItem self() -> k
     java.lang.Object asAsmEncodedObject() -> t
     com.android.tools.r8.graph.DexValue$DexItemBasedValueString asDexItemBasedValueString() -> u
@@ -20466,8 +20502,8 @@
     com.android.tools.r8.graph.DexValue$DexValueBoolean asDexValueBoolean() -> x
     com.android.tools.r8.graph.DexValue$DexValueByte asDexValueByte() -> y
     com.android.tools.r8.graph.DexValue$DexValueChar asDexValueChar() -> z
-com.android.tools.r8.graph.DexValue$1 -> com.android.tools.r8.graph.c0$a:
-com.android.tools.r8.graph.DexValue$DexItemBasedValueString -> com.android.tools.r8.graph.c0$b:
+com.android.tools.r8.graph.DexValue$1 -> com.android.tools.r8.graph.b0$a:
+com.android.tools.r8.graph.DexValue$DexItemBasedValueString -> com.android.tools.r8.graph.b0$b:
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> d
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():1276:1276 -> <clinit>
@@ -20483,8 +20519,8 @@
     7:7:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):1311:1311 -> a
     8:8:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1340:1340 -> a
     9:16: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):1346:1353 -> a
-    17:17:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):1361:1361 -> a
-    18:18:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1366:1366 -> a
+    17:17:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):1363:1363 -> a
+    18:18:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1368:1368 -> a
     boolean isNestedDexValue() -> a0
     1:1:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1297:1297 -> b
     2:6:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1302:1306 -> b
@@ -20492,78 +20528,78 @@
     1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():1315:1315 -> e0
     1:1:java.lang.Object asAsmEncodedObject():1330:1330 -> t
     com.android.tools.r8.graph.DexValue$DexItemBasedValueString asDexItemBasedValueString() -> u
-com.android.tools.r8.graph.DexValue$DexValueAnnotation -> com.android.tools.r8.graph.c0$c:
+com.android.tools.r8.graph.DexValue$DexValueAnnotation -> com.android.tools.r8.graph.b0$c:
     com.android.tools.r8.graph.DexEncodedAnnotation value -> b
-    1:2:void <init>(com.android.tools.r8.graph.DexEncodedAnnotation):1694:1695 -> <init>
-    1:1:java.lang.Object getBoxedValue():1750:1750 -> N
-    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1714:1714 -> O
-    1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):1690:1690 -> a
-    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):1729:1729 -> a
-    3:3:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):1734:1734 -> a
-    4:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1739:1740 -> a
-    6:6:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1745:1745 -> a
-    1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1700:1700 -> b
-    2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1705:1705 -> b
+    1:2:void <init>(com.android.tools.r8.graph.DexEncodedAnnotation):1696:1697 -> <init>
+    1:1:java.lang.Object getBoxedValue():1752:1752 -> N
+    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1716:1716 -> O
+    1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):1692:1692 -> a
+    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):1731:1731 -> a
+    3:3:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):1736:1736 -> a
+    4:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1741:1742 -> a
+    6:6:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1747:1747 -> a
+    1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1702:1702 -> b
+    2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1707:1707 -> b
     3:3:void com.android.tools.r8.utils.structural.StructuralItem.acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):86:86 -> b
-    3:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1705 -> b
-    1:1:void sort():1760:1760 -> c0
-    1:3:boolean equals(java.lang.Object):1773:1775 -> equals
-    1:1:int hashCode():1765:1765 -> hashCode
+    3:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1707 -> b
+    1:1:void sort():1762:1762 -> c0
+    1:3:boolean equals(java.lang.Object):1775:1777 -> equals
+    1:1:int hashCode():1767:1767 -> hashCode
     com.android.tools.r8.utils.structural.StructuralItem self() -> k
-    1:1:java.lang.Object asAsmEncodedObject():1755:1755 -> t
-    1:1:java.lang.String toString():1782:1782 -> toString
+    1:1:java.lang.Object asAsmEncodedObject():1757:1757 -> t
+    1:1:java.lang.String toString():1784:1784 -> toString
     com.android.tools.r8.graph.DexValue$DexValueAnnotation asDexValueAnnotation() -> v
-com.android.tools.r8.graph.DexValue$DexValueArray -> com.android.tools.r8.graph.c0$d:
+com.android.tools.r8.graph.DexValue$DexValueArray -> com.android.tools.r8.graph.b0$d:
     com.android.tools.r8.graph.DexValue[] values -> b
-    1:2:void <init>(com.android.tools.r8.graph.DexValue[]):1585:1586 -> <init>
-    1:1:java.lang.Object getBoxedValue():1637:1637 -> N
-    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1611:1611 -> O
-    1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):1581:1581 -> a
-    2:3:void forEachElement(java.util.function.Consumer):1600:1601 -> a
-    4:5:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):1616:1617 -> a
-    6:7:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1623:1624 -> a
+    1:2:void <init>(com.android.tools.r8.graph.DexValue[]):1587:1588 -> <init>
+    1:1:java.lang.Object getBoxedValue():1639:1639 -> N
+    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1613:1613 -> O
+    1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):1583:1583 -> a
+    2:3:void forEachElement(java.util.function.Consumer):1602:1603 -> a
+    4:5:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):1618:1619 -> a
+    6:7:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1625:1626 -> a
     8:8:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):82:82 -> a
-    8:8:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1624 -> a
-    9:10:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1625:1626 -> a
-    11:11:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1632:1632 -> a
-    12:12:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):1642:1642 -> a
-    1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1591:1591 -> b
+    8:8:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1626 -> a
+    9:10:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1627:1628 -> a
+    11:11:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1634:1634 -> a
+    12:12:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):1644:1644 -> a
+    1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1593:1593 -> b
     2:2:int com.android.tools.r8.utils.structural.CompareToVisitor.visitItemArray(com.android.tools.r8.utils.structural.StructuralItem[],com.android.tools.r8.utils.structural.StructuralItem[]):35:35 -> b
-    2:2:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1591 -> b
-    3:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1596:1596 -> b
-    1:2:void sort():1652:1653 -> c0
-    1:1:com.android.tools.r8.graph.DexValue[] getValues():1606:1606 -> d0
-    1:3:boolean equals(java.lang.Object):1667:1669 -> equals
-    1:1:int hashCode():1659:1659 -> hashCode
+    2:2:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1593 -> b
+    3:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1598:1598 -> b
+    1:2:void sort():1654:1655 -> c0
+    1:1:com.android.tools.r8.graph.DexValue[] getValues():1608:1608 -> d0
+    1:3:boolean equals(java.lang.Object):1669:1671 -> equals
+    1:1:int hashCode():1661:1661 -> hashCode
     com.android.tools.r8.utils.structural.StructuralItem self() -> k
-    1:1:java.lang.Object asAsmEncodedObject():1647:1647 -> t
-    1:1:java.lang.String toString():1676:1676 -> toString
+    1:1:java.lang.Object asAsmEncodedObject():1649:1649 -> t
+    1:1:java.lang.String toString():1678:1678 -> toString
     com.android.tools.r8.graph.DexValue$DexValueArray asDexValueArray() -> w
-com.android.tools.r8.graph.DexValue$DexValueBoolean -> com.android.tools.r8.graph.c0$e:
+com.android.tools.r8.graph.DexValue$DexValueBoolean -> com.android.tools.r8.graph.b0$e:
     com.android.tools.r8.graph.DexValue$DexValueBoolean DEFAULT -> d
     com.android.tools.r8.graph.DexValue$DexValueBoolean TRUE -> b
     com.android.tools.r8.graph.DexValue$DexValueBoolean FALSE -> c
     boolean value -> e
-    1:4:void <clinit>():1877:1880 -> <clinit>
-    1:2:void <init>(boolean):1884:1885 -> <init>
-    1:1:java.lang.Object getBoxedValue():1933:1933 -> N
-    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1908:1908 -> O
+    1:4:void <clinit>():1879:1882 -> <clinit>
+    1:2:void <init>(boolean):1886:1887 -> <init>
+    1:1:java.lang.Object getBoxedValue():1935:1935 -> N
+    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1910:1910 -> O
     boolean isDexValueBoolean() -> P
-    1:1:com.android.tools.r8.graph.DexValue$DexValueBoolean create(boolean):1889:1889 -> a
-    2:2:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1913:1913 -> a
-    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1938:1938 -> 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):1967:1967 -> a
-    1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1894:1894 -> b
-    2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1899:1899 -> b
-    1:1:long getRawValue():1918:1918 -> d0
-    1:1:com.android.tools.r8.graph.DexValue$DexValueBoolean access$000():1875:1875 -> e0
-    1:1:boolean equals(java.lang.Object):1956:1956 -> equals
-    1:1:boolean getValue():1903:1903 -> f0
-    1:1:int hashCode():1948:1948 -> hashCode
-    1:1:java.lang.Object asAsmEncodedObject():1943:1943 -> t
-    1:1:java.lang.String toString():1961:1961 -> toString
+    1:1:com.android.tools.r8.graph.DexValue$DexValueBoolean create(boolean):1891:1891 -> a
+    2:2:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1915:1915 -> a
+    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1940:1940 -> 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):1969:1969 -> a
+    1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1896:1896 -> b
+    2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1901:1901 -> b
+    1:1:long getRawValue():1920:1920 -> d0
+    1:1:com.android.tools.r8.graph.DexValue$DexValueBoolean access$000():1877:1877 -> e0
+    1:1:boolean equals(java.lang.Object):1958:1958 -> equals
+    1:1:boolean getValue():1905:1905 -> f0
+    1:1:int hashCode():1950:1950 -> hashCode
+    1:1:java.lang.Object asAsmEncodedObject():1945:1945 -> t
+    1:1:java.lang.String toString():1963:1963 -> toString
     com.android.tools.r8.graph.DexValue$DexValueBoolean asDexValueBoolean() -> x
-com.android.tools.r8.graph.DexValue$DexValueByte -> com.android.tools.r8.graph.c0$f:
+com.android.tools.r8.graph.DexValue$DexValueByte -> com.android.tools.r8.graph.b0$f:
     com.android.tools.r8.graph.DexValue$DexValueByte DEFAULT -> b
     byte value -> c
     1:1:void <clinit>():472:472 -> <clinit>
@@ -20586,7 +20622,7 @@
     1:1:java.lang.Object asAsmEncodedObject():536:536 -> t
     1:1:java.lang.String toString():554:554 -> toString
     com.android.tools.r8.graph.DexValue$DexValueByte asDexValueByte() -> y
-com.android.tools.r8.graph.DexValue$DexValueChar -> com.android.tools.r8.graph.c0$g:
+com.android.tools.r8.graph.DexValue$DexValueChar -> com.android.tools.r8.graph.b0$g:
     com.android.tools.r8.graph.DexValue$DexValueChar DEFAULT -> b
     char value -> c
     1:1:void <clinit>():658:658 -> <clinit>
@@ -20612,7 +20648,7 @@
     1:1:java.lang.Object asAsmEncodedObject():724:724 -> t
     1:1:java.lang.String toString():742:742 -> toString
     com.android.tools.r8.graph.DexValue$DexValueChar asDexValueChar() -> z
-com.android.tools.r8.graph.DexValue$DexValueDouble -> com.android.tools.r8.graph.c0$h:
+com.android.tools.r8.graph.DexValue$DexValueDouble -> com.android.tools.r8.graph.b0$h:
     com.android.tools.r8.graph.DexValue$DexValueDouble DEFAULT -> b
     double value -> c
     1:1:void <clinit>():1035:1035 -> <clinit>
@@ -20628,7 +20664,7 @@
     5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1095 -> a
     6:7:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1096:1097 -> 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):1108:1108 -> a
-    9:9:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createDoubleConstant(double,com.android.tools.r8.graph.DebugLocalInfo):1125:1125 -> a
+    9:9:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createDoubleConstant(double,com.android.tools.r8.graph.DebugLocalInfo):1120:1120 -> a
     9:9: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):1108 -> a
     1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1049:1049 -> b
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1054:1054 -> b
@@ -20638,39 +20674,39 @@
     1:1:int hashCode():1113:1113 -> hashCode
     1:1:java.lang.Object asAsmEncodedObject():1102:1102 -> t
     1:1:java.lang.String toString():1127:1127 -> toString
-com.android.tools.r8.graph.DexValue$DexValueEnum -> com.android.tools.r8.graph.c0$i:
-    1:1:void <init>(com.android.tools.r8.graph.DexField):1500:1500 -> <init>
+com.android.tools.r8.graph.DexValue$DexValueEnum -> com.android.tools.r8.graph.b0$i:
+    1:1:void <init>(com.android.tools.r8.graph.DexField):1502:1502 -> <init>
     com.android.tools.r8.graph.DexValue$DexValueEnum asDexValueEnum() -> B
-    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1515:1515 -> O
+    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1517:1517 -> O
     1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexValue$NestedDexValue.getType(com.android.tools.r8.graph.DexItemFactory):1146:1146 -> a
-    1:1:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1497 -> a
-    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):1520:1520 -> a
-    3:3:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):1535:1535 -> a
+    1:1:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1499 -> a
+    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):1522:1522 -> a
+    3:3:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):1537:1537 -> a
     boolean isNestedDexValue() -> a0
-    1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1505:1505 -> b
-    2:2:int com.android.tools.r8.graph.DexField.acceptCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.structural.CompareToVisitor):155:155 -> b
-    2:2:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1505 -> b
-    3:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1510:1510 -> b
+    1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1507:1507 -> b
+    2:2:int com.android.tools.r8.graph.DexField.acceptCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.structural.CompareToVisitor):143:143 -> b
+    2:2:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1507 -> b
+    3:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1512:1512 -> b
     4:4:void com.android.tools.r8.utils.structural.StructuralItem.acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):86:86 -> b
-    4:4:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1510 -> b
+    4:4:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1512 -> b
     void sort() -> c0
-com.android.tools.r8.graph.DexValue$DexValueField -> com.android.tools.r8.graph.c0$j:
-    1:1:void <init>(com.android.tools.r8.graph.DexField):1416:1416 -> <init>
+com.android.tools.r8.graph.DexValue$DexValueField -> com.android.tools.r8.graph.b0$j:
+    1:1:void <init>(com.android.tools.r8.graph.DexField):1418:1418 -> <init>
     com.android.tools.r8.graph.DexValue$DexValueField asDexValueField() -> C
-    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1431:1431 -> O
+    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1433:1433 -> O
     1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexValue$NestedDexValue.getType(com.android.tools.r8.graph.DexItemFactory):1146:1146 -> a
-    1:1:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1413 -> a
-    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):1436:1436 -> a
-    3:3:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):1451:1451 -> a
+    1:1:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1415 -> a
+    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):1438:1438 -> a
+    3:3:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):1453:1453 -> a
     boolean isNestedDexValue() -> a0
-    1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1421:1421 -> b
-    2:2:int com.android.tools.r8.graph.DexField.acceptCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.structural.CompareToVisitor):155:155 -> b
-    2:2:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1421 -> b
-    3:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1426:1426 -> b
+    1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1423:1423 -> b
+    2:2:int com.android.tools.r8.graph.DexField.acceptCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.structural.CompareToVisitor):143:143 -> b
+    2:2:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1423 -> b
+    3:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1428:1428 -> b
     4:4:void com.android.tools.r8.utils.structural.StructuralItem.acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):86:86 -> b
-    4:4:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1426 -> b
+    4:4:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1428 -> b
     void sort() -> c0
-com.android.tools.r8.graph.DexValue$DexValueFloat -> com.android.tools.r8.graph.c0$k:
+com.android.tools.r8.graph.DexValue$DexValueFloat -> com.android.tools.r8.graph.b0$k:
     com.android.tools.r8.graph.DexValue$DexValueFloat DEFAULT -> b
     float value -> c
     1:1:void <clinit>():938:938 -> <clinit>
@@ -20686,7 +20722,7 @@
     5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):997 -> a
     6:7:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):998:999 -> 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):1010:1010 -> a
-    9:9:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createFloatConstant(float,com.android.tools.r8.graph.DebugLocalInfo):1129:1129 -> a
+    9:9:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createFloatConstant(float,com.android.tools.r8.graph.DebugLocalInfo):1124:1124 -> a
     9:9: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):1010 -> a
     1:1:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):951:951 -> b
     2:2:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):956:956 -> b
@@ -20696,7 +20732,7 @@
     1:1:int hashCode():1015:1015 -> hashCode
     1:1:java.lang.Object asAsmEncodedObject():1004:1004 -> t
     1:1:java.lang.String toString():1029:1029 -> toString
-com.android.tools.r8.graph.DexValue$DexValueInt -> com.android.tools.r8.graph.c0$l:
+com.android.tools.r8.graph.DexValue$DexValueInt -> com.android.tools.r8.graph.b0$l:
     com.android.tools.r8.graph.DexValue$DexValueInt DEFAULT -> b
     int value -> c
     1:1:void <clinit>():754:754 -> <clinit>
@@ -20717,7 +20753,7 @@
     1:1:int hashCode():821:821 -> hashCode
     1:1:java.lang.Object asAsmEncodedObject():816:816 -> t
     1:1:java.lang.String toString():834:834 -> toString
-com.android.tools.r8.graph.DexValue$DexValueKind -> com.android.tools.r8.graph.c0$m:
+com.android.tools.r8.graph.DexValue$DexValueKind -> com.android.tools.r8.graph.b0$m:
     com.android.tools.r8.graph.DexValue$DexValueKind ANNOTATION -> p
     com.android.tools.r8.graph.DexValue$DexValueKind NULL -> q
     com.android.tools.r8.graph.DexValue$DexValueKind BOOLEAN -> r
@@ -20742,7 +20778,7 @@
     19:19:void <clinit>():37:37 -> <clinit>
     1:2:void <init>(java.lang.String,int,int):102:103 -> <init>
     1:1:byte toByte():107:107 -> a
-com.android.tools.r8.graph.DexValue$DexValueLong -> com.android.tools.r8.graph.c0$n:
+com.android.tools.r8.graph.DexValue$DexValueLong -> com.android.tools.r8.graph.b0$n:
     long value -> c
     com.android.tools.r8.graph.DexValue$DexValueLong DEFAULT -> b
     1:1:void <clinit>():846:846 -> <clinit>
@@ -20755,7 +20791,7 @@
     2:2:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):878:878 -> a
     3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):903:903 -> 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):932:932 -> a
-    5:5:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createLongConstant(long,com.android.tools.r8.graph.DebugLocalInfo):1141:1141 -> a
+    5:5:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createLongConstant(long,com.android.tools.r8.graph.DebugLocalInfo):1136:1136 -> a
     5:5: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):932 -> a
     1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):859:859 -> b
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):864:864 -> b
@@ -20765,66 +20801,66 @@
     1:1:int hashCode():913:913 -> hashCode
     1:1:java.lang.Object asAsmEncodedObject():908:908 -> t
     1:1:java.lang.String toString():926:926 -> toString
-com.android.tools.r8.graph.DexValue$DexValueMethod -> com.android.tools.r8.graph.c0$o:
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod):1458:1458 -> <init>
+com.android.tools.r8.graph.DexValue$DexValueMethod -> com.android.tools.r8.graph.b0$o:
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod):1460:1460 -> <init>
     com.android.tools.r8.graph.DexValue$DexValueMethod asDexValueMethod() -> G
-    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1473:1473 -> O
+    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1475:1475 -> O
     1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexValue$NestedDexValue.getType(com.android.tools.r8.graph.DexItemFactory):1146:1146 -> a
-    1:1:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1455 -> a
-    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):1478:1478 -> a
-    3:3:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):1493:1493 -> a
+    1:1:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1457 -> a
+    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):1480:1480 -> a
+    3:3:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):1495:1495 -> a
     boolean isNestedDexValue() -> a0
-    1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1463:1463 -> b
-    2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1468:1468 -> b
+    1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1465:1465 -> b
+    2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1470:1470 -> b
     3:3:void com.android.tools.r8.utils.structural.StructuralItem.acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):86:86 -> b
-    3:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1468 -> b
+    3:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1470 -> b
     void sort() -> c0
-com.android.tools.r8.graph.DexValue$DexValueMethodHandle -> com.android.tools.r8.graph.c0$p:
-    1:1:void <init>(com.android.tools.r8.graph.DexMethodHandle):1974:1974 -> <init>
+com.android.tools.r8.graph.DexValue$DexValueMethodHandle -> com.android.tools.r8.graph.b0$p:
+    1:1:void <init>(com.android.tools.r8.graph.DexMethodHandle):1976:1976 -> <init>
     com.android.tools.r8.graph.DexValue$DexValueMethodHandle asDexValueMethodHandle() -> H
-    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1999:1999 -> O
+    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():2001:2001 -> O
     1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexValue$NestedDexValue.getType(com.android.tools.r8.graph.DexItemFactory):1146:1146 -> a
-    1:1:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1971 -> a
-    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):2004:2004 -> a
-    3:3:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):2009:2009 -> a
+    1:1:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1973 -> a
+    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):2006:2006 -> a
+    3:3:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):2011:2011 -> a
     boolean isNestedDexValue() -> a0
-    1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1979:1979 -> b
-    2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1984:1984 -> b
+    1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1981:1981 -> b
+    2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1986:1986 -> b
     3:3:void com.android.tools.r8.utils.structural.StructuralItem.acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):86:86 -> b
-    3:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1984 -> b
+    3:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1986 -> b
     void sort() -> c0
-com.android.tools.r8.graph.DexValue$DexValueMethodType -> com.android.tools.r8.graph.c0$q:
-    1:1:void <init>(com.android.tools.r8.graph.DexProto):1542:1542 -> <init>
+com.android.tools.r8.graph.DexValue$DexValueMethodType -> com.android.tools.r8.graph.b0$q:
+    1:1:void <init>(com.android.tools.r8.graph.DexProto):1544:1544 -> <init>
     com.android.tools.r8.graph.DexValue$DexValueMethodType asDexValueMethodType() -> I
-    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1567:1567 -> O
+    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1569:1569 -> O
     1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexValue$NestedDexValue.getType(com.android.tools.r8.graph.DexItemFactory):1146:1146 -> a
-    1:1:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1539 -> a
-    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):1572:1572 -> a
-    3:3:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):1577:1577 -> a
+    1:1:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1541 -> a
+    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):1574:1574 -> a
+    3:3:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):1579:1579 -> a
     boolean isNestedDexValue() -> a0
-    1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1547:1547 -> b
-    2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1552:1552 -> b
+    1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1549:1549 -> b
+    2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1554:1554 -> b
     3:3:void com.android.tools.r8.utils.structural.StructuralItem.acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):86:86 -> b
-    3:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1552 -> b
+    3:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1554 -> b
     void sort() -> c0
-com.android.tools.r8.graph.DexValue$DexValueNull -> com.android.tools.r8.graph.c0$r:
+com.android.tools.r8.graph.DexValue$DexValueNull -> com.android.tools.r8.graph.b0$r:
     com.android.tools.r8.graph.DexValue NULL -> b
     boolean $assertionsDisabled -> c
-    1:3:void <clinit>():1786:1788 -> <clinit>
-    1:1:void <init>():1791:1791 -> <init>
+    1:3:void <clinit>():1788:1790 -> <clinit>
+    1:1:void <init>():1793:1793 -> <init>
     java.lang.Object getBoxedValue() -> N
-    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1812:1812 -> O
-    1:1:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1817:1817 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1827:1827 -> a
-    3:3: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):1871:1871 -> a
-    4:4:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):1176:1176 -> 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):1871 -> a
-    1:1:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1796:1796 -> b
-    2:3:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1801:1802 -> b
+    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1814:1814 -> O
+    1:1:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1819:1819 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1829:1829 -> a
+    3:3: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):1873:1873 -> a
+    4:4:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):1171:1171 -> 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):1873 -> a
+    1:1:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1798:1798 -> b
+    2:3:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1803:1804 -> b
     long getRawValue() -> d0
-    1:1:boolean equals(java.lang.Object):1860:1860 -> equals
+    1:1:boolean equals(java.lang.Object):1862:1862 -> equals
     java.lang.Object asAsmEncodedObject() -> t
-com.android.tools.r8.graph.DexValue$DexValueNumber -> com.android.tools.r8.graph.c0$s:
+com.android.tools.r8.graph.DexValue$DexValueNumber -> com.android.tools.r8.graph.b0$s:
     1:1:void <init>():450:450 -> <init>
     com.android.tools.r8.graph.DexValue$DexValueNumber asDexValueNumber() -> J
     boolean isDexValueNumber() -> W
@@ -20832,7 +20868,7 @@
     boolean mayHaveSideEffects() -> b0
     void sort() -> c0
     long getRawValue() -> d0
-com.android.tools.r8.graph.DexValue$DexValueShort -> com.android.tools.r8.graph.c0$t:
+com.android.tools.r8.graph.DexValue$DexValueShort -> com.android.tools.r8.graph.b0$t:
     com.android.tools.r8.graph.DexValue$DexValueShort DEFAULT -> b
     short value -> c
     1:1:void <clinit>():566:566 -> <clinit>
@@ -20853,7 +20889,7 @@
     1:1:int hashCode():633:633 -> hashCode
     1:1:java.lang.Object asAsmEncodedObject():628:628 -> t
     1:1:java.lang.String toString():646:646 -> toString
-com.android.tools.r8.graph.DexValue$DexValueString -> com.android.tools.r8.graph.c0$u:
+com.android.tools.r8.graph.DexValue$DexValueString -> com.android.tools.r8.graph.b0$u:
     1:1:void <init>(com.android.tools.r8.graph.DexString):1204:1204 -> <init>
     com.android.tools.r8.graph.DexValue$DexValueString asDexValueString() -> L
     1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1243:1243 -> O
@@ -20873,24 +20909,24 @@
     8:8:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1218 -> b
     void sort() -> c0
     1:1:java.lang.Object asAsmEncodedObject():1238:1238 -> t
-com.android.tools.r8.graph.DexValue$DexValueType -> com.android.tools.r8.graph.c0$v:
-    1:1:void <init>(com.android.tools.r8.graph.DexType):1374:1374 -> <init>
+com.android.tools.r8.graph.DexValue$DexValueType -> com.android.tools.r8.graph.b0$v:
+    1:1:void <init>(com.android.tools.r8.graph.DexType):1376:1376 -> <init>
     com.android.tools.r8.graph.DexValue$DexValueType asDexValueType() -> M
-    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1389:1389 -> O
+    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1391:1391 -> O
     boolean isDexValueType() -> Z
     1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexValue$NestedDexValue.getType(com.android.tools.r8.graph.DexItemFactory):1146:1146 -> a
-    1:1:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1371 -> a
-    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):1394:1394 -> a
-    3:3:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):1409:1409 -> a
+    1:1:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1373 -> a
+    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):1396:1396 -> a
+    3:3:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):1411:1411 -> a
     boolean isNestedDexValue() -> a0
-    1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1379:1379 -> b
-    2:2:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):63:63 -> b
-    2:2:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1379 -> b
-    3:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1384:1384 -> b
-    4:4:void com.android.tools.r8.graph.DexType.acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):69:69 -> b
-    4:4:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1384 -> b
+    1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1381:1381 -> b
+    2:2:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):68:68 -> b
+    2:2:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1381 -> b
+    3:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1386:1386 -> b
+    4:4:void com.android.tools.r8.graph.DexType.acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):74:74 -> b
+    4:4:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1386 -> b
     void sort() -> c0
-com.android.tools.r8.graph.DexValue$NestedDexValue -> com.android.tools.r8.graph.c0$w:
+com.android.tools.r8.graph.DexValue$NestedDexValue -> com.android.tools.r8.graph.b0$w:
     com.android.tools.r8.graph.IndexedDexItem value -> b
     1:1:void <init>(com.android.tools.r8.graph.IndexedDexItem,com.android.tools.r8.graph.DexValue$1):1131:1131 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.IndexedDexItem):1135:1136 -> <init>
@@ -20911,7 +20947,7 @@
     com.android.tools.r8.utils.structural.StructuralItem self() -> k
     1:1:java.lang.Object asAsmEncodedObject():1170:1170 -> t
     1:1:java.lang.String toString():1197:1197 -> toString
-com.android.tools.r8.graph.DexValue$SimpleDexValue -> com.android.tools.r8.graph.c0$x:
+com.android.tools.r8.graph.DexValue$SimpleDexValue -> com.android.tools.r8.graph.b0$x:
     1:1:void <init>():428:428 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexValue$1):428:428 -> <init>
     1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):428:428 -> a
@@ -20925,75 +20961,65 @@
     5:5:void writeIntegerTo(com.android.tools.r8.graph.DexValue$DexValueKind,long,int,com.android.tools.r8.dex.DexOutputBuffer):445 -> a
     6:6:void writeIntegerTo(com.android.tools.r8.graph.DexValue$DexValueKind,long,int,com.android.tools.r8.dex.DexOutputBuffer):446:446 -> a
     com.android.tools.r8.utils.structural.StructuralItem self() -> k
-com.android.tools.r8.graph.DirectMappedDexApplication -> com.android.tools.r8.graph.d0:
+com.android.tools.r8.graph.DirectMappedDexApplication -> com.android.tools.r8.graph.c0:
     com.android.tools.r8.com.google.common.collect.ImmutableList libraryClasses -> m
     com.android.tools.r8.com.google.common.collect.ImmutableList classpathClasses -> l
     com.android.tools.r8.com.google.common.collect.ImmutableList programClasses -> k
     java.util.Map codeOwners -> i
     java.util.Map allClasses -> j
     boolean $assertionsDisabled -> h
-    1:1:void <clinit>():23:23 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.naming.ClassNameMapper,java.util.Map,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.com.google.common.collect.ImmutableList,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DirectMappedDexApplication$1):23:23 -> <init>
-    2:2:void <init>(com.android.tools.r8.naming.ClassNameMapper,java.util.Map,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.com.google.common.collect.ImmutableList,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.Timing):46:46 -> <init>
-    3:31:void <init>(com.android.tools.r8.naming.ClassNameMapper,java.util.Map,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.com.google.common.collect.ImmutableList,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.Timing):27:55 -> <init>
+    1:1:void <clinit>():22:22 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.naming.ClassNameMapper,java.util.Map,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.com.google.common.collect.ImmutableList,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DirectMappedDexApplication$1):22:22 -> <init>
+    2:2:void <init>(com.android.tools.r8.naming.ClassNameMapper,java.util.Map,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.com.google.common.collect.ImmutableList,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.Timing):45:45 -> <init>
+    3:31:void <init>(com.android.tools.r8.naming.ClassNameMapper,java.util.Map,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.com.google.common.collect.ImmutableList,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.Timing):26:54 -> <init>
     com.android.tools.r8.graph.DirectMappedDexApplication asDirect() -> a
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableList access$100(com.android.tools.r8.graph.DirectMappedDexApplication):23:23 -> a
-    2:3:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):77:78 -> a
-    4:4:boolean verifyWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):113:113 -> a
-    5:5:java.util.List programClasses():68:68 -> a
-    5:5:boolean verifyWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):113 -> a
-    6:16:boolean mappingIsValid(java.util.List,com.android.tools.r8.graph.GraphLens):136:146 -> a
-    6:16:boolean verifyWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):113 -> a
-    17:17:boolean verifyWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):114:114 -> a
-    18:20:boolean verifyNothingToRewrite(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):119:119 -> a
-    28:28:boolean verifyNothingToRewrite(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):127:127 -> a
-    29:31:boolean lambda$verifyNothingToRewrite$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):122:124 -> a
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableList access$100(com.android.tools.r8.graph.DirectMappedDexApplication):22:22 -> a
+    2:3:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):76:77 -> a
+    4:4:boolean verifyWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):112:112 -> a
+    5:5:java.util.List programClasses():63:63 -> a
+    5:5:boolean verifyWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):112 -> a
+    6:16:boolean mappingIsValid(java.util.List,com.android.tools.r8.graph.GraphLens):135:145 -> a
+    6:16:boolean verifyWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):112 -> a
+    17:17:boolean verifyWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):113:113 -> a
+    18:20:boolean verifyNothingToRewrite(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):118:118 -> a
+    28:28:boolean verifyNothingToRewrite(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):126:126 -> a
+    29:31:boolean lambda$verifyNothingToRewrite$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):121:123 -> a
     32:32:boolean com.android.tools.r8.graph.classmerging.VerticallyMergedClasses.hasBeenMergedIntoDifferentType(com.android.tools.r8.graph.DexType):66:66 -> a
     32:32:boolean com.android.tools.r8.graph.classmerging.MergedClasses.hasBeenMergedIntoDifferentType(com.android.tools.r8.graph.classmerging.MergedClasses,com.android.tools.r8.graph.DexType):39 -> a
-    32:32:boolean lambda$verifyNothingToRewrite$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):123 -> a
-    33:33:boolean lambda$verifyNothingToRewrite$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):126:126 -> a
+    32:32:boolean lambda$verifyNothingToRewrite$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):122 -> a
+    33:33:boolean lambda$verifyNothingToRewrite$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):125:125 -> a
     34:34:boolean com.android.tools.r8.graph.classmerging.MergedClasses.hasBeenMergedIntoDifferentType(com.android.tools.r8.graph.classmerging.MergedClasses,com.android.tools.r8.graph.DexType):39:39 -> a
-    34:34:boolean lambda$verifyNothingToRewrite$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):125 -> a
-    35:37:void addAll(java.util.Map,java.lang.Iterable):291:293 -> a
-    35:37:void access$300(java.util.Map,java.lang.Iterable):23 -> a
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableList access$200(com.android.tools.r8.graph.DirectMappedDexApplication):23:23 -> b
-    2:2:com.android.tools.r8.graph.DexApplication$Builder builder():23:23 -> b
-    3:3:com.android.tools.r8.graph.DexProgramClass programDefinitionFor(com.android.tools.r8.graph.DexType):84:84 -> b
-    1:1:java.util.List programClasses():68:68 -> f
+    34:34:boolean lambda$verifyNothingToRewrite$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):124 -> a
+    35:37:void addAll(java.util.Map,java.lang.Iterable):258:260 -> a
+    35:37:void access$300(java.util.Map,java.lang.Iterable):22 -> a
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableList access$200(com.android.tools.r8.graph.DirectMappedDexApplication):22:22 -> b
+    2:2:com.android.tools.r8.graph.DexApplication$Builder builder():22:22 -> b
+    3:3:com.android.tools.r8.graph.DexProgramClass programDefinitionFor(com.android.tools.r8.graph.DexType):83:83 -> b
+    1:1:java.util.List programClasses():63:63 -> f
     com.android.tools.r8.graph.DirectMappedDexApplication toDirect() -> g
-    1:1:java.util.Collection allClasses():59:59 -> h
-    1:1:com.android.tools.r8.graph.DirectMappedDexApplication$Builder builder():89:89 -> i
-    1:1:java.util.List classpathClasses():63:63 -> j
-    1:1:java.util.List libraryClasses():72:72 -> k
-    1:4:boolean verifyCodeObjectsOwners():165:168 -> l
-    5:5:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods(java.util.function.Predicate):184:184 -> l
-    5:5:boolean verifyCodeObjectsOwners():168 -> l
-    6:14:boolean verifyCodeObjectsOwners():168:176 -> l
-com.android.tools.r8.graph.DirectMappedDexApplication$1 -> com.android.tools.r8.graph.d0$a:
-com.android.tools.r8.graph.DirectMappedDexApplication$Builder -> com.android.tools.r8.graph.d0$b:
-    boolean $assertionsDisabled -> i
+    1:1:java.util.Collection allClasses():58:58 -> h
+    1:1:com.android.tools.r8.graph.DirectMappedDexApplication$Builder builder():88:88 -> i
+    1:1:java.util.Collection classpathClasses():71:71 -> j
+    1:1:java.util.Collection libraryClasses():67:67 -> k
+    1:4:boolean verifyCodeObjectsOwners():164:167 -> l
+    5:5:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods(java.util.function.Predicate):175:175 -> l
+    5:5:boolean verifyCodeObjectsOwners():167 -> l
+    6:14:boolean verifyCodeObjectsOwners():167:175 -> l
+com.android.tools.r8.graph.DirectMappedDexApplication$1 -> com.android.tools.r8.graph.c0$a:
+com.android.tools.r8.graph.DirectMappedDexApplication$Builder -> com.android.tools.r8.graph.c0$b:
     com.android.tools.r8.com.google.common.collect.ImmutableList classpathClasses -> j
-    com.android.tools.r8.com.google.common.collect.ImmutableList libraryClasses -> k
-    java.util.List pendingClasspathClasses -> l
-    1:1:void <clinit>():182:182 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DirectMappedDexApplication$1):182:182 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.LazyLoadedDexApplication):190:190 -> <init>
-    3:12:void <init>(com.android.tools.r8.graph.LazyLoadedDexApplication):187:196 -> <init>
-    13:13:void <init>(com.android.tools.r8.graph.DirectMappedDexApplication):200:200 -> <init>
-    14:29:void <init>(com.android.tools.r8.graph.DirectMappedDexApplication):187:202 -> <init>
-    com.android.tools.r8.graph.DirectMappedDexApplication$Builder asDirect() -> a
-    1:1:com.android.tools.r8.graph.DirectMappedDexApplication$Builder addClasspathClass(com.android.tools.r8.graph.DexClasspathClass):221:221 -> a
-    1:1:com.android.tools.r8.graph.DexApplication build():182:182 -> b
-    1:1:com.android.tools.r8.graph.DirectMappedDexApplication$Builder addClasspathClasses(java.util.Collection):226:226 -> c
-    1:1:com.android.tools.r8.graph.DirectMappedDexApplication$Builder addLibraryClasses(java.util.Collection):260:260 -> d
-    com.android.tools.r8.graph.DexApplication$Builder self() -> e
-    1:3:com.android.tools.r8.graph.DirectMappedDexApplication$Builder replaceClasspathClasses(java.util.Collection):247:249 -> e
-    1:1:com.android.tools.r8.graph.DirectMappedDexApplication$Builder replaceLibraryClasses(java.util.Collection):254:254 -> f
-    2:16:com.android.tools.r8.graph.DirectMappedDexApplication build():268:282 -> f
-    1:7:void commitPendingClasspathClasses():231:237 -> g
-    1:7:java.util.List getClasspathClasses():242 -> g
-    8:8:java.util.List getClasspathClasses():243:243 -> g
-com.android.tools.r8.graph.EnclosingMethodAttribute -> com.android.tools.r8.internal.Ra:
+    com.android.tools.r8.com.google.common.collect.ImmutableList libraryClasses -> i
+    1:1:void <init>(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DirectMappedDexApplication$1):181:181 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.LazyLoadedDexApplication):187:192 -> <init>
+    8:10:void <init>(com.android.tools.r8.graph.DirectMappedDexApplication):196:198 -> <init>
+    1:1:com.android.tools.r8.graph.DexApplication build():181:181 -> a
+    2:5:com.android.tools.r8.graph.DirectMappedDexApplication$Builder addClasspathClasses(java.util.Collection):218:221 -> a
+    1:1:com.android.tools.r8.graph.DirectMappedDexApplication$Builder addLibraryClasses(java.util.Collection):227:227 -> b
+    1:1:com.android.tools.r8.graph.DirectMappedDexApplication$Builder replaceClasspathClasses(java.util.Collection):212:212 -> c
+    com.android.tools.r8.graph.DexApplication$Builder self() -> d
+    1:1:com.android.tools.r8.graph.DirectMappedDexApplication$Builder replaceLibraryClasses(java.util.Collection):207:207 -> d
+    1:15:com.android.tools.r8.graph.DirectMappedDexApplication build():235:249 -> e
+com.android.tools.r8.graph.EnclosingMethodAttribute -> com.android.tools.r8.internal.ma:
     com.android.tools.r8.graph.DexType enclosingClass -> c
     com.android.tools.r8.graph.DexMethod enclosingMethod -> d
     boolean $assertionsDisabled -> a
@@ -21009,47 +21035,46 @@
     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.FieldAccessFlags -> com.android.tools.r8.graph.e0:
+com.android.tools.r8.graph.FieldAccessFlags -> com.android.tools.r8.graph.d0:
     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:com.android.tools.r8.graph.FieldAccessFlags copy():53:53 -> J
+    1:1:int com.android.tools.r8.graph.AccessFlags.materialize():74:74 -> J
+    1:1:int getAsCfAccessFlags():76 -> J
     1:1:int com.android.tools.r8.graph.AccessFlags.materialize():74:74 -> K
-    1:1:int getAsCfAccessFlags():81 -> K
-    1:1:int com.android.tools.r8.graph.AccessFlags.materialize():74:74 -> L
-    1:1:int getAsDexAccessFlags():86 -> L
+    1:1:int getAsDexAccessFlags():81 -> K
+    1:1:boolean com.android.tools.r8.graph.AccessFlags.isSet(int):255:255 -> L
+    1:1:boolean isEnum():101 -> L
     1:1:boolean com.android.tools.r8.graph.AccessFlags.isSet(int):255:255 -> M
-    1:1:boolean isEnum():106 -> M
+    1:1:boolean isTransient():93 -> M
     1:1:boolean com.android.tools.r8.graph.AccessFlags.isSet(int):255:255 -> N
-    1:1:boolean isTransient():98 -> N
-    1:1:boolean com.android.tools.r8.graph.AccessFlags.isSet(int):255:255 -> O
-    1:1:boolean isVolatile():90 -> O
+    1:1:boolean isVolatile():85 -> N
     1:6:java.util.List getNames():21:26 -> c
-    1:6:java.util.List getPredicates():31:36 -> e
-    1:1:com.android.tools.r8.graph.FieldAccessFlags fromCfAccessFlags(int):76:76 -> j
+    1:6:java.util.List getPredicates():31:36 -> f
+    1:1:com.android.tools.r8.graph.FieldAccessFlags fromCfAccessFlags(int):71:71 -> j
     2:2:void <init>(int):40:40 -> j
-    2:2:com.android.tools.r8.graph.FieldAccessFlags fromCfAccessFlags(int):76 -> j
+    2:2:com.android.tools.r8.graph.FieldAccessFlags fromCfAccessFlags(int):71 -> j
     com.android.tools.r8.utils.structural.StructuralItem self() -> k
-    1:1:com.android.tools.r8.graph.FieldAccessFlags fromDexAccessFlags(int):72:72 -> k
+    1:1:com.android.tools.r8.graph.FieldAccessFlags fromDexAccessFlags(int):67:67 -> k
     2:2:void <init>(int):40:40 -> k
-    2:2:com.android.tools.r8.graph.FieldAccessFlags fromDexAccessFlags(int):72 -> k
-    1:2:com.android.tools.r8.graph.FieldAccessFlags fromSharedAccessFlags(int):67:68 -> l
+    2:2:com.android.tools.r8.graph.FieldAccessFlags fromDexAccessFlags(int):67 -> k
+    1:2:com.android.tools.r8.graph.FieldAccessFlags fromSharedAccessFlags(int):62:63 -> l
     3:3:void <init>(int):40:40 -> l
-    3:3:com.android.tools.r8.graph.FieldAccessFlags fromSharedAccessFlags(int):68 -> l
+    3:3:com.android.tools.r8.graph.FieldAccessFlags fromSharedAccessFlags(int):63 -> l
     com.android.tools.r8.graph.AccessFlags self() -> w
-com.android.tools.r8.graph.FieldAccessFlags$Builder -> com.android.tools.r8.graph.e0$a:
-    1:1:void <init>():116:116 -> <init>
+com.android.tools.r8.graph.FieldAccessFlags$Builder -> com.android.tools.r8.graph.d0$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():361:361 -> 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():351:351 -> d
     1:1:com.android.tools.r8.graph.AccessFlags$BuilderBase setStatic():0 -> d
-    1:1:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.AccessFlags$BuilderBase.setSynthetic():356:356 -> e
-    1:1:com.android.tools.r8.graph.AccessFlags$BuilderBase setSynthetic():0 -> e
-com.android.tools.r8.graph.FieldAccessInfo -> com.android.tools.r8.internal.Sb:
-com.android.tools.r8.graph.FieldAccessInfoCollection -> com.android.tools.r8.internal.Tb:
-com.android.tools.r8.graph.FieldAccessInfoCollectionImpl -> com.android.tools.r8.internal.Ub:
+    1:2:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.AccessFlags$BuilderBase.setSynthetic():356:357 -> e
+    1:2:com.android.tools.r8.graph.AccessFlags$BuilderBase setSynthetic():0 -> e
+com.android.tools.r8.graph.FieldAccessInfo -> com.android.tools.r8.internal.lb:
+com.android.tools.r8.graph.FieldAccessInfoCollection -> com.android.tools.r8.internal.mb:
+com.android.tools.r8.graph.FieldAccessInfoCollectionImpl -> com.android.tools.r8.internal.nb:
     java.util.Map infos -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():15:15 -> <clinit>
@@ -21078,7 +21103,7 @@
     2:2:com.android.tools.r8.graph.FieldAccessInfo get(com.android.tools.r8.graph.DexField):15 -> b
     1:1:com.android.tools.r8.graph.FieldAccessInfoImpl get(com.android.tools.r8.graph.DexField):50:50 -> c
     2:2:boolean verifyMappingIsOneToOne():95:95 -> c
-com.android.tools.r8.graph.FieldAccessInfoImpl -> com.android.tools.r8.internal.Vb:
+com.android.tools.r8.graph.FieldAccessInfoImpl -> com.android.tools.r8.internal.ob:
     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
@@ -21088,37 +21113,36 @@
     1:1:void <init>(com.android.tools.r8.graph.DexField):46:46 -> <init>
     2:9:void <init>(com.android.tools.r8.graph.DexField):40:47 -> <init>
     1:1:void setReadsWithContexts(com.android.tools.r8.graph.AbstractAccessContexts):79:79 -> a
-    2:4:void forEachIndirectAccess(java.util.function.Consumer):112:114 -> a
-    5:5:void forEachIndirectAccess(java.util.function.Consumer,com.android.tools.r8.graph.AbstractAccessContexts,java.util.Set):121:121 -> a
+    2:4:void forEachIndirectAccess(java.util.function.Consumer):108:110 -> a
+    5:5:void forEachIndirectAccess(java.util.function.Consumer,com.android.tools.r8.graph.AbstractAccessContexts,java.util.Set):117:117 -> a
     6:6:boolean com.android.tools.r8.graph.AbstractAccessContexts.isBottom():0:0 -> a
-    6:6:void forEachIndirectAccess(java.util.function.Consumer,com.android.tools.r8.graph.AbstractAccessContexts,java.util.Set):121 -> a
+    6:6:void forEachIndirectAccess(java.util.function.Consumer,com.android.tools.r8.graph.AbstractAccessContexts,java.util.Set):117 -> a
     7:7:boolean com.android.tools.r8.graph.AbstractAccessContexts.isConcrete():0:0 -> a
-    7:7:void forEachIndirectAccess(java.util.function.Consumer,com.android.tools.r8.graph.AbstractAccessContexts,java.util.Set):124 -> a
-    8:12:void forEachIndirectAccess(java.util.function.Consumer,com.android.tools.r8.graph.AbstractAccessContexts,java.util.Set):126:130 -> a
-    13:13:boolean lambda$forEachIndirectAccess$0(java.util.Set,com.android.tools.r8.graph.DexField):127:127 -> a
-    14:14:boolean isWrittenInMethodSatisfying(java.util.function.Predicate):233:233 -> a
-    15:15:boolean isWrittenOutside(com.android.tools.r8.graph.DexEncodedMethod):250:250 -> a
-    16:16:boolean recordRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):254:254 -> a
+    7:7:void forEachIndirectAccess(java.util.function.Consumer,com.android.tools.r8.graph.AbstractAccessContexts,java.util.Set):120 -> a
+    8:12:void forEachIndirectAccess(java.util.function.Consumer,com.android.tools.r8.graph.AbstractAccessContexts,java.util.Set):122:126 -> a
+    13:13:boolean lambda$forEachIndirectAccess$0(java.util.Set,com.android.tools.r8.graph.DexField):123:123 -> a
+    14:14:boolean isWrittenInMethodSatisfying(java.util.function.Predicate):229:229 -> a
+    15:15:boolean isWrittenOutside(com.android.tools.r8.graph.DexEncodedMethod):246:246 -> a
+    16:16:boolean recordRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):250:250 -> a
     17:17:boolean com.android.tools.r8.graph.AbstractAccessContexts.isBottom():0:0 -> a
-    17:17:boolean recordRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):254 -> a
-    18:20:boolean recordRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):255:257 -> a
+    17:17:boolean recordRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):250 -> a
+    18:20:boolean recordRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):251:253 -> a
     21:21:boolean com.android.tools.r8.graph.AbstractAccessContexts.isConcrete():0:0 -> a
-    21:21:boolean recordRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):257 -> a
-    22:22:boolean recordRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):258:258 -> a
-    23:23:void clearReads():274:274 -> a
-    24:27:com.android.tools.r8.graph.FieldAccessInfoImpl rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):282:285 -> a
-    28:31:com.android.tools.r8.graph.FieldAccessInfoImpl join(com.android.tools.r8.graph.FieldAccessInfoImpl):290:293 -> a
-    1:1:void setWritesWithContexts(com.android.tools.r8.graph.AbstractAccessContexts):83:83 -> b
-    2:2:void forEachWriteContext(java.util.function.Consumer):177:177 -> b
-    3:3:boolean isWrittenOnlyInMethodSatisfying(java.util.function.Predicate):242:242 -> b
-    4:4:boolean recordWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):264:264 -> b
-    5:5:boolean com.android.tools.r8.graph.AbstractAccessContexts.isBottom():0:0 -> b
-    5:5:boolean recordWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):264 -> b
-    6:8:boolean recordWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):265:267 -> b
-    9:9:boolean com.android.tools.r8.graph.AbstractAccessContexts.isConcrete():0:0 -> b
-    9:9:boolean recordWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):267 -> b
-    10:10:boolean recordWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):268:268 -> b
-    11:11:void clearWrites():278:278 -> b
+    21:21:boolean recordRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):253 -> a
+    22:22:boolean recordRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):254:254 -> a
+    23:23:void clearReads():270:270 -> a
+    24:27:com.android.tools.r8.graph.FieldAccessInfoImpl rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):278:281 -> a
+    28:31:com.android.tools.r8.graph.FieldAccessInfoImpl join(com.android.tools.r8.graph.FieldAccessInfoImpl):286:289 -> a
+    1:1:void forEachWriteContext(java.util.function.Consumer):173:173 -> b
+    2:2:boolean isWrittenOnlyInMethodSatisfying(java.util.function.Predicate):238:238 -> b
+    3:3:boolean recordWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):260:260 -> b
+    4:4:boolean com.android.tools.r8.graph.AbstractAccessContexts.isBottom():0:0 -> b
+    4:4:boolean recordWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):260 -> b
+    5:7:boolean recordWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):261:263 -> b
+    8:8:boolean com.android.tools.r8.graph.AbstractAccessContexts.isConcrete():0:0 -> b
+    8:8:boolean recordWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):263 -> b
+    9:9:boolean recordWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):264:264 -> b
+    10:10:void clearWrites():274:274 -> b
     1:2:void destroyAccessContexts():51:52 -> c
     1:1:void flattenAccessContexts():56:56 -> d
     2:2:void com.android.tools.r8.graph.FieldAccessInfoImpl.flattenAccessContexts(com.android.tools.r8.graph.AbstractAccessContexts):61:61 -> d
@@ -21127,28 +21151,27 @@
     4:4:void com.android.tools.r8.graph.FieldAccessInfoImpl.flattenAccessContexts(com.android.tools.r8.graph.AbstractAccessContexts):61:61 -> d
     4:4:void flattenAccessContexts():57 -> d
     1:1:com.android.tools.r8.graph.DexField getField():71:71 -> e
-    1:1:int getNumberOfWriteContexts():93:93 -> f
+    1:1:int getNumberOfWriteContexts():89:89 -> f
     1:1:com.android.tools.r8.graph.AbstractAccessContexts getReadsWithContexts():75:75 -> g
-    1:1:com.android.tools.r8.graph.ProgramMethod getUniqueReadContext():98:98 -> h
+    1:1:com.android.tools.r8.graph.ProgramMethod getUniqueReadContext():94:94 -> h
     2:2:boolean com.android.tools.r8.graph.AbstractAccessContexts.isConcrete():0:0 -> h
-    2:2:com.android.tools.r8.graph.ProgramMethod getUniqueReadContext():98 -> h
-    3:3:com.android.tools.r8.graph.ProgramMethod getUniqueReadContext():99:99 -> h
-    1:1:boolean hasKnownWriteContexts():105:105 -> i
+    2:2:com.android.tools.r8.graph.ProgramMethod getUniqueReadContext():94 -> h
+    3:3:com.android.tools.r8.graph.ProgramMethod getUniqueReadContext():95:95 -> h
+    1:1:boolean hasKnownWriteContexts():101:101 -> i
     2:2:boolean com.android.tools.r8.graph.AbstractAccessContexts.isTop():0:0 -> i
-    2:2:boolean hasKnownWriteContexts():105 -> i
-    1:1:boolean hasReflectiveAccess():182:182 -> j
-    1:1:boolean isRead():192:192 -> k
-    2:2:boolean com.android.tools.r8.graph.FieldAccessInfoImpl.isReadFromAnnotation():197:197 -> k
-    2:2:boolean isRead():192 -> k
-    1:1:boolean isReadFromAnnotation():197:197 -> l
-    1:1:boolean isReadFromMethodHandle():206:206 -> m
-    1:1:boolean isWritten():216:216 -> n
-    1:1:boolean isWrittenFromMethodHandle():221:221 -> o
-    1:1:void setHasReflectiveAccess():186:186 -> p
-    1:1:void setReadFromAnnotation():201:201 -> q
-    1:1:void setReadFromMethodHandle():210:210 -> r
-    1:1:void setWrittenFromMethodHandle():225:225 -> s
-com.android.tools.r8.graph.FieldResolutionResult -> com.android.tools.r8.graph.f0:
+    2:2:boolean hasKnownWriteContexts():101 -> i
+    1:1:boolean hasReflectiveAccess():178:178 -> j
+    1:1:boolean isRead():188:188 -> k
+    2:2:boolean com.android.tools.r8.graph.FieldAccessInfoImpl.isReadFromAnnotation():193:193 -> k
+    2:2:boolean isRead():188 -> k
+    1:1:boolean isReadFromMethodHandle():202:202 -> l
+    1:1:boolean isWritten():212:212 -> m
+    1:1:boolean isWrittenFromMethodHandle():217:217 -> n
+    1:1:void setHasReflectiveAccess():182:182 -> o
+    1:1:void setReadFromAnnotation():197:197 -> p
+    1:1:void setReadFromMethodHandle():206:206 -> q
+    1:1:void setWrittenFromMethodHandle():221:221 -> r
+com.android.tools.r8.graph.FieldResolutionResult -> com.android.tools.r8.graph.e0:
     1:1:void <init>():9:9 -> <init>
     com.android.tools.r8.graph.DexClass getInitialResolutionHolder() -> a
     1:1:com.android.tools.r8.graph.SuccessfulMemberResolutionResult asSuccessfulMemberResolutionResult():9:9 -> d
@@ -21158,14 +21181,14 @@
     com.android.tools.r8.graph.DexField getResolvedFieldReference() -> h
     boolean isFailedOrUnknownResolution() -> i
     boolean isSuccessfulResolution() -> j
-com.android.tools.r8.graph.FieldResolutionResult$FailedFieldResolutionResult -> com.android.tools.r8.graph.f0$a:
+com.android.tools.r8.graph.FieldResolutionResult$FailedFieldResolutionResult -> com.android.tools.r8.graph.e0$a:
     com.android.tools.r8.graph.FieldResolutionResult$FailedFieldResolutionResult INSTANCE -> a
     1:1:void <clinit>():128:128 -> <clinit>
     1:1:void <init>():126:126 -> <init>
     1:1:com.android.tools.r8.utils.OptionalBool isAccessibleFrom(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy):133:133 -> a
     com.android.tools.r8.graph.SuccessfulMemberResolutionResult asSuccessfulMemberResolutionResult() -> d
     1:1:com.android.tools.r8.graph.FieldResolutionResult$FailedFieldResolutionResult access$000():126:126 -> k
-com.android.tools.r8.graph.FieldResolutionResult$SuccessfulFieldResolutionResult -> com.android.tools.r8.graph.f0$b:
+com.android.tools.r8.graph.FieldResolutionResult$SuccessfulFieldResolutionResult -> com.android.tools.r8.graph.e0$b:
     com.android.tools.r8.graph.DexClass initialResolutionHolder -> b
     boolean $assertionsDisabled -> a
     com.android.tools.r8.graph.DexClass resolvedHolder -> c
@@ -21188,11 +21211,11 @@
     com.android.tools.r8.graph.FieldResolutionResult$SuccessfulFieldResolutionResult asSuccessfulResolution() -> f
     1:1:com.android.tools.r8.graph.DexEncodedField getResolvedField():81:81 -> g
     1:1:com.android.tools.r8.graph.DexField getResolvedFieldReference():86:86 -> h
-    2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():164:164 -> h
+    2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():158:158 -> h
     2:2:com.android.tools.r8.graph.DexField getResolvedFieldReference():86 -> h
     boolean isSuccessfulResolution() -> j
     1:1:com.android.tools.r8.graph.DexClassAndField getResolutionPair():96:96 -> k
-com.android.tools.r8.graph.FieldResolutionResult$UnknownFieldResolutionResult -> com.android.tools.r8.graph.f0$c:
+com.android.tools.r8.graph.FieldResolutionResult$UnknownFieldResolutionResult -> com.android.tools.r8.graph.e0$c:
     com.android.tools.r8.graph.FieldResolutionResult$UnknownFieldResolutionResult INSTANCE -> a
     1:1:void <clinit>():148:148 -> <clinit>
     1:1:void <init>():146:146 -> <init>
@@ -21200,7 +21223,7 @@
     com.android.tools.r8.graph.SuccessfulMemberResolutionResult asSuccessfulMemberResolutionResult() -> d
     boolean isFailedOrUnknownResolution() -> i
     1:1:com.android.tools.r8.graph.FieldResolutionResult$UnknownFieldResolutionResult access$100():146:146 -> k
-com.android.tools.r8.graph.FinalInitClassLens -> com.android.tools.r8.internal.xc:
+com.android.tools.r8.graph.FinalInitClassLens -> com.android.tools.r8.internal.Qb:
     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
@@ -21208,7 +21231,7 @@
     2:8:com.android.tools.r8.graph.InitClassLens rewrittenWithLens(com.android.tools.r8.graph.GraphLens):35:41 -> a
     9:13:com.android.tools.r8.graph.DexField getInitClassField(com.android.tools.r8.graph.DexType):20:24 -> a
     14:16:void lambda$rewrittenWithLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):37:39 -> a
-com.android.tools.r8.graph.GenericSignature -> com.android.tools.r8.graph.g0:
+com.android.tools.r8.graph.GenericSignature -> com.android.tools.r8.graph.f0:
     java.util.List EMPTY_TYPE_ARGUMENTS -> b
     java.util.List EMPTY_TYPE_PARAMS -> a
     com.android.tools.r8.graph.GenericSignature$ClassTypeSignature NO_FIELD_TYPE_SIGNATURE -> e
@@ -21225,8 +21248,8 @@
     1:9:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature parseMethodSignature(java.lang.String,java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):723:731 -> c
     10:12:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature parseMethodSignature(java.lang.String,java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):730:732 -> c
     13:13:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature parseMethodSignature(java.lang.String,java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):724:724 -> c
-com.android.tools.r8.graph.GenericSignature$1 -> com.android.tools.r8.graph.g0$a:
-com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature -> com.android.tools.r8.graph.g0$b:
+com.android.tools.r8.graph.GenericSignature$1 -> com.android.tools.r8.graph.f0$a:
+com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature -> com.android.tools.r8.graph.f0$b:
     com.android.tools.r8.graph.GenericSignature$TypeSignature elementSignature -> c
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():462:462 -> <clinit>
@@ -21239,14 +21262,14 @@
     2:2:com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature toArrayTypeSignature():498 -> f
     com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature asArrayTypeSignature() -> g
     boolean isArrayTypeSignature() -> l
-com.android.tools.r8.graph.GenericSignature$BaseTypeSignature -> com.android.tools.r8.graph.g0$c:
+com.android.tools.r8.graph.GenericSignature$BaseTypeSignature -> com.android.tools.r8.graph.f0$c:
     com.android.tools.r8.graph.DexType type -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():547:547 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.DexType):550:553 -> <init>
     com.android.tools.r8.graph.GenericSignature$BaseTypeSignature asBaseTypeSignature() -> c
     1:2:com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature toArrayTypeSignature():568:569 -> f
-com.android.tools.r8.graph.GenericSignature$ClassSignature -> com.android.tools.r8.graph.g0$d:
+com.android.tools.r8.graph.GenericSignature$ClassSignature -> com.android.tools.r8.graph.f0$d:
     com.android.tools.r8.graph.GenericSignature$ClassSignature NO_CLASS_SIGNATURE -> a
     com.android.tools.r8.graph.GenericSignature$ClassTypeSignature superClassSignature -> d
     java.util.List superInterfaceSignatures -> e
@@ -21261,7 +21284,7 @@
     1:1:com.android.tools.r8.graph.GenericSignature$ClassSignature noSignature():243:243 -> d
     1:1:java.util.List superInterfaceSignatures():201:201 -> e
     1:1:java.lang.String toString():239:239 -> toString
-com.android.tools.r8.graph.GenericSignature$ClassTypeSignature -> com.android.tools.r8.graph.g0$e:
+com.android.tools.r8.graph.GenericSignature$ClassTypeSignature -> com.android.tools.r8.graph.f0$e:
     com.android.tools.r8.graph.GenericSignature$ClassTypeSignature enclosingTypeSignature -> e
     com.android.tools.r8.graph.GenericSignature$ClassTypeSignature innerTypeSignature -> f
     java.util.List typeArguments -> d
@@ -21281,10 +21304,10 @@
     1:1:boolean isNoSignature():440:440 -> q
     1:1:com.android.tools.r8.graph.DexType type():413:413 -> r
     1:1:java.util.List typeArguments():417:417 -> s
-com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature -> com.android.tools.r8.graph.g0$f:
+com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature -> com.android.tools.r8.graph.f0$f:
     1:1:boolean hasNoSignature():135:135 -> a
     boolean hasSignature() -> b
-com.android.tools.r8.graph.GenericSignature$FieldTypeSignature -> com.android.tools.r8.graph.g0$g:
+com.android.tools.r8.graph.GenericSignature$FieldTypeSignature -> com.android.tools.r8.graph.f0$g:
     com.android.tools.r8.graph.GenericSignature$WildcardIndicator wildcardIndicator -> a
     1:1:void <init>(com.android.tools.r8.graph.GenericSignature$WildcardIndicator,com.android.tools.r8.graph.GenericSignature$1):277:277 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.GenericSignature$WildcardIndicator):282:283 -> <init>
@@ -21304,13 +21327,13 @@
     boolean isTypeVariableSignature() -> o
     1:1:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature noSignature():355:355 -> p
     1:1:java.lang.String toString():351:351 -> toString
-com.android.tools.r8.graph.GenericSignature$FormalTypeParameter -> com.android.tools.r8.graph.g0$h:
+com.android.tools.r8.graph.GenericSignature$FormalTypeParameter -> com.android.tools.r8.graph.f0$h:
     java.util.List interfaceBounds -> c
     java.lang.String name -> a
     com.android.tools.r8.graph.GenericSignature$FieldTypeSignature classBound -> b
     1:4:void <init>(java.lang.String,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,java.util.List):146:149 -> <init>
     1:6:void visit(com.android.tools.r8.graph.GenericSignatureVisitor):165:170 -> a
-com.android.tools.r8.graph.GenericSignature$MethodTypeSignature -> com.android.tools.r8.graph.g0$i:
+com.android.tools.r8.graph.GenericSignature$MethodTypeSignature -> com.android.tools.r8.graph.f0$i:
     java.util.List throwsSignatures -> f
     java.util.List typeSignatures -> d
     java.util.List formalTypeParameters -> c
@@ -21327,7 +21350,7 @@
     1:1:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature noSignature():604:604 -> d
     1:1:com.android.tools.r8.graph.GenericSignature$ReturnType returnType():630:630 -> e
     1:1:java.lang.String toString():675:675 -> toString
-com.android.tools.r8.graph.GenericSignature$Parser -> com.android.tools.r8.graph.g0$j:
+com.android.tools.r8.graph.GenericSignature$Parser -> com.android.tools.r8.graph.f0$j:
     char[] buffer -> e
     com.android.tools.r8.graph.DexItemFactory factory -> g
     int pos -> f
@@ -21382,26 +21405,26 @@
     1:16:com.android.tools.r8.graph.GenericSignature$TypeSignature updateTypeSignature():1009:1024 -> j
     17:19:com.android.tools.r8.graph.GenericSignature$TypeSignature updateTypeSignature():1018:1020 -> j
     1:7:com.android.tools.r8.graph.GenericSignature$TypeVariableSignature updateTypeVariableSignature():999:1005 -> k
-com.android.tools.r8.graph.GenericSignature$ReturnType -> com.android.tools.r8.graph.g0$k:
+com.android.tools.r8.graph.GenericSignature$ReturnType -> com.android.tools.r8.graph.f0$k:
     com.android.tools.r8.graph.GenericSignature$ReturnType VOID -> a
     com.android.tools.r8.graph.GenericSignature$TypeSignature typeSignature -> b
     1:1:void <clinit>():574:574 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.GenericSignature$TypeSignature):579:580 -> <init>
     1:1:boolean isVoidDescriptor():584:584 -> a
     1:1:com.android.tools.r8.graph.GenericSignature$TypeSignature typeSignature():588:588 -> b
-com.android.tools.r8.graph.GenericSignature$StarFieldTypeSignature -> com.android.tools.r8.graph.g0$l:
+com.android.tools.r8.graph.GenericSignature$StarFieldTypeSignature -> com.android.tools.r8.graph.f0$l:
     com.android.tools.r8.graph.GenericSignature$StarFieldTypeSignature STAR_FIELD_TYPE_SIGNATURE -> b
     1:1:void <clinit>():361:361 -> <clinit>
     1:1:void <init>():364:364 -> <init>
     1:1:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature asArgument(com.android.tools.r8.graph.GenericSignature$WildcardIndicator):369:369 -> a
     boolean isStar() -> n
-com.android.tools.r8.graph.GenericSignature$TypeSignature -> com.android.tools.r8.graph.g0$m:
+com.android.tools.r8.graph.GenericSignature$TypeSignature -> com.android.tools.r8.graph.f0$m:
     1:1:void <init>():247:247 -> <init>
     com.android.tools.r8.graph.GenericSignature$BaseTypeSignature asBaseTypeSignature() -> c
     com.android.tools.r8.graph.GenericSignature$FieldTypeSignature asFieldTypeSignature() -> d
     boolean isFieldTypeSignature() -> e
     com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature toArrayTypeSignature() -> f
-com.android.tools.r8.graph.GenericSignature$TypeVariableSignature -> com.android.tools.r8.graph.g0$n:
+com.android.tools.r8.graph.GenericSignature$TypeVariableSignature -> com.android.tools.r8.graph.f0$n:
     java.lang.String typeVariable -> c
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():506:506 -> <clinit>
@@ -21412,14 +21435,14 @@
     1:1:com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature toArrayTypeSignature():538:538 -> f
     com.android.tools.r8.graph.GenericSignature$TypeVariableSignature asTypeVariableSignature() -> i
     boolean isTypeVariableSignature() -> o
-com.android.tools.r8.graph.GenericSignature$WildcardIndicator -> com.android.tools.r8.graph.g0$o:
+com.android.tools.r8.graph.GenericSignature$WildcardIndicator -> com.android.tools.r8.graph.f0$o:
     com.android.tools.r8.graph.GenericSignature$WildcardIndicator NEGATIVE -> c
     com.android.tools.r8.graph.GenericSignature$WildcardIndicator NONE -> b
     com.android.tools.r8.graph.GenericSignature$WildcardIndicator NOT_AN_ARGUMENT -> a
     com.android.tools.r8.graph.GenericSignature$WildcardIndicator POSITIVE -> d
     1:4:void <clinit>():271:274 -> <clinit>
     1:1:void <init>(java.lang.String,int):270:270 -> <init>
-com.android.tools.r8.graph.GenericSignatureDiagnostic -> com.android.tools.r8.graph.h0:
+com.android.tools.r8.graph.GenericSignatureDiagnostic -> com.android.tools.r8.graph.g0:
     com.android.tools.r8.origin.Origin origin -> a
     com.android.tools.r8.position.Position position -> b
     java.lang.String message -> c
@@ -21431,7 +21454,7 @@
     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.graph.GenericSignatureEnqueuerAnalysis -> com.android.tools.r8.graph.k0:
+com.android.tools.r8.graph.GenericSignatureEnqueuerAnalysis -> com.android.tools.r8.graph.j0:
     com.android.tools.r8.shaking.Enqueuer$EnqueuerDefinitionSupplier enqueuerDefinitionSupplier -> a
     1:2:void <init>(com.android.tools.r8.shaking.Enqueuer$EnqueuerDefinitionSupplier):23:24 -> <init>
     1:2:void processNewlyLiveClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):29:30 -> a
@@ -21441,8 +21464,8 @@
     9:10:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):41:42 -> a
     11:14:void com.android.tools.r8.graph.GenericSignatureEnqueuerAnalysis$GenericSignatureTypeVisitor.visitMethodSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):66:69 -> a
     11:14:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):42 -> a
-com.android.tools.r8.graph.GenericSignatureEnqueuerAnalysis$1 -> com.android.tools.r8.graph.i0:
-com.android.tools.r8.graph.GenericSignatureEnqueuerAnalysis$GenericSignatureTypeVisitor -> com.android.tools.r8.graph.j0:
+com.android.tools.r8.graph.GenericSignatureEnqueuerAnalysis$1 -> com.android.tools.r8.graph.h0:
+com.android.tools.r8.graph.GenericSignatureEnqueuerAnalysis$GenericSignatureTypeVisitor -> com.android.tools.r8.graph.i0:
     com.android.tools.r8.shaking.Enqueuer$EnqueuerDefinitionSupplier enqueuerDefinitionSupplier -> c
     boolean $assertionsDisabled -> a
     com.android.tools.r8.graph.ProgramDefinition context -> b
@@ -21468,7 +21491,7 @@
     2:4:void com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.visit(com.android.tools.r8.graph.GenericSignatureVisitor):455:457 -> d
     2:4:void visitClassTypeSignature(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):93 -> d
     5:5:void visitMethodTypeSignatures(java.util.List):145:145 -> d
-com.android.tools.r8.graph.GenericSignaturePrinter -> com.android.tools.r8.graph.l0:
+com.android.tools.r8.graph.GenericSignaturePrinter -> com.android.tools.r8.graph.k0:
     com.android.tools.r8.naming.NamingLens namingLens -> b
     java.util.function.Predicate isTypeMissing -> c
     boolean $assertionsDisabled -> a
@@ -21498,7 +21521,7 @@
     3:15:void visitTypeArguments(java.util.List):123:135 -> c
     1:3:void visitMethodTypeSignatures(java.util.List):49:51 -> d
     1:1:java.lang.String toString():182:182 -> toString
-com.android.tools.r8.graph.GenericSignatureTypeRewriter -> com.android.tools.r8.graph.m0:
+com.android.tools.r8.graph.GenericSignatureTypeRewriter -> com.android.tools.r8.graph.l0:
     java.util.function.Predicate wasPruned -> b
     java.util.function.Function lookupType -> c
     com.android.tools.r8.graph.DexProgramClass context -> d
@@ -21515,8 +21538,8 @@
     1:1:java.util.function.Function access$1300(com.android.tools.r8.graph.GenericSignatureTypeRewriter):28:28 -> c
     1:1:java.util.function.Predicate access$1400(com.android.tools.r8.graph.GenericSignatureTypeRewriter):28:28 -> d
     1:1:com.android.tools.r8.graph.DexProgramClass access$1500(com.android.tools.r8.graph.GenericSignatureTypeRewriter):28:28 -> e
-com.android.tools.r8.graph.GenericSignatureTypeRewriter$1 -> com.android.tools.r8.graph.m0$a:
-com.android.tools.r8.graph.GenericSignatureTypeRewriter$ClassSignatureRewriter -> com.android.tools.r8.graph.m0$b:
+com.android.tools.r8.graph.GenericSignatureTypeRewriter$1 -> com.android.tools.r8.graph.l0$a:
+com.android.tools.r8.graph.GenericSignatureTypeRewriter$ClassSignatureRewriter -> com.android.tools.r8.graph.l0$b:
     java.util.List rewrittenTypeParameters -> a
     com.android.tools.r8.graph.GenericSignature$ClassTypeSignature rewrittenSuperClass -> b
     java.util.List rewrittenSuperInterfaces -> c
@@ -21528,7 +21551,7 @@
     1:2:void visitFormalTypeParameters(java.util.List):94:95 -> b
     3:5:void visitSuperClass(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):101:103 -> b
     1:4:void visitSuperInterface(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):109:112 -> c
-com.android.tools.r8.graph.GenericSignatureTypeRewriter$ClassTypeSignatureRewriter -> com.android.tools.r8.graph.m0$c:
+com.android.tools.r8.graph.GenericSignatureTypeRewriter$ClassTypeSignatureRewriter -> com.android.tools.r8.graph.l0$c:
     com.android.tools.r8.graph.GenericSignature$ClassTypeSignature topClassSignature -> c
     com.android.tools.r8.graph.GenericSignature$ClassTypeSignature parentClassSignature -> d
     com.android.tools.r8.graph.GenericSignatureTypeRewriter this$0 -> e
@@ -21546,7 +21569,7 @@
     10:10:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature access$900(com.android.tools.r8.graph.GenericSignatureTypeRewriter$ClassTypeSignatureRewriter,com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):265 -> a
     11:15:com.android.tools.r8.graph.DexType getTarget(com.android.tools.r8.graph.DexType):332:336 -> a
     1:24:void visitTypeArguments(java.util.List):295:318 -> c
-com.android.tools.r8.graph.GenericSignatureTypeRewriter$FormalTypeParameterRewriter -> com.android.tools.r8.graph.m0$d:
+com.android.tools.r8.graph.GenericSignatureTypeRewriter$FormalTypeParameterRewriter -> com.android.tools.r8.graph.l0$d:
     java.util.List rewrittenInterfaceBounds -> b
     com.android.tools.r8.graph.GenericSignatureTypeRewriter this$0 -> c
     com.android.tools.r8.graph.GenericSignature$FieldTypeSignature rewrittenClassBound -> a
@@ -21556,7 +21579,7 @@
     2:11:com.android.tools.r8.graph.GenericSignature$FormalTypeParameter run(com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):218:227 -> a
     2:11:com.android.tools.r8.graph.GenericSignature$FormalTypeParameter access$700(com.android.tools.r8.graph.GenericSignatureTypeRewriter$FormalTypeParameterRewriter,com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):199 -> a
     1:3:void visitInterfaceBound(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):211:213 -> b
-com.android.tools.r8.graph.GenericSignatureTypeRewriter$MethodTypeSignatureRewriter -> com.android.tools.r8.graph.m0$e:
+com.android.tools.r8.graph.GenericSignatureTypeRewriter$MethodTypeSignatureRewriter -> com.android.tools.r8.graph.l0$e:
     java.util.List rewrittenTypeParameters -> b
     com.android.tools.r8.graph.GenericSignature$ReturnType rewrittenReturnType -> d
     java.util.List rewrittenThrowsSignatures -> e
@@ -21572,7 +21595,7 @@
     17:29:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature access$500(com.android.tools.r8.graph.GenericSignatureTypeRewriter$MethodTypeSignatureRewriter,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):131 -> a
     1:2:void visitFormalTypeParameters(java.util.List):141:142 -> b
     1:3:void visitMethodTypeSignatures(java.util.List):148:150 -> d
-com.android.tools.r8.graph.GenericSignatureTypeRewriter$TypeSignatureRewriter -> com.android.tools.r8.graph.m0$f:
+com.android.tools.r8.graph.GenericSignatureTypeRewriter$TypeSignatureRewriter -> com.android.tools.r8.graph.l0$f:
     com.android.tools.r8.graph.GenericSignatureTypeRewriter this$0 -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():231:231 -> <clinit>
@@ -21585,12 +21608,12 @@
     4:4:com.android.tools.r8.graph.GenericSignature$TypeSignature run(com.android.tools.r8.graph.GenericSignature$TypeSignature):234 -> a
     5:6:com.android.tools.r8.graph.GenericSignature$TypeSignature run(com.android.tools.r8.graph.GenericSignature$TypeSignature):237:238 -> a
     1:20:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature run(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):242:261 -> c
-com.android.tools.r8.graph.GenericSignatureUtils -> com.android.tools.r8.graph.n0:
+com.android.tools.r8.graph.GenericSignatureUtils -> com.android.tools.r8.graph.m0:
     boolean $assertionsDisabled -> a
     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.vd:
+com.android.tools.r8.graph.GenericSignatureVisitor -> com.android.tools.r8.internal.Jc:
     1:1:void visitClassBound(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):36:36 -> a
     2:2:void visitSimpleClass(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):56:56 -> a
     3:3:void visitReturnType(com.android.tools.r8.graph.GenericSignature$ReturnType):60:60 -> a
@@ -21601,11 +21624,11 @@
     1:1:void visitSuperInterface(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):48:48 -> c
     2:2:void visitTypeArguments(java.util.List):72:72 -> c
     1:1:void visitMethodTypeSignatures(java.util.List):64:64 -> d
-com.android.tools.r8.graph.GraphLens -> com.android.tools.r8.graph.o0:
+com.android.tools.r8.graph.GraphLens -> com.android.tools.r8.graph.n0:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():56:56 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.GraphLens$1):56:56 -> <init>
-    2:2:void <init>():301:301 -> <init>
+    1:1:void <clinit>():57:57 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.GraphLens$1):57:57 -> <init>
+    2:2:void <init>():302:302 -> <init>
     com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens asInterfaceProcessorLens() -> a
     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
@@ -21617,356 +21640,362 @@
     com.android.tools.r8.graph.GraphLens$FieldLookupResult lambda$lookupFieldResult$0(com.android.tools.r8.graph.GraphLens$FieldLookupResult) -> a
     com.android.tools.r8.graph.DexMethod lookupGetFieldForMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod) -> a
     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) -> a
-    1:9: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):334:342 -> a
-    1:9:com.android.tools.r8.graph.DexEncodedMethod mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):327 -> a
-    10:10:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):512:512 -> a
-    10:10: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):343 -> a
-    10:10:com.android.tools.r8.graph.DexEncodedMethod mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):327 -> a
-    11:11: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):344:344 -> a
-    11:11:com.android.tools.r8.graph.DexEncodedMethod mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):327 -> a
-    12:12:com.android.tools.r8.graph.ProgramMethod mapProgramMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexDefinitionSupplier):350:350 -> a
-    13:13:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):320:320 -> a
-    13:13:com.android.tools.r8.graph.ProgramMethod mapProgramMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexDefinitionSupplier):350 -> a
-    14:15:com.android.tools.r8.graph.ProgramMethod mapProgramMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexDefinitionSupplier):351:352 -> a
-    16:16:com.android.tools.r8.graph.DexReference lookupReference(com.android.tools.r8.graph.DexReference):416:416 -> a
+    1:9: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):335:343 -> a
+    10:10:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):494:494 -> a
+    10:10: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):344 -> a
+    11:11: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):345:345 -> a
+    12:12:com.android.tools.r8.graph.ProgramMethod mapProgramMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexDefinitionSupplier):351:351 -> a
+    13:13:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):321:321 -> a
+    13:13:com.android.tools.r8.graph.ProgramMethod mapProgramMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexDefinitionSupplier):351 -> a
+    14:15:com.android.tools.r8.graph.ProgramMethod mapProgramMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexDefinitionSupplier):352:353 -> a
+    16:16:com.android.tools.r8.graph.DexReference lookupReference(com.android.tools.r8.graph.DexReference):417:417 -> a
     17:17:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
-    17:17:com.android.tools.r8.graph.DexReference lookupReference(com.android.tools.r8.graph.DexReference):416 -> a
-    18:23:com.android.tools.r8.graph.DexReference lookupReference(com.android.tools.r8.graph.DexReference):417:422 -> a
-    24:29:boolean assertDefinitionsNotModified(java.lang.Iterable):482:487 -> a
-    30:33:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection):493:496 -> a
-    34:40:boolean assertReferencesNotModified(java.lang.Iterable):501:507 -> a
-    34:40:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection):497 -> a
-    41:41:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):320:320 -> a
-    41:41:boolean assertReferencesNotModified(java.lang.Iterable):507 -> a
-    41:41:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection):497 -> a
-    42:44:boolean assertReferencesNotModified(java.lang.Iterable):507:509 -> a
-    42:44:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection):497 -> a
+    17:17:com.android.tools.r8.graph.DexReference lookupReference(com.android.tools.r8.graph.DexReference):417 -> a
+    18:23:com.android.tools.r8.graph.DexReference lookupReference(com.android.tools.r8.graph.DexReference):418:423 -> a
+    24:29:boolean assertDefinitionsNotModified(java.lang.Iterable):483:488 -> a
+    30:33:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection):494:497 -> a
+    34:40:boolean assertReferencesNotModified(java.lang.Iterable):502:508 -> a
+    34:40:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection):498 -> a
+    41:41:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):321:321 -> a
+    41:41:boolean assertReferencesNotModified(java.lang.Iterable):508 -> a
+    41:41:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection):498 -> a
+    42:44:boolean assertReferencesNotModified(java.lang.Iterable):508:510 -> a
+    42:44:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection):498 -> a
     45:45:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
-    45:45:boolean assertReferencesNotModified(java.lang.Iterable):509 -> a
-    45:45:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection):497 -> a
-    46:48:boolean assertReferencesNotModified(java.lang.Iterable):509:511 -> a
-    46:48:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection):497 -> a
-    49:51:java.util.Map rewriteCallSites(java.util.Map,com.android.tools.r8.graph.DexDefinitionSupplier):519:521 -> a
-    52:56: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):523:527 -> a
-    57:57:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$rewriteCallSites$1(com.android.tools.r8.graph.DexCallSite):526:526 -> a
-    58:58:void lambda$rewriteReferenceKeys$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexReference,java.lang.Object):555:555 -> a
-    59:60:com.android.tools.r8.com.google.common.collect.ImmutableSet rewriteMethods(java.util.Set):568:569 -> a
-    61:61:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):320:320 -> a
-    61:61:com.android.tools.r8.com.google.common.collect.ImmutableSet rewriteMethods(java.util.Set):570 -> a
-    62:64:com.android.tools.r8.com.google.common.collect.ImmutableSet rewriteMethods(java.util.Set):570:572 -> a
-    65:67:com.android.tools.r8.com.google.common.collect.ImmutableMap rewriteFieldKeys(java.util.Map):584:586 -> 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):585:585 -> 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):599:599 -> a
-    70:90:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):605:625 -> a
-    91:91:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():164:164 -> a
-    91:91:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):628 -> a
-    92:93:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):628:629 -> a
-    94:94:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():164:164 -> a
-    94:94:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):630 -> a
-    95:95:boolean isD8R8SynthesizedField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.AppView):651:651 -> a
-    95:95:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):630 -> a
-    96:96:boolean com.android.tools.r8.graph.DexField.match(com.android.tools.r8.graph.DexField):160:160 -> a
-    96:96:boolean isD8R8SynthesizedField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.AppView):651 -> a
-    96:96:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):630 -> a
-    97:101:boolean isD8R8SynthesizedField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.AppView):654:658 -> a
-    97:101:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):630 -> a
-    102:102:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):629:629 -> a
-    103:103:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():164:164 -> a
-    103:103:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):632 -> a
-    104:113:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):632:641 -> a
+    45:45:boolean assertReferencesNotModified(java.lang.Iterable):510 -> a
+    45:45:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection):498 -> a
+    46:48:boolean assertReferencesNotModified(java.lang.Iterable):510:512 -> a
+    46:48:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection):498 -> a
+    49:51:java.util.Map rewriteCallSites(java.util.Map,com.android.tools.r8.graph.DexDefinitionSupplier):520:522 -> a
+    52:56: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):524:528 -> a
+    57:57:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$rewriteCallSites$1(com.android.tools.r8.graph.DexCallSite):527:527 -> a
+    58:58:void lambda$rewriteReferenceKeys$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexReference,java.lang.Object):556:556 -> a
+    59:60:com.android.tools.r8.com.google.common.collect.ImmutableSet rewriteMethods(java.util.Set):569:570 -> a
+    61:61:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):321:321 -> a
+    61:61:com.android.tools.r8.com.google.common.collect.ImmutableSet rewriteMethods(java.util.Set):571 -> a
+    62:64:com.android.tools.r8.com.google.common.collect.ImmutableSet rewriteMethods(java.util.Set):571:573 -> a
+    65:67:com.android.tools.r8.com.google.common.collect.ImmutableMap rewriteFieldKeys(java.util.Map):577:579 -> 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):578:578 -> 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):592:592 -> a
+    70:87:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):598:615 -> a
+    88:88:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):247:247 -> a
+    88:88:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):615 -> a
+    89:89:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):618:618 -> a
+    90:90:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():158:158 -> a
+    90:90:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):621 -> a
+    91:92:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):621:622 -> a
+    93:93:boolean isD8R8SynthesizedField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexItemFactory):644:644 -> a
+    93:93:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):623 -> a
+    94:94:boolean com.android.tools.r8.graph.DexField.match(com.android.tools.r8.graph.DexField):148:148 -> a
+    94:94:boolean isD8R8SynthesizedField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexItemFactory):644 -> a
+    94:94:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):623 -> a
+    95:99:boolean isD8R8SynthesizedField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexItemFactory):647:651 -> a
+    95:99:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):623 -> a
+    100:100:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):622:622 -> a
+    101:101:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():158:158 -> a
+    101:101:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):625 -> a
+    102:111:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):625:634 -> 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
     com.android.tools.r8.graph.DexMethod lookupPutFieldForMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod) -> b
-    1:1:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):320:320 -> b
-    2:6:com.android.tools.r8.graph.DexReference rewriteReference(com.android.tools.r8.graph.DexReference):535:539 -> b
-    7:7:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):320:320 -> b
-    7:7:com.android.tools.r8.graph.DexReference rewriteReference(com.android.tools.r8.graph.DexReference):539 -> b
-    8:8:com.android.tools.r8.graph.DexReference rewriteReference(com.android.tools.r8.graph.DexReference):541:541 -> b
+    1:1:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):321:321 -> b
+    2:6:com.android.tools.r8.graph.DexReference rewriteReference(com.android.tools.r8.graph.DexReference):536:540 -> b
+    7:7:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):321:321 -> b
+    7:7:com.android.tools.r8.graph.DexReference rewriteReference(com.android.tools.r8.graph.DexReference):540 -> b
+    8:8:com.android.tools.r8.graph.DexReference rewriteReference(com.android.tools.r8.graph.DexReference):542:542 -> b
     9:9:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> b
-    9:9:com.android.tools.r8.graph.DexReference rewriteReference(com.android.tools.r8.graph.DexReference):541 -> b
-    10:11:com.android.tools.r8.graph.DexReference rewriteReference(com.android.tools.r8.graph.DexReference):541:542 -> b
-    12:14:com.android.tools.r8.com.google.common.collect.ImmutableMap rewriteReferenceKeys(java.util.Map):554:556 -> b
-    15:19:com.android.tools.r8.com.google.common.collect.ImmutableSet rewriteTypes(java.util.Set):590:594 -> b
+    9:9:com.android.tools.r8.graph.DexReference rewriteReference(com.android.tools.r8.graph.DexReference):542 -> b
+    10:11:com.android.tools.r8.graph.DexReference rewriteReference(com.android.tools.r8.graph.DexReference):542:543 -> b
+    12:14:com.android.tools.r8.com.google.common.collect.ImmutableMap rewriteReferenceKeys(java.util.Map):555:557 -> b
+    15:19:com.android.tools.r8.com.google.common.collect.ImmutableSet rewriteTypes(java.util.Set):583:587 -> 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):368:369 -> c
-    3:3:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField):390:390 -> c
-    4:4:com.android.tools.r8.graph.GraphLens getIdentityLens():443:443 -> c
-    5:7:com.android.tools.r8.com.google.common.collect.ImmutableMap rewriteTypeKeys(java.util.Map):598:600 -> c
+    1:2:com.android.tools.r8.graph.DexMethod lookupMethod(com.android.tools.r8.graph.DexMethod):369:370 -> c
+    3:3:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField):391:391 -> c
+    4:4:com.android.tools.r8.graph.GraphLens getIdentityLens():444:444 -> c
+    5:7:com.android.tools.r8.com.google.common.collect.ImmutableMap rewriteTypeKeys(java.util.Map):591:593 -> 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
-    1:1:com.android.tools.r8.graph.GraphLens$FieldLookupResult lookupFieldResult(com.android.tools.r8.graph.DexField):396:396 -> d
+    1:1:com.android.tools.r8.graph.GraphLens$FieldLookupResult lookupFieldResult(com.android.tools.r8.graph.DexField):397:397 -> d
     boolean isContextFreeForMethods() -> e
-    1:1:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod):439:439 -> e
+    1:1:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod):440:440 -> e
     boolean isIdentityLens() -> f
     boolean isMemberRebindingLens() -> g
     boolean isNonIdentityLens() -> h
-com.android.tools.r8.graph.GraphLens$1 -> com.android.tools.r8.graph.o0$a:
-com.android.tools.r8.graph.GraphLens$Builder -> com.android.tools.r8.graph.o0$b:
+com.android.tools.r8.graph.GraphLens$1 -> com.android.tools.r8.graph.n0$a:
+com.android.tools.r8.graph.GraphLens$Builder -> com.android.tools.r8.graph.n0$b:
     java.util.Map typeMap -> a
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap originalMethodSignatures -> d
     java.util.Map methodMap -> b
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap fieldMap -> c
-    1:8:void <init>():240:247 -> <init>
-    1:1:void map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):261:261 -> a
-    1:1:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):268 -> a
-    2:2:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):269:269 -> a
-com.android.tools.r8.graph.GraphLens$ClearCodeRewritingGraphLens -> com.android.tools.r8.graph.o0$c:
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens):891:891 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):896:896 -> a
-    2:2:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):906:906 -> a
-    3:3:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):911:911 -> a
-    4:4:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):922:922 -> a
-    5:5:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):940:940 -> 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):951:951 -> a
-    7:7:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):957:957 -> a
-    1:1:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):901:901 -> b
-    2:2:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):916:916 -> b
-    3:3:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):945:945 -> b
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod):929:929 -> d
+    1:8:void <init>():241:248 -> <init>
+    1:1:void map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):262:262 -> a
+    2:5:com.android.tools.r8.graph.GraphLens build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens):285:288 -> a
+    1:1:void map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):262:262 -> b
+    1:1:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):269 -> b
+    2:2:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):270:270 -> b
+com.android.tools.r8.graph.GraphLens$ClearCodeRewritingGraphLens -> com.android.tools.r8.graph.n0$c:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens):884:884 -> <init>
+    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):889:889 -> a
+    2:2:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):899:899 -> a
+    3:3:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):904:904 -> a
+    4:4:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):915:915 -> a
+    5:5:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):933:933 -> 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):944:944 -> a
+    7:7:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):950:950 -> a
+    1:1:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):894:894 -> b
+    2:2:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):909:909 -> b
+    3:3:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):938:938 -> b
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod):922:922 -> d
     com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType) -> e
-    1:1:boolean isContextFreeForMethods():967:967 -> e
+    1:1:boolean isContextFreeForMethods():960:960 -> 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.o0$d:
+com.android.tools.r8.graph.GraphLens$FieldLookupResult -> com.android.tools.r8.graph.n0$d:
     com.android.tools.r8.graph.DexType castType -> c
-    1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens$1):120:120 -> <init>
-    2:3:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):125:126 -> <init>
-    1:1:com.android.tools.r8.graph.GraphLens$FieldLookupResult$Builder builder(com.android.tools.r8.graph.GraphLens):130:130 -> a
-    2:2:com.android.tools.r8.graph.DexType getRewrittenCastType(java.util.function.Function):142:142 -> a
-    1:1:com.android.tools.r8.graph.DexType getCastType():138:138 -> d
-    1:1:boolean hasCastType():134:134 -> e
-com.android.tools.r8.graph.GraphLens$FieldLookupResult$Builder -> com.android.tools.r8.graph.p0:
+    1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens$1):121:121 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):126:127 -> <init>
+    1:1:com.android.tools.r8.graph.GraphLens$FieldLookupResult$Builder builder(com.android.tools.r8.graph.GraphLens):131:131 -> a
+    2:2:com.android.tools.r8.graph.DexType getRewrittenCastType(java.util.function.Function):143:143 -> a
+    1:1:com.android.tools.r8.graph.DexType getCastType():139:139 -> d
+    1:1:boolean hasCastType():135:135 -> e
+com.android.tools.r8.graph.GraphLens$FieldLookupResult$Builder -> com.android.tools.r8.graph.o0:
     com.android.tools.r8.graph.DexType castType -> c
-    1:1:void <init>(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$1):145:145 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.GraphLens):150:150 -> <init>
-    1:1:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReboundReference(com.android.tools.r8.graph.DexMember):108:108 -> a
+    1:1:void <init>(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$1):146:146 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.GraphLens):151:151 -> <init>
+    1:1:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReboundReference(com.android.tools.r8.graph.DexMember):109:109 -> a
     1:1:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder setReboundReference(com.android.tools.r8.graph.DexMember):0 -> a
-    2:2:com.android.tools.r8.graph.GraphLens$FieldLookupResult$Builder setCastType(com.android.tools.r8.graph.DexType):155:155 -> a
-    3:3:com.android.tools.r8.graph.GraphLens$FieldLookupResult build():166:166 -> a
+    2:2:com.android.tools.r8.graph.GraphLens$FieldLookupResult$Builder setCastType(com.android.tools.r8.graph.DexType):156:156 -> a
+    3:3:com.android.tools.r8.graph.GraphLens$FieldLookupResult build():167:167 -> a
     com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder self() -> b
-    1:1:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):103:103 -> b
+    1:1:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):104:104 -> b
     1:1:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder setReference(com.android.tools.r8.graph.DexMember):0 -> b
-com.android.tools.r8.graph.GraphLens$IdentityGraphLens -> com.android.tools.r8.graph.o0$e:
+com.android.tools.r8.graph.GraphLens$IdentityGraphLens -> com.android.tools.r8.graph.n0$e:
     com.android.tools.r8.graph.GraphLens$IdentityGraphLens INSTANCE -> b
     boolean $assertionsDisabled -> c
-    1:3:void <clinit>():785:787 -> <clinit>
-    1:1:void <init>():789:789 -> <init>
+    1:3:void <clinit>():778:780 -> <clinit>
+    1:1:void <init>():782:782 -> <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):848:848 -> 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):103:104 -> 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):841:841 -> 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):104:105 -> 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):848 -> 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):848:848 -> a
-    5:5:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):863:863 -> 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):103:104 -> 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):841 -> 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):841:841 -> a
+    5:5:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):856:856 -> 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):104:105 -> 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):863 -> a
-    8:8:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):863:863 -> a
-    9:9:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):862:862 -> 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):872:872 -> 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):103:104 -> a
+    6:7:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):856 -> a
+    8:8:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):856:856 -> a
+    9:9:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):855:855 -> 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):865:865 -> 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):104:105 -> 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):872 -> 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):872:872 -> 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):871:871 -> 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):865 -> 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):865:865 -> 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):864:864 -> 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):812:812 -> b
-    1:1:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType):842:842 -> c
+    1:1:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):805:805 -> b
+    1:1:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType):835:835 -> 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):854:854 -> d
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod):847:847 -> d
     boolean isContextFreeForMethods() -> e
     boolean isIdentityLens() -> f
     boolean isNonIdentityLens() -> h
-    1:1:com.android.tools.r8.graph.GraphLens$IdentityGraphLens getInstance():792:792 -> i
-    1:1:com.android.tools.r8.graph.GraphLens$IdentityGraphLens access$400():785 -> i
-com.android.tools.r8.graph.GraphLens$LookupFieldContinuation -> com.android.tools.r8.graph.o0$f:
+    1:1:com.android.tools.r8.graph.GraphLens$IdentityGraphLens getInstance():785:785 -> i
+    1:1:com.android.tools.r8.graph.GraphLens$IdentityGraphLens access$400():778 -> i
+com.android.tools.r8.graph.GraphLens$LookupFieldContinuation -> com.android.tools.r8.graph.n0$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.o0$g:
+com.android.tools.r8.graph.GraphLens$LookupMethodContinuation -> com.android.tools.r8.graph.n0$g:
     com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult) -> a
-com.android.tools.r8.graph.GraphLens$MemberLookupResult -> com.android.tools.r8.graph.o0$h:
+com.android.tools.r8.graph.GraphLens$MemberLookupResult -> com.android.tools.r8.graph.n0$h:
     com.android.tools.r8.graph.DexMember reference -> a
     com.android.tools.r8.graph.DexMember reboundReference -> b
-    1:1:void <init>(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.GraphLens$1):58:58 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexMember):63:65 -> <init>
-    1:1:com.android.tools.r8.graph.DexMember getReboundReference():85:85 -> a
-    2:2:com.android.tools.r8.graph.DexMember getRewrittenReboundReference(com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap):90:90 -> a
-    3:3:com.android.tools.r8.graph.DexMember getRewrittenReboundReference(java.util.Map):94:94 -> a
-    1:1:com.android.tools.r8.graph.DexMember getReference():69:69 -> b
-    2:2:com.android.tools.r8.graph.DexMember getRewrittenReference(com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap):73:73 -> b
-    1:1:boolean hasReboundReference():81:81 -> c
-com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder -> com.android.tools.r8.graph.q0:
+    1:1:void <init>(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.GraphLens$1):59:59 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexMember):64:66 -> <init>
+    1:1:com.android.tools.r8.graph.DexMember getReboundReference():86:86 -> a
+    2:2:com.android.tools.r8.graph.DexMember getRewrittenReboundReference(com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap):91:91 -> a
+    3:3:com.android.tools.r8.graph.DexMember getRewrittenReboundReference(java.util.Map):95:95 -> a
+    1:1:com.android.tools.r8.graph.DexMember getReference():70:70 -> b
+    2:2:com.android.tools.r8.graph.DexMember getRewrittenReference(com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap):74:74 -> b
+    1:1:boolean hasReboundReference():82:82 -> c
+com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder -> com.android.tools.r8.graph.p0:
     com.android.tools.r8.graph.DexMember reference -> a
     com.android.tools.r8.graph.DexMember reboundReference -> b
-    1:1:void <init>():97:97 -> <init>
-com.android.tools.r8.graph.GraphLens$MethodLookupResult -> com.android.tools.r8.graph.o0$i:
+    1:1:void <init>():98:98 -> <init>
+com.android.tools.r8.graph.GraphLens$MethodLookupResult -> com.android.tools.r8.graph.n0$i:
     com.android.tools.r8.graph.RewrittenPrototypeDescription prototypeChanges -> d
     com.android.tools.r8.ir.code.Invoke$Type type -> c
-    1:3:void <init>(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.RewrittenPrototypeDescription):188:190 -> <init>
-    1:1:com.android.tools.r8.graph.GraphLens$MethodLookupResult$Builder builder(com.android.tools.r8.graph.GraphLens):194:194 -> a
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription getPrototypeChanges():202:202 -> d
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():198:198 -> e
-com.android.tools.r8.graph.GraphLens$MethodLookupResult$Builder -> com.android.tools.r8.graph.r0:
+    1:3:void <init>(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.RewrittenPrototypeDescription):189:191 -> <init>
+    1:1:com.android.tools.r8.graph.GraphLens$MethodLookupResult$Builder builder(com.android.tools.r8.graph.GraphLens):195:195 -> a
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription getPrototypeChanges():203:203 -> d
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():199:199 -> e
+com.android.tools.r8.graph.GraphLens$MethodLookupResult$Builder -> com.android.tools.r8.graph.q0:
     com.android.tools.r8.graph.RewrittenPrototypeDescription prototypeChanges -> d
     com.android.tools.r8.ir.code.Invoke$Type type -> e
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():205:205 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$1):205:205 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.GraphLens):211:211 -> <init>
-    3:3:void <init>(com.android.tools.r8.graph.GraphLens):208:208 -> <init>
-    1:1:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReboundReference(com.android.tools.r8.graph.DexMember):108:108 -> a
+    1:1:void <clinit>():206:206 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$1):206:206 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.GraphLens):212:212 -> <init>
+    3:3:void <init>(com.android.tools.r8.graph.GraphLens):209:209 -> <init>
+    1:1:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReboundReference(com.android.tools.r8.graph.DexMember):109:109 -> a
     1:1:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder setReboundReference(com.android.tools.r8.graph.DexMember):0 -> a
-    2:2:com.android.tools.r8.graph.GraphLens$MethodLookupResult$Builder setPrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription):216:216 -> a
-    3:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult$Builder setType(com.android.tools.r8.ir.code.Invoke$Type):221:221 -> a
-    4:6:com.android.tools.r8.graph.GraphLens$MethodLookupResult build():226:228 -> a
+    2:2:com.android.tools.r8.graph.GraphLens$MethodLookupResult$Builder setPrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription):217:217 -> a
+    3:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult$Builder setType(com.android.tools.r8.ir.code.Invoke$Type):222:222 -> a
+    4:6:com.android.tools.r8.graph.GraphLens$MethodLookupResult build():227:229 -> a
     com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder self() -> b
-    1:1:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):103:103 -> b
+    1:1:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):104:104 -> b
     1:1:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder setReference(com.android.tools.r8.graph.DexMember):0 -> b
-com.android.tools.r8.graph.GraphLens$NestedGraphLens -> com.android.tools.r8.graph.o0$j:
+com.android.tools.r8.graph.GraphLens$NestedGraphLens -> com.android.tools.r8.graph.n0$j:
     com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap originalMethodSignatures -> k
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> g
     java.util.Map methodMap -> i
     boolean $assertionsDisabled -> f
     com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap fieldMap -> j
     java.util.Map typeMap -> h
-    1:1:void <clinit>():981:981 -> <clinit>
-    1:5:void <init>(java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory):1007:1011 -> <init>
-    6:14:void <init>(java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory):1008:1016 -> <init>
+    1:1:void <clinit>():974:974 -> <clinit>
+    1:5:void <init>(java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory):1000:1004 -> <init>
+    6:14:void <init>(java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory):1001:1009 -> <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):1033:1033 -> a
-    2:2:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):1043:1043 -> a
+    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):1026:1026 -> a
+    2:2:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):1036:1036 -> a
     3:3:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap.getRepresentativeKeyOrDefault(java.lang.Object,java.lang.Object):20:20 -> a
-    3:3:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):1043 -> a
-    4:5:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):1043:1044 -> a
-    6:7:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):1049:1050 -> a
-    8:9:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):1064:1065 -> a
-    10:19:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1103:1112 -> a
-    20:23:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1111:1114 -> 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):103:104 -> a
+    3:3:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):1036 -> a
+    4:5:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):1036:1037 -> a
+    6:7:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):1042:1043 -> a
+    8:9:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):1057:1058 -> a
+    10:19:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1096:1105 -> a
+    20:23:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1104:1107 -> 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):104:105 -> 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):1115 -> a
-    26:26:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1115:1115 -> 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):108:109 -> a
+    24:25:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1108 -> a
+    26:26:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1108:1108 -> 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):109:110 -> 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):1116 -> a
-    29:32:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1116:1119 -> a
-    33:33:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1118:1118 -> a
-    34:39:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1117:1122 -> a
-    40:40:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1121:1121 -> a
-    41:54:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1120:1133 -> 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):103:104 -> a
+    27:28:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1109 -> a
+    29:32:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1109:1112 -> a
+    33:33:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1111:1111 -> a
+    34:39:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1110:1115 -> a
+    40:40:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1114:1114 -> a
+    41:54:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1113:1126 -> 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):104:105 -> 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):1134 -> a
-    57:59:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1134:1136 -> a
-    60:63:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1135:1138 -> a
-    64:64:com.android.tools.r8.graph.DexMethod lookupGetFieldForMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):1167:1167 -> a
-    65:78: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):1195:1208 -> a
-    79:81:void lambda$toString$0(java.lang.StringBuilder,java.util.Set,com.android.tools.r8.graph.DexField):1240:1242 -> a
-    82:87:void lambda$toString$0(java.lang.StringBuilder,java.util.Set,com.android.tools.r8.graph.DexField):1239:1244 -> a
+    55:56:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1127 -> a
+    57:59:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1127:1129 -> a
+    60:63:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1128:1131 -> a
+    64:64:com.android.tools.r8.graph.DexMethod lookupGetFieldForMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):1160:1160 -> 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):1188:1190 -> a
+    68:68:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> 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):1190 -> 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):1194:1194 -> a
+    70:70:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> 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):1194 -> 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):1196:1201 -> a
+    77:79:void lambda$toString$0(java.lang.StringBuilder,java.util.Set,com.android.tools.r8.graph.DexField):1233:1235 -> a
+    80:85:void lambda$toString$0(java.lang.StringBuilder,java.util.Set,com.android.tools.r8.graph.DexField):1232:1237 -> 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):1038:1038 -> b
-    2:3:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):1055:1056 -> b
-    4:11:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1075:1082 -> b
-    12:15:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1081:1084 -> b
-    16:17:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReboundReference(com.android.tools.r8.graph.DexMember):108:109 -> b
+    1:1:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):1031:1031 -> b
+    2:3:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):1048:1049 -> b
+    4:11:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1068:1075 -> b
+    12:15:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1074:1077 -> b
+    16:17:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReboundReference(com.android.tools.r8.graph.DexMember):109:110 -> b
     16:17: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
-    16:17:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1085 -> b
-    18:18:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1085:1085 -> b
-    19:20:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):103:104 -> b
+    16:17:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1078 -> b
+    18:18:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1078:1078 -> b
+    19:20:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):104:105 -> b
     19:20: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
-    19:20:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1086 -> b
-    21:28:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1086:1093 -> b
-    29:30:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):103:104 -> b
+    19:20:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1079 -> b
+    21:28:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1079:1086 -> b
+    29:30:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):104:105 -> b
     29:30: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
-    29:30:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1094 -> b
-    31:33:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1094:1096 -> b
-    34:34:com.android.tools.r8.graph.DexMethod lookupPutFieldForMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):1172:1172 -> b
-    1:4:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod):1145:1148 -> d
-    1:1:com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType):1070:1070 -> e
-    2:2:boolean isContextFreeForMethods():1215:1215 -> e
-    3:3:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod):1220:1220 -> e
-    1:1:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):1158:1158 -> f
+    29:30:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1087 -> b
+    31:33:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1087:1089 -> b
+    34:34:com.android.tools.r8.graph.DexMethod lookupPutFieldForMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):1165:1165 -> b
+    1:4:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod):1138:1141 -> d
+    1:1:com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType):1063:1063 -> e
+    2:2:boolean isContextFreeForMethods():1208:1208 -> e
+    3:3:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod):1213:1213 -> e
+    1:1:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):1151:1151 -> f
     2:2:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap.getRepresentativeValueOrDefault(java.lang.Object,java.lang.Object):27:27 -> f
-    2:2:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):1158 -> f
-    3:3:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):1158:1158 -> f
-    1:1:java.lang.Iterable internalGetOriginalTypes(com.android.tools.r8.graph.DexType):1028:1028 -> g
-    2:2:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):1162:1162 -> g
+    2:2:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):1151 -> f
+    3:3:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):1151:1151 -> f
+    1:1:java.lang.Iterable internalGetOriginalTypes(com.android.tools.r8.graph.DexType):1021:1021 -> g
+    2:2:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):1155:1155 -> g
     3:3:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap.getRepresentativeKeyOrDefault(java.lang.Object,java.lang.Object):20:20 -> g
-    3:3:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):1162 -> g
-    4:4:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):1162:1162 -> g
+    3:3:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):1155 -> g
+    4:4:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):1155:1155 -> g
+    1:1:com.android.tools.r8.graph.GraphLens$Builder builder():1013:1013 -> j
     boolean isLegitimateToHaveEmptyMappings() -> k
-    1:22:java.lang.String toString():1226:1247 -> toString
-com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens -> com.android.tools.r8.graph.o0$k:
+    1:22:java.lang.String toString():1219:1240 -> toString
+com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens -> com.android.tools.r8.graph.n0$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>():664:664 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens):671:671 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens):669:673 -> <init>
+    1:1:void <clinit>():657:657 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens):664:664 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens):662:666 -> <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():681:681 -> a
-    1:1:com.android.tools.r8.graph.GraphLens findPrevious(java.util.function.Predicate):686 -> a
-    2:4:com.android.tools.r8.graph.GraphLens findPrevious(java.util.function.Predicate):687:689 -> a
-    5:5:com.android.tools.r8.graph.GraphLens getPrevious():681:681 -> a
-    5:5:com.android.tools.r8.graph.GraphLens findPrevious(java.util.function.Predicate):692 -> a
-    6:6:com.android.tools.r8.graph.GraphLens getPrevious():681:681 -> a
-    6:6:void withAlternativeParentLens(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.utils.Action):698 -> a
-    7:9:void withAlternativeParentLens(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.utils.Action):699:701 -> 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):706:707 -> a
+    1:1:com.android.tools.r8.graph.GraphLens getPrevious():674:674 -> a
+    1:1:com.android.tools.r8.graph.GraphLens findPrevious(java.util.function.Predicate):679 -> a
+    2:4:com.android.tools.r8.graph.GraphLens findPrevious(java.util.function.Predicate):680:682 -> a
+    5:5:com.android.tools.r8.graph.GraphLens getPrevious():674:674 -> a
+    5:5:com.android.tools.r8.graph.GraphLens findPrevious(java.util.function.Predicate):685 -> a
+    6:6:com.android.tools.r8.graph.GraphLens getPrevious():674:674 -> a
+    6:6:void withAlternativeParentLens(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.utils.Action):691 -> a
+    7:9:void withAlternativeParentLens(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.utils.Action):692:694 -> 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):699:700 -> a
     12:12:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethod.getParameters():58:58 -> 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):708 -> a
-    13:13:java.util.stream.Stream com.android.tools.r8.graph.DexTypeList.stream():128:128 -> 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):708 -> 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):708:708 -> 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):710:711 -> 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):103:104 -> 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):701 -> a
+    13:13:java.util.stream.Stream com.android.tools.r8.graph.DexTypeList.stream():124:124 -> 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):701 -> 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):701:701 -> 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):703:704 -> 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):104:105 -> 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):711 -> 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):711:716 -> a
-    28:28:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):746:746 -> 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):747:747 -> 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):753:753 -> 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):757:757 -> 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):704 -> 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):704:709 -> a
+    28:28:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):739:739 -> 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):740:740 -> 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):746:746 -> 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):750:750 -> 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):739:739 -> c
-    2:2:com.android.tools.r8.graph.GraphLens getPrevious():681:681 -> c
-    2:2:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType):740 -> c
-    3:3:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType):740:740 -> c
-    1:14:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):721:734 -> d
+    1:1:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType):732:732 -> c
+    2:2:com.android.tools.r8.graph.GraphLens getPrevious():674:674 -> c
+    2:2:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType):733 -> c
+    3:3:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType):733:733 -> c
+    1:14:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):714:727 -> 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):709:709 -> f
+    1:1:boolean lambda$lookupMethod$0(com.android.tools.r8.graph.DexType):702:702 -> f
     boolean isNonIdentityLens() -> h
-    1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():677:677 -> i
-    1:1:com.android.tools.r8.graph.GraphLens getPrevious():681:681 -> j
-com.android.tools.r8.graph.IndexedDexItem -> com.android.tools.r8.graph.s0:
+    1:1:com.android.tools.r8.graph.GraphLens getPrevious():674:674 -> i
+com.android.tools.r8.graph.IndexedDexItem -> com.android.tools.r8.graph.r0:
     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.xf:
+com.android.tools.r8.graph.InitClassLens -> com.android.tools.r8.internal.Je:
     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.xf$a:
+com.android.tools.r8.graph.InitClassLens$Builder -> com.android.tools.r8.internal.Je$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.Kf:
+com.android.tools.r8.graph.InnerClassAttribute -> com.android.tools.r8.internal.We:
     com.android.tools.r8.graph.DexString innerName -> f
     com.android.tools.r8.graph.DexType inner -> d
     boolean $assertionsDisabled -> a
@@ -21983,16 +22012,19 @@
     14:18:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):91:95 -> a
     19:19:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):265:265 -> a
     19:19:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):96 -> a
-    20:34:com.android.tools.r8.graph.DexType getLiveContext(com.android.tools.r8.graph.AppView):101:115 -> 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):273:273 -> 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
     1:1:com.android.tools.r8.graph.DexString getInnerName():78:78 -> c
     1:1:com.android.tools.r8.graph.DexType getOuter():74:74 -> d
     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.bg:
+com.android.tools.r8.graph.InstantiatedSubTypeInfo -> com.android.tools.r8.internal.nf:
     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.t0:
+com.android.tools.r8.graph.JarApplicationReader -> com.android.tools.r8.graph.s0:
     java.util.concurrent.ConcurrentHashMap stringCache -> e
     java.util.concurrent.ConcurrentHashMap asmTypeCache -> d
     java.util.concurrent.ConcurrentHashMap asmObjectTypeCache -> c
@@ -22026,7 +22058,7 @@
     3:4:com.android.tools.r8.graph.DexType getTypeFromName(java.lang.String):52:53 -> g
     5:5:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.org.objectweb.asm.Type):48:48 -> g
     5:5:com.android.tools.r8.graph.DexType getTypeFromName(java.lang.String):53 -> g
-com.android.tools.r8.graph.JarClassFileReader -> com.android.tools.r8.graph.u0:
+com.android.tools.r8.graph.JarClassFileReader -> com.android.tools.r8.graph.t0:
     com.android.tools.r8.graph.ClassKind classKind -> e
     byte[] CLASSFILE_HEADER -> a
     java.util.function.Consumer classConsumer -> d
@@ -22076,7 +22108,7 @@
     67:67:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):70 -> a
     int cleanAccessFlags(int) -> b
     1:1:void read(com.android.tools.r8.origin.Origin,byte[]):93:93 -> b
-    2:2:void com.android.tools.r8.utils.ExceptionUtils.withOriginAttachmentHandler(com.android.tools.r8.origin.Origin,java.lang.Runnable):225:225 -> b
+    2:2:void com.android.tools.r8.utils.ExceptionUtils.withOriginAttachmentHandler(com.android.tools.r8.origin.Origin,java.lang.Runnable):214:214 -> b
     2:2:void read(com.android.tools.r8.origin.Origin,byte[]):93 -> b
     3:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor createAnnotationVisitor(java.lang.String,boolean,java.util.List,com.android.tools.r8.graph.JarApplicationReader):159:159 -> b
     4:6:boolean retainCompileTimeAnnotation(java.lang.String,com.android.tools.r8.graph.JarApplicationReader):174:176 -> b
@@ -22087,32 +22119,32 @@
     9:11:com.android.tools.r8.graph.DexEncodedAnnotation createEncodedAnnotation(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):181:181 -> b
     13:17:com.android.tools.r8.graph.DexEncodedAnnotation createEncodedAnnotation(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):183:187 -> b
     1:1:com.android.tools.r8.graph.FieldAccessFlags createFieldAccessFlags(int):146:146 -> c
-com.android.tools.r8.graph.JarClassFileReader$CreateAnnotationVisitor -> com.android.tools.r8.graph.u0$a:
+com.android.tools.r8.graph.JarClassFileReader$CreateAnnotationVisitor -> com.android.tools.r8.graph.t0$a:
     java.util.List values -> e
     java.util.List names -> d
     com.android.tools.r8.graph.JarApplicationReader application -> b
     java.util.function.BiConsumer onVisitEnd -> c
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():907:907 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.JarApplicationReader,java.util.function.BiConsumer):916:916 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.JarApplicationReader,java.util.function.BiConsumer):911:918 -> <init>
-    1:2:void visitEnum(java.lang.String,java.lang.String,java.lang.String):928:929 -> a
-    3:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):934:934 -> a
-    4:6:void lambda$visitAnnotation$0(java.lang.String,java.lang.String,java.util.List,java.util.List):935:935 -> a
-    7:7:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):941:941 -> a
-    8:9:void lambda$visitArray$1(java.lang.String,java.util.List,java.util.List):942:943 -> a
-    10:10:void visitEnd():949:949 -> a
-    11:16:void addElement(java.lang.String,com.android.tools.r8.graph.DexValue):954:959 -> a
-    17:38:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):1025:1046 -> a
-    17:38:void visit(java.lang.String,java.lang.Object):923 -> a
-    39:94:com.android.tools.r8.graph.DexValue$DexValueArray getDexValueArray(java.lang.Object):963:1018 -> a
-    39:94:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):1048 -> a
-    39:94:void visit(java.lang.String,java.lang.Object):923 -> a
-    95:95:void visit(java.lang.String,java.lang.Object):923:923 -> a
-    96:96:com.android.tools.r8.graph.DexValue$DexValueArray getDexValueArray(java.lang.Object):1020:1020 -> a
-    96:96:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):1048 -> a
-    96:96:void visit(java.lang.String,java.lang.Object):923 -> a
-com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor -> com.android.tools.r8.graph.u0$b:
+    1:1:void <clinit>():908:908 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.JarApplicationReader,java.util.function.BiConsumer):917:917 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.JarApplicationReader,java.util.function.BiConsumer):912:919 -> <init>
+    1:2:void visitEnum(java.lang.String,java.lang.String,java.lang.String):929:930 -> a
+    3:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):935:935 -> a
+    4:6:void lambda$visitAnnotation$0(java.lang.String,java.lang.String,java.util.List,java.util.List):936:936 -> a
+    7:7:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):942:942 -> a
+    8:9:void lambda$visitArray$1(java.lang.String,java.util.List,java.util.List):943:944 -> a
+    10:10:void visitEnd():950:950 -> a
+    11:16:void addElement(java.lang.String,com.android.tools.r8.graph.DexValue):955:960 -> a
+    17:38:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):1026:1047 -> a
+    17:38:void visit(java.lang.String,java.lang.Object):924 -> a
+    39:94:com.android.tools.r8.graph.DexValue$DexValueArray getDexValueArray(java.lang.Object):964:1019 -> a
+    39:94:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):1049 -> a
+    39:94:void visit(java.lang.String,java.lang.Object):924 -> a
+    95:95:void visit(java.lang.String,java.lang.Object):924:924 -> a
+    96:96:com.android.tools.r8.graph.DexValue$DexValueArray getDexValueArray(java.lang.Object):1021:1021 -> a
+    96:96:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):1049 -> a
+    96:96:void visit(java.lang.String,java.lang.Object):924 -> a
+com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor -> com.android.tools.r8.graph.t0$b:
     java.util.Set fieldSignatures -> y
     com.android.tools.r8.graph.EnclosingMethodAttribute enclosingMember -> r
     java.util.List defaultAnnotations -> v
@@ -22185,7 +22217,7 @@
     108:113:void visitSource(java.lang.String,java.lang.String):367:372 -> a
     114:114:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():40:40 -> a
     114:114:void visitSource(java.lang.String,java.lang.String):372 -> a
-    115:118:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.createSourceDebugExtensionAnnotation(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.DexItemFactory):220:223 -> a
+    115:118:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.createSourceDebugExtensionAnnotation(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.DexItemFactory):218:221 -> a
     115:118:void visitSource(java.lang.String,java.lang.String):371 -> a
     119:119:void visitSource(java.lang.String,java.lang.String):370:370 -> a
     120:128:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):379:387 -> a
@@ -22267,7 +22299,7 @@
     1:1:java.util.List access$700(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):190:190 -> j
     1:1:java.util.List access$800(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):190:190 -> k
     1:1:com.android.tools.r8.graph.ClassKind access$900(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):190:190 -> l
-com.android.tools.r8.graph.JarClassFileReader$CreateFieldVisitor -> com.android.tools.r8.graph.u0$c:
+com.android.tools.r8.graph.JarClassFileReader$CreateFieldVisitor -> com.android.tools.r8.graph.t0$c:
     java.lang.String desc -> f
     java.lang.Object value -> g
     com.android.tools.r8.graph.GenericSignature$FieldTypeSignature fieldSignature -> h
@@ -22294,7 +22326,7 @@
     58:61:java.util.List getAnnotations():678:681 -> a
     58:61:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):601 -> a
     62:62:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):601:601 -> a
-com.android.tools.r8.graph.JarClassFileReader$CreateMethodVisitor -> com.android.tools.r8.graph.u0$d:
+com.android.tools.r8.graph.JarClassFileReader$CreateMethodVisitor -> com.android.tools.r8.graph.t0$d:
     java.util.List parameterNames -> r
     java.util.List parameterAnnotationsLists -> q
     int parameterCount -> m
@@ -22323,7 +22355,7 @@
     5:11:void visitAnnotableParameterCount(int,boolean):755:761 -> a
     12:23:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):766:777 -> a
     24:24:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):776:776 -> a
-    25:25:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):903:903 -> a
+    25:25:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):904:904 -> a
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> b
     1:6:void visitParameter(java.lang.String,int):803:808 -> b
     7:7:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():40:40 -> b
@@ -22331,42 +22363,37 @@
     8:10:void visitParameter(java.lang.String,int):808:810 -> b
     11:11:void visitCode():815:815 -> b
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> c
-    1:2:void visitEnd():827:828 -> c
-    3:4:boolean classRequiresCode():819:820 -> c
-    3:4:void visitEnd():828 -> c
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1455:1455 -> c
-    5:5:boolean classRequiresCode():820 -> c
-    5:5:void visitEnd():828 -> c
-    6:8:boolean classRequiresCode():820:822 -> c
-    6:8:void visitEnd():828 -> c
-    9:19:void visitEnd():829:839 -> c
-    20:20:void com.android.tools.r8.graph.ParameterAnnotationsList.<init>(com.android.tools.r8.graph.DexAnnotationSet[]):64:64 -> c
-    20:20:void visitEnd():839 -> c
-    21:25:void visitEnd():841:845 -> c
-    26:32:void visitEnd():844:850 -> c
-    33:33:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():40:40 -> c
-    33:33:void visitEnd():850 -> c
-    34:42:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.createMethodParametersAnnotation(com.android.tools.r8.graph.DexValue[],com.android.tools.r8.graph.DexValue[],com.android.tools.r8.graph.DexItemFactory):229:237 -> c
-    34:42:void visitEnd():847 -> c
-    43:61:void visitEnd():847:865 -> c
-    62:62:boolean isReachabilitySensitive():886:886 -> c
-    62:62:void visitEnd():865 -> c
-    63:63:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():40:40 -> c
-    63:63:boolean isReachabilitySensitive():886 -> c
-    63:63:void visitEnd():865 -> c
-    64:66:boolean isReachabilitySensitive():886:888 -> c
-    64:66:void visitEnd():865 -> c
-    67:71:void visitEnd():865:869 -> c
-    72:82:void visitEnd():867:877 -> c
-    83:83:void visitEnd():874:874 -> c
-    84:92:void visitEnd():872:880 -> c
-    1:4:java.util.List getAnnotations():896:899 -> d
-com.android.tools.r8.graph.JarClassFileReader$ReparseContext -> com.android.tools.r8.graph.u0$e:
+    1:2:void visitEnd():828:829 -> c
+    3:7:boolean classRequiresCode():819:823 -> c
+    3:7:void visitEnd():829 -> c
+    8:18:void visitEnd():830:840 -> c
+    19:19:void com.android.tools.r8.graph.ParameterAnnotationsList.<init>(com.android.tools.r8.graph.DexAnnotationSet[]):64:64 -> c
+    19:19:void visitEnd():840 -> c
+    20:24:void visitEnd():842:846 -> c
+    25:31:void visitEnd():845:851 -> c
+    32:32:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():40:40 -> c
+    32:32:void visitEnd():851 -> c
+    33:41:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.createMethodParametersAnnotation(com.android.tools.r8.graph.DexValue[],com.android.tools.r8.graph.DexValue[],com.android.tools.r8.graph.DexItemFactory):227:235 -> c
+    33:41:void visitEnd():848 -> c
+    42:60:void visitEnd():848:866 -> c
+    61:61:boolean isReachabilitySensitive():887:887 -> c
+    61:61:void visitEnd():866 -> c
+    62:62:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():40:40 -> c
+    62:62:boolean isReachabilitySensitive():887 -> c
+    62:62:void visitEnd():866 -> c
+    63:65:boolean isReachabilitySensitive():887:889 -> c
+    63:65:void visitEnd():866 -> c
+    66:70:void visitEnd():866:870 -> c
+    71:81:void visitEnd():868:878 -> c
+    82:82:void visitEnd():875:875 -> c
+    83:91:void visitEnd():873:881 -> c
+    1:4:java.util.List getAnnotations():897:900 -> d
+com.android.tools.r8.graph.JarClassFileReader$ReparseContext -> com.android.tools.r8.graph.t0$e:
     com.android.tools.r8.graph.DexClass owner -> b
     byte[] classCache -> a
     java.util.List codeList -> c
-    1:8:void <init>():1052:1059 -> <init>
-com.android.tools.r8.graph.LazyCfCode -> com.android.tools.r8.graph.A0:
+    1:8:void <init>():1053:1060 -> <init>
+com.android.tools.r8.graph.LazyCfCode -> com.android.tools.r8.graph.z0:
     com.android.tools.r8.graph.CfCode code -> f
     com.android.tools.r8.graph.JarApplicationReader application -> e
     com.android.tools.r8.origin.Origin origin -> d
@@ -22409,8 +22436,8 @@
     1:1:int estimatedDexCodeSizeUpperBoundInBytes():215:215 -> x
     1:1:int estimatedSizeForInlining():205:205 -> y
     boolean isCfCode() -> z
-com.android.tools.r8.graph.LazyCfCode$1 -> com.android.tools.r8.graph.v0:
-com.android.tools.r8.graph.LazyCfCode$ClassCodeVisitor -> com.android.tools.r8.graph.w0:
+com.android.tools.r8.graph.LazyCfCode$1 -> com.android.tools.r8.graph.u0:
+com.android.tools.r8.graph.LazyCfCode$ClassCodeVisitor -> com.android.tools.r8.graph.v0:
     java.util.function.BiFunction codeLocator -> d
     com.android.tools.r8.graph.JarApplicationReader application -> e
     com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions debugParsingOptions -> h
@@ -22419,12 +22446,12 @@
     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.eo:
+com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions -> com.android.tools.r8.internal.jn:
     boolean lineInfo -> a
     boolean localInfo -> b
     int asmReaderOptions -> c
     1:4:void <init>(boolean,boolean,int):159:162 -> <init>
-com.android.tools.r8.graph.LazyCfCode$DefaultCodeLocator -> com.android.tools.r8.graph.x0:
+com.android.tools.r8.graph.LazyCfCode$DefaultCodeLocator -> com.android.tools.r8.graph.w0:
     com.android.tools.r8.graph.JarClassFileReader$ReparseContext context -> a
     int methodIndex -> b
     1:1:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.LazyCfCode$1):272:272 -> <init>
@@ -22433,9 +22460,9 @@
     1:1:java.lang.Object apply(java.lang.Object,java.lang.Object):272:272 -> apply
     2:2:com.android.tools.r8.graph.LazyCfCode apply(java.lang.String,java.lang.String):284:284 -> apply
     2:2:java.lang.Object apply(java.lang.Object,java.lang.Object):272 -> apply
-com.android.tools.r8.graph.LazyCfCode$JsrEncountered -> com.android.tools.r8.graph.y0:
+com.android.tools.r8.graph.LazyCfCode$JsrEncountered -> com.android.tools.r8.graph.x0:
     1:1:void <init>(java.lang.String):93:93 -> <init>
-com.android.tools.r8.graph.LazyCfCode$MethodCodeVisitor -> com.android.tools.r8.graph.z0:
+com.android.tools.r8.graph.LazyCfCode$MethodCodeVisitor -> com.android.tools.r8.graph.y0:
     int maxStack -> n
     java.util.List localVariables -> r
     int maxLocals -> o
@@ -22727,7 +22754,7 @@
     4:8:void visitVarInsn(int,int):710:714 -> d
     9:38:void visitVarInsn(int,int):706:735 -> d
     39:39:void visitVarInsn(int,int):726:726 -> d
-com.android.tools.r8.graph.LazyLoadedDexApplication -> com.android.tools.r8.graph.B0:
+com.android.tools.r8.graph.LazyLoadedDexApplication -> com.android.tools.r8.graph.A0:
     com.android.tools.r8.utils.LibraryClassCollection libraryClasses -> k
     boolean $assertionsDisabled -> h
     com.android.tools.r8.utils.ClasspathClassCollection classpathClasses -> j
@@ -22749,8 +22776,8 @@
     1:1:com.android.tools.r8.graph.DirectMappedDexApplication toDirect():249:249 -> g
     1:1:com.android.tools.r8.graph.LazyLoadedDexApplication$AllClasses loadAllClasses():190:190 -> h
     1:1:java.lang.String toString():259:259 -> toString
-com.android.tools.r8.graph.LazyLoadedDexApplication$1 -> com.android.tools.r8.graph.B0$a:
-com.android.tools.r8.graph.LazyLoadedDexApplication$AllClasses -> com.android.tools.r8.graph.B0$b:
+com.android.tools.r8.graph.LazyLoadedDexApplication$1 -> com.android.tools.r8.graph.A0$a:
+com.android.tools.r8.graph.LazyLoadedDexApplication$AllClasses -> com.android.tools.r8.graph.A0$b:
     boolean $assertionsDisabled -> a
     com.android.tools.r8.com.google.common.collect.ImmutableList programClasses -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList libraryClasses -> d
@@ -22764,41 +22791,29 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList getLibraryClasses():165:165 -> b
     boolean lambda$new$2(com.android.tools.r8.graph.DexType) -> c
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList getProgramClasses():157:157 -> c
-com.android.tools.r8.graph.LazyLoadedDexApplication$Builder -> com.android.tools.r8.graph.B0$c:
+com.android.tools.r8.graph.LazyLoadedDexApplication$Builder -> com.android.tools.r8.graph.A0$c:
     com.android.tools.r8.utils.LibraryClassCollection libraryClasses -> j
     com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver resolver -> k
     com.android.tools.r8.utils.ClasspathClassCollection classpathClasses -> i
     1:1:void <init>(com.android.tools.r8.graph.LazyLoadedDexApplication,com.android.tools.r8.graph.LazyLoadedDexApplication$1):193:193 -> <init>
     2:5:void <init>(com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):200:203 -> <init>
     6:9:void <init>(com.android.tools.r8.graph.LazyLoadedDexApplication):207:210 -> <init>
-    1:1:com.android.tools.r8.graph.LazyLoadedDexApplication$Builder setClasspathClassCollection(com.android.tools.r8.utils.ClasspathClassCollection):219:219 -> a
-    2:2:com.android.tools.r8.graph.LazyLoadedDexApplication$Builder setLibraryClassCollection(com.android.tools.r8.utils.LibraryClassCollection):224:224 -> a
-    1:1:com.android.tools.r8.graph.DexApplication build():193:193 -> b
-    com.android.tools.r8.graph.DexApplication$Builder self() -> e
-    1:4:com.android.tools.r8.graph.LazyLoadedDexApplication build():230:233 -> f
-com.android.tools.r8.graph.LibraryField -> com.android.tools.r8.graph.C0:
-    boolean $assertionsDisabled -> e
-    1:1:void <clinit>():7:7 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):11:11 -> <init>
-    1:2:com.android.tools.r8.graph.DexLibraryClass getHolder():16:17 -> a
-    3:3:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    3:3:com.android.tools.r8.graph.DexLibraryClass getHolder():17 -> a
-    4:5:com.android.tools.r8.graph.DexLibraryClass getHolder():17:18 -> a
-    1:1:com.android.tools.r8.graph.DexClass getHolder():7:7 -> n
-    com.android.tools.r8.graph.LibraryField asLibraryField() -> t
-com.android.tools.r8.graph.LibraryMember -> com.android.tools.r8.internal.po:
-    com.android.tools.r8.graph.DexLibraryClass getHolder() -> a
-com.android.tools.r8.graph.LibraryMethod -> com.android.tools.r8.graph.D0:
+    1:1:com.android.tools.r8.graph.DexApplication build():193:193 -> a
+    2:2:com.android.tools.r8.graph.LazyLoadedDexApplication$Builder setClasspathClassCollection(com.android.tools.r8.utils.ClasspathClassCollection):219:219 -> a
+    3:3:com.android.tools.r8.graph.LazyLoadedDexApplication$Builder setLibraryClassCollection(com.android.tools.r8.utils.LibraryClassCollection):224:224 -> a
+    com.android.tools.r8.graph.DexApplication$Builder self() -> d
+    1:4:com.android.tools.r8.graph.LazyLoadedDexApplication build():230:233 -> e
+com.android.tools.r8.graph.LibraryMethod -> com.android.tools.r8.graph.B0:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():7:7 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedMethod):11:11 -> <init>
-    1:2:com.android.tools.r8.graph.DexLibraryClass getHolder():16:17 -> a
-    3:3:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    3:3:com.android.tools.r8.graph.DexLibraryClass getHolder():17 -> a
-    4:5:com.android.tools.r8.graph.DexLibraryClass getHolder():17:18 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedMethod):10:10 -> <init>
     1:1:com.android.tools.r8.graph.DexClass getHolder():7:7 -> n
     com.android.tools.r8.graph.LibraryMethod asLibraryMethod() -> t
-com.android.tools.r8.graph.LookupCompletenessHelper -> com.android.tools.r8.graph.E0:
+    1:2:com.android.tools.r8.graph.DexLibraryClass getHolder():25:26 -> w
+    3:3:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> w
+    3:3:com.android.tools.r8.graph.DexLibraryClass getHolder():26 -> w
+    4:5:com.android.tools.r8.graph.DexLibraryClass getHolder():26:27 -> w
+com.android.tools.r8.graph.LookupCompletenessHelper -> com.android.tools.r8.graph.C0:
     java.util.Set pinnedInstantiations -> c
     java.util.Set pinnedMethods -> d
     com.android.tools.r8.graph.PinnedPredicate pinnedPredicate -> b
@@ -22812,36 +22827,36 @@
     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):484:484 -> a
+    24:24:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):466:466 -> 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.Ep:
+com.android.tools.r8.graph.LookupLambdaTarget -> com.android.tools.r8.internal.Go:
     boolean $assertionsDisabled -> a
     com.android.tools.r8.graph.DexClassAndMethod method -> b
     1:1:void <clinit>():8:8 -> <clinit>
     1:5:void <init>(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexClassAndMethod):12:16 -> <init>
     1:1:com.android.tools.r8.graph.DexClassAndMethod getImplementationMethod():30:30 -> a
-    boolean isLambdaTarget() -> f
+    boolean isLambdaTarget() -> e
     com.android.tools.r8.graph.LookupLambdaTarget asLambdaTarget() -> j
-com.android.tools.r8.graph.LookupResult -> com.android.tools.r8.graph.F0:
+com.android.tools.r8.graph.LookupResult -> com.android.tools.r8.graph.D0:
     1:1:void <init>():13:13 -> <init>
     com.android.tools.r8.graph.LookupResult$LookupResultSuccess asLookupResultSuccess() -> a
     void forEach(java.util.function.Consumer,java.util.function.Consumer) -> a
     1:1:void forEach(java.util.function.Consumer):32:32 -> a
     boolean isLookupResultFailure() -> b
     boolean isLookupResultSuccess() -> c
-com.android.tools.r8.graph.LookupResult$1 -> com.android.tools.r8.graph.F0$a:
-com.android.tools.r8.graph.LookupResult$LookupResultFailure -> com.android.tools.r8.graph.F0$b:
+com.android.tools.r8.graph.LookupResult$1 -> com.android.tools.r8.graph.D0$a:
+com.android.tools.r8.graph.LookupResult$LookupResultFailure -> com.android.tools.r8.graph.D0$b:
     com.android.tools.r8.graph.LookupResult$LookupResultFailure INSTANCE -> a
     1:1:void <clinit>():142:142 -> <clinit>
     1:1:void <init>():144:144 -> <init>
     void forEach(java.util.function.Consumer,java.util.function.Consumer) -> a
     boolean isLookupResultFailure() -> b
     1:1:com.android.tools.r8.graph.LookupResult$LookupResultFailure access$100():140:140 -> d
-com.android.tools.r8.graph.LookupResult$LookupResultSuccess -> com.android.tools.r8.graph.F0$c:
+com.android.tools.r8.graph.LookupResult$LookupResultSuccess -> com.android.tools.r8.graph.D0$c:
     java.util.Map methodTargets -> b
     com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState state -> d
     java.util.List lambdaTargets -> c
@@ -22860,82 +22875,81 @@
     1:1:boolean isComplete():113:113 -> g
     1:1:boolean isIncomplete():109:109 -> h
     1:1:void setIncomplete():118:118 -> i
-com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState -> com.android.tools.r8.graph.F0$c$a:
+com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState -> com.android.tools.r8.graph.D0$c$a:
     com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState Incomplete -> b
     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.Gp:
-    boolean isLambdaTarget() -> f
-    com.android.tools.r8.graph.DexClassAndMethod asMethodTarget() -> g
+com.android.tools.r8.graph.LookupTarget -> com.android.tools.r8.internal.Io:
+    boolean isLambdaTarget() -> e
+    com.android.tools.r8.graph.DexClassAndMethod asMethodTarget() -> f
     com.android.tools.r8.graph.LookupLambdaTarget asLambdaTarget() -> j
     boolean isMethodTarget() -> k
-com.android.tools.r8.graph.MemberResolutionResult -> com.android.tools.r8.internal.vq:
+com.android.tools.r8.graph.MemberResolutionResult -> com.android.tools.r8.internal.sp:
     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
     com.android.tools.r8.graph.SuccessfulMemberResolutionResult asSuccessfulMemberResolutionResult() -> d
-com.android.tools.r8.graph.MethodAccessFlags -> com.android.tools.r8.graph.G0:
+com.android.tools.r8.graph.MethodAccessFlags -> com.android.tools.r8.graph.E0:
     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$Builder builder():65:65 -> J
     1:1:com.android.tools.r8.graph.MethodAccessFlags copy():70:70 -> K
-    1:1:com.android.tools.r8.graph.MethodAccessFlags createPublicStaticSynthetic():79:79 -> L
-    1:1:void demoteFromBridge():143:143 -> M
-    1:1:int com.android.tools.r8.graph.AccessFlags.materialize():74:74 -> N
-    1:1:int getAsCfAccessFlags():105 -> N
-    1:2:int getAsDexAccessFlags():110:111 -> O
-    3:3:void unsetSynchronized():127:127 -> O
-    3:3:int getAsDexAccessFlags():112 -> O
-    4:4:void setDeclaredSynchronized():219:219 -> O
-    4:4:int getAsDexAccessFlags():113 -> O
-    5:5:int com.android.tools.r8.graph.AccessFlags.materialize():74:74 -> O
-    5:5:int getAsDexAccessFlags():115 -> O
+    1:1:void demoteFromBridge():143:143 -> L
+    1:1:int com.android.tools.r8.graph.AccessFlags.materialize():74:74 -> M
+    1:1:int getAsCfAccessFlags():105 -> M
+    1:2:int getAsDexAccessFlags():110:111 -> N
+    3:3:void unsetSynchronized():127:127 -> N
+    3:3:int getAsDexAccessFlags():112 -> N
+    4:4:void setDeclaredSynchronized():215:215 -> N
+    4:4:int getAsDexAccessFlags():113 -> N
+    5:5:int com.android.tools.r8.graph.AccessFlags.materialize():74:74 -> N
+    5:5:int getAsDexAccessFlags():115 -> N
+    1:1:boolean com.android.tools.r8.graph.AccessFlags.isSet(int):255:255 -> O
+    1:1:boolean isAbstract():167 -> O
     1:1:boolean com.android.tools.r8.graph.AccessFlags.isSet(int):255:255 -> P
-    1:1:boolean isAbstract():171 -> P
+    1:1:boolean isBridge():131 -> P
     1:1:boolean com.android.tools.r8.graph.AccessFlags.isSet(int):255:255 -> Q
-    1:1:boolean isBridge():131 -> Q
+    1:1:boolean isConstructor():191 -> Q
     1:1:boolean com.android.tools.r8.graph.AccessFlags.isSet(int):255:255 -> R
-    1:1:boolean isConstructor():195 -> R
+    1:1:boolean isNative():159 -> R
     1:1:boolean com.android.tools.r8.graph.AccessFlags.isSet(int):255:255 -> S
-    1:1:boolean isNative():159 -> S
+    1:1:boolean isStrict():179 -> S
     1:1:boolean com.android.tools.r8.graph.AccessFlags.isSet(int):255:255 -> T
-    1:1:boolean isStrict():183 -> T
+    1:1:boolean isSynchronized():119 -> T
     1:1:boolean com.android.tools.r8.graph.AccessFlags.isSet(int):255:255 -> U
-    1:1:boolean isSynchronized():119 -> U
-    1:1:boolean com.android.tools.r8.graph.AccessFlags.isSet(int):255:255 -> V
-    1:1:boolean isVarargs():147 -> V
-    1:1:void setBridge():135:135 -> W
-    1:1:void setNative():163:163 -> X
-    1:1:void unsetAbstract():179:179 -> Y
-    1:1:void unsetBridge():139:139 -> Z
+    1:1:boolean isVarargs():147 -> U
+    1:1:void setBridge():135:135 -> V
+    1:1:void setNative():163:163 -> W
+    1:1:void unsetAbstract():175:175 -> X
+    1:1:void unsetBridge():139:139 -> Y
+    1:1:void unsetConstructor():205:205 -> Z
     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):91 -> a
-    3:3:void setConstructor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):203:203 -> a
-    4:4:void setConstructor():199:199 -> a
-    4:4:void setConstructor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):204 -> a
-    1:1:void unsetConstructor():209:209 -> a0
+    3:3:void setConstructor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):199:199 -> a
+    4:4:void setConstructor():195:195 -> a
+    4:4:void setConstructor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):200 -> a
+    1:1:void unsetDeclaredSynchronized():219:219 -> a0
     1:3:com.android.tools.r8.graph.MethodAccessFlags fromSharedAccessFlags(int,boolean):84:86 -> b
-    1:1:void unsetDeclaredSynchronized():223:223 -> b0
+    1:1:void unsetVarargs():155:155 -> b0
     1:9:java.util.List getNames():32:40 -> c
-    1:1:void unsetVarargs():155:155 -> c0
-    1:9:java.util.List getPredicates():45:53 -> e
+    1:9:java.util.List getPredicates():45:53 -> f
     1:1:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):95:95 -> j
     2:2:void <init>(int):57:57 -> j
     2:2:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):95 -> j
     3:3:boolean com.android.tools.r8.graph.AccessFlags.isSet(int):255:255 -> j
-    3:3:boolean isDeclaredSynchronized():215 -> j
+    3:3:boolean isDeclaredSynchronized():211 -> j
     3:3:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):96 -> j
     4:4:void setSynchronized():123:123 -> j
     4:4:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):97 -> j
-    5:5:void unsetDeclaredSynchronized():223:223 -> j
+    5:5:void unsetDeclaredSynchronized():219:219 -> j
     5:5:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):98 -> j
     com.android.tools.r8.utils.structural.StructuralItem self() -> k
     com.android.tools.r8.graph.AccessFlags self() -> w
-com.android.tools.r8.graph.MethodAccessFlags$Builder -> com.android.tools.r8.graph.G0$a:
-    1:1:void <init>():229:229 -> <init>
+com.android.tools.r8.graph.MethodAccessFlags$Builder -> com.android.tools.r8.graph.E0$a:
+    1:1:void <init>():225:225 -> <init>
     com.android.tools.r8.graph.AccessFlags$BuilderBase self() -> a
     1:5:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.AccessFlags$BuilderBase.setPrivate(boolean):325:329 -> a
     1:5:com.android.tools.r8.graph.AccessFlags$BuilderBase setPrivate(boolean):0 -> a
@@ -22945,24 +22959,24 @@
     1:5:com.android.tools.r8.graph.AccessFlags$BuilderBase setPublic(boolean):0 -> c
     6:6:com.android.tools.r8.graph.AccessFlags com.android.tools.r8.graph.AccessFlags$BuilderBase.build():361:361 -> c
     6:6:com.android.tools.r8.graph.AccessFlags build():0 -> c
-    1:1:com.android.tools.r8.graph.MethodAccessFlags$Builder setConstructor():238:238 -> d
-    2:2:void com.android.tools.r8.graph.MethodAccessFlags.setConstructor():199:199 -> d
-    2:2:com.android.tools.r8.graph.MethodAccessFlags$Builder setConstructor():238 -> d
-    3:3:com.android.tools.r8.graph.MethodAccessFlags$Builder setStrict(boolean):244:244 -> d
-    4:4:void com.android.tools.r8.graph.MethodAccessFlags.setStrict():187:187 -> d
-    4:4:com.android.tools.r8.graph.MethodAccessFlags$Builder setStrict(boolean):244 -> d
-    5:5:com.android.tools.r8.graph.MethodAccessFlags$Builder setStrict(boolean):246:246 -> d
-    6:6:void com.android.tools.r8.graph.MethodAccessFlags.unsetStrict():191:191 -> d
-    6:6:com.android.tools.r8.graph.MethodAccessFlags$Builder setStrict(boolean):246 -> d
-    1:1:com.android.tools.r8.graph.MethodAccessFlags$Builder setSynchronized(boolean):253:253 -> e
+    1:1:com.android.tools.r8.graph.MethodAccessFlags$Builder setConstructor():229:229 -> d
+    2:2:void com.android.tools.r8.graph.MethodAccessFlags.setConstructor():195:195 -> d
+    2:2:com.android.tools.r8.graph.MethodAccessFlags$Builder setConstructor():229 -> d
+    3:3:com.android.tools.r8.graph.MethodAccessFlags$Builder setStrict(boolean):235:235 -> d
+    4:4:void com.android.tools.r8.graph.MethodAccessFlags.setStrict():183:183 -> d
+    4:4:com.android.tools.r8.graph.MethodAccessFlags$Builder setStrict(boolean):235 -> d
+    5:5:com.android.tools.r8.graph.MethodAccessFlags$Builder setStrict(boolean):237:237 -> d
+    6:6:void com.android.tools.r8.graph.MethodAccessFlags.unsetStrict():187:187 -> d
+    6:6:com.android.tools.r8.graph.MethodAccessFlags$Builder setStrict(boolean):237 -> d
+    1:1:com.android.tools.r8.graph.MethodAccessFlags$Builder setSynchronized(boolean):244:244 -> e
     2:2:void com.android.tools.r8.graph.MethodAccessFlags.setSynchronized():123:123 -> e
-    2:2:com.android.tools.r8.graph.MethodAccessFlags$Builder setSynchronized(boolean):253 -> e
-    3:3:com.android.tools.r8.graph.MethodAccessFlags$Builder setSynchronized(boolean):255:255 -> e
+    2:2:com.android.tools.r8.graph.MethodAccessFlags$Builder setSynchronized(boolean):244 -> e
+    3:3:com.android.tools.r8.graph.MethodAccessFlags$Builder setSynchronized(boolean):246:246 -> e
     4:4:void com.android.tools.r8.graph.MethodAccessFlags.unsetSynchronized():127:127 -> e
-    4:4:com.android.tools.r8.graph.MethodAccessFlags$Builder setSynchronized(boolean):255 -> e
+    4:4:com.android.tools.r8.graph.MethodAccessFlags$Builder setSynchronized(boolean):246 -> e
     5:5:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.AccessFlags$BuilderBase.setStatic():351:351 -> e
     5:5:com.android.tools.r8.graph.AccessFlags$BuilderBase setStatic():0 -> e
-com.android.tools.r8.graph.MethodAccessInfoCollection -> com.android.tools.r8.internal.Jq:
+com.android.tools.r8.graph.MethodAccessInfoCollection -> com.android.tools.r8.internal.Ip:
     java.util.Map directInvokes -> a
     java.util.Map interfaceInvokes -> b
     java.util.Map staticInvokes -> c
@@ -22985,8 +22999,8 @@
     2:2:void forEachStaticInvoke(java.util.function.BiConsumer):71:71 -> c
     1:1:void forEachSuperInvoke(java.util.function.BiConsumer):75:75 -> d
     1:1:void forEachVirtualInvoke(java.util.function.BiConsumer):83:83 -> e
-com.android.tools.r8.graph.MethodAccessInfoCollection$1 -> com.android.tools.r8.internal.Iq:
-com.android.tools.r8.graph.MethodAccessInfoCollection$Builder -> com.android.tools.r8.internal.Jq$a:
+com.android.tools.r8.graph.MethodAccessInfoCollection$1 -> com.android.tools.r8.internal.Hp:
+com.android.tools.r8.graph.MethodAccessInfoCollection$Builder -> com.android.tools.r8.internal.Ip$a:
     java.util.Map directInvokes -> a
     java.util.Map interfaceInvokes -> b
     java.util.Map staticInvokes -> c
@@ -23024,17 +23038,17 @@
     1:1:boolean registerInvokeStaticInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):173:173 -> h
     1:1:boolean registerInvokeSuperInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):181:181 -> i
     1:1:boolean registerInvokeVirtualInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):189:189 -> j
-com.android.tools.r8.graph.MethodAccessInfoCollection$ConcurrentBuilder -> com.android.tools.r8.internal.Kq:
+com.android.tools.r8.graph.MethodAccessInfoCollection$ConcurrentBuilder -> com.android.tools.r8.internal.Jp:
     1:1:void <init>(com.android.tools.r8.graph.MethodAccessInfoCollection$1):210:210 -> <init>
     2:2:void <init>():214:214 -> <init>
-com.android.tools.r8.graph.MethodAccessInfoCollection$IdentityBuilder -> com.android.tools.r8.internal.Jq$b:
+com.android.tools.r8.graph.MethodAccessInfoCollection$IdentityBuilder -> com.android.tools.r8.internal.Ip$b:
     1:1:void <init>(com.android.tools.r8.graph.MethodAccessInfoCollection$1):218:218 -> <init>
     2:2:void <init>():222:222 -> <init>
-com.android.tools.r8.graph.MethodAccessInfoCollection$Modifier -> com.android.tools.r8.internal.Lq:
+com.android.tools.r8.graph.MethodAccessInfoCollection$Modifier -> com.android.tools.r8.internal.Kp:
     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):226:226 -> <init>
     2:2:void <init>(java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map):234:234 -> <init>
     1:5:void addAll(com.android.tools.r8.graph.MethodAccessInfoCollection):238:242 -> a
-com.android.tools.r8.graph.MethodArrayBacking -> com.android.tools.r8.internal.Mq:
+com.android.tools.r8.graph.MethodArrayBacking -> com.android.tools.r8.internal.Lp:
     com.android.tools.r8.graph.DexEncodedMethod[] virtualMethods -> c
     com.android.tools.r8.graph.DexEncodedMethod[] directMethods -> b
     boolean $assertionsDisabled -> a
@@ -23044,7 +23058,7 @@
     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:15:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):217:217 -> a
+    15:15:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):212:212 -> a
     15:15: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
     16:16: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
     17:18:void removeMethods(java.util.Set):132:133 -> a
@@ -23052,7 +23066,7 @@
     26:30:com.android.tools.r8.graph.DexEncodedMethod removeMethodWithIndex(int,com.android.tools.r8.graph.DexEncodedMethod[],java.util.function.Consumer):149:153 -> a
     31:32:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):159:160 -> a
     33:34:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(com.android.tools.r8.graph.DexMethod):222:223 -> a
-    35:35:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):217:217 -> a
+    35:35:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):212:212 -> a
     35:35:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(com.android.tools.r8.graph.DexMethod):223 -> a
     36:36:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(java.util.function.Predicate):232:232 -> a
     37:37:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):274:274 -> a
@@ -23062,7 +23076,7 @@
     42:42:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):282:282 -> a
     43:45: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:301 -> a
     43:45:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):282 -> a
-    46:46:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):217:217 -> a
+    46:46:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):212:212 -> a
     46:46: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
     46:46:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):282 -> a
     47:48: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
@@ -23085,7 +23099,7 @@
     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:45:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):313:315 -> b
-    46:46:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):217:217 -> b
+    46:46:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):212:212 -> b
     46:46:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):315 -> b
     47:51:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):316:320 -> b
     52:52:void replaceAllVirtualMethods(java.util.function.Function):371:371 -> b
@@ -23096,7 +23110,7 @@
     1:2:java.lang.Iterable directMethods():20 -> c
     3:3:void lambda$removeMethod$1(com.android.tools.r8.graph.DexEncodedMethod[]):106:106 -> c
     4:5:com.android.tools.r8.graph.DexEncodedMethod getVirtualMethod(com.android.tools.r8.graph.DexMethod):237:238 -> c
-    6:6:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):217:217 -> c
+    6:6:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):212:212 -> c
     6:6:com.android.tools.r8.graph.DexEncodedMethod getVirtualMethod(com.android.tools.r8.graph.DexMethod):238 -> c
     7:9:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):267:269 -> c
     10:13:void replaceDirectMethods(java.util.function.Function):335:338 -> c
@@ -23124,7 +23138,7 @@
     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.Nq:
+com.android.tools.r8.graph.MethodCollection -> com.android.tools.r8.internal.Mp:
     com.android.tools.r8.graph.DexClass holder -> b
     com.android.tools.r8.graph.MethodCollectionBacking backing -> c
     com.android.tools.r8.graph.DexEncodedMethod cachedClassInitializer -> d
@@ -23253,12 +23267,16 @@
     1:1:int numberOfDirectMethods():72:72 -> j
     1:1:int numberOfVirtualMethods():76:76 -> k
     1:1:int size():80:80 -> l
-    1:1:boolean verify():336:336 -> m
-    2:2:void com.android.tools.r8.graph.MethodCollection.forEachMethod(java.util.function.Consumer):88:88 -> m
-    2:2:boolean verify():336 -> m
-    3:3:boolean verify():340:340 -> m
-    1:1:java.lang.Iterable virtualMethods():149:149 -> n
-com.android.tools.r8.graph.MethodCollectionBacking -> com.android.tools.r8.internal.Oq:
+    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.Np:
     1:1:void <init>():15:15 -> <init>
     void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod) -> a
     void addDirectMethods(java.util.Collection) -> a
@@ -23292,52 +23310,56 @@
     1:1:boolean belongsToDirectPool(com.android.tools.r8.graph.DexEncodedMethod):22:22 -> d
     int numberOfDirectMethods() -> e
     void replaceVirtualMethods(java.util.function.Function) -> e
-    1:1:boolean com.android.tools.r8.graph.DexEncodedMethod.belongsToVirtualPool():638:638 -> e
+    1:1:boolean com.android.tools.r8.graph.DexEncodedMethod.belongsToVirtualPool():651:651 -> 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
     int size() -> g
     boolean verify() -> h
     java.lang.Iterable virtualMethods() -> i
-com.android.tools.r8.graph.MethodMapBacking -> com.android.tools.r8.internal.Wq:
+com.android.tools.r8.graph.MethodMapBacking -> com.android.tools.r8.internal.Vp:
     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.belongsToDirectPool(com.android.tools.r8.graph.DexEncodedMethod):22:22 -> a
-    1:1:com.android.tools.r8.graph.DexEncodedMethod lambda$replaceDirectMethods$7(java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):282 -> a
-    2:2:com.android.tools.r8.graph.DexEncodedMethod lambda$replaceDirectMethods$7(java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):282:282 -> a
-    3:3:void lambda$verify$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.graph.DexEncodedMethod):68:68 -> a
-    4:4:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):217:217 -> a
-    4:4:void lambda$verify$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.graph.DexEncodedMethod):68 -> a
-    5:5:void lambda$verify$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.graph.DexEncodedMethod):68:68 -> a
-    6:6:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.MethodMapBacking.getMethod(com.android.tools.r8.graph.DexMethod):126:126 -> a
-    6:6:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(com.android.tools.r8.graph.DexMethod):144 -> a
-    7:7: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
-    7:7:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.MethodMapBacking.getMethod(com.android.tools.r8.graph.DexMethod):126 -> 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:5:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):212:212 -> a
+    5:5:void lambda$verify$1(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.graph.DexEncodedMethod):68 -> 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:7:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.MethodMapBacking.getMethod(com.android.tools.r8.graph.DexMethod):126:126 -> a
     7:7:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(com.android.tools.r8.graph.DexMethod):144 -> a
-    8:8:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.MethodMapBacking.getMethod(com.android.tools.r8.graph.DexMethod):126:126 -> a
+    8:8: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
+    8:8:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.MethodMapBacking.getMethod(com.android.tools.r8.graph.DexMethod):126 -> a
     8:8:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(com.android.tools.r8.graph.DexMethod):144 -> a
-    9:9:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToDirectPool(com.android.tools.r8.graph.DexEncodedMethod):22:22 -> a
-    9:9:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(com.android.tools.r8.graph.DexMethod):145 -> a
-    10:14:com.android.tools.r8.utils.TraversalContinuation lambda$getMethod$3(java.util.function.Predicate,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexEncodedMethod):133:137 -> a
-    15:16:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(java.util.function.Predicate):150:151 -> a
-    17:17:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):175:175 -> a
-    18:18:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToDirectPool(com.android.tools.r8.graph.DexEncodedMethod):22:22 -> a
-    18:18:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):175 -> a
-    19:20:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):175:176 -> a
-    21:21:void addDirectMethods(java.util.Collection):187:187 -> a
-    22:22:void com.android.tools.r8.graph.MethodMapBacking.addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):175:175 -> a
-    22:22:void addDirectMethods(java.util.Collection):188 -> a
-    23:23:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToDirectPool(com.android.tools.r8.graph.DexEncodedMethod):22:22 -> a
-    23:23:void com.android.tools.r8.graph.MethodMapBacking.addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):175 -> a
+    9:9:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.MethodMapBacking.getMethod(com.android.tools.r8.graph.DexMethod):126:126 -> a
+    9:9:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(com.android.tools.r8.graph.DexMethod):144 -> a
+    10:10:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToDirectPool(com.android.tools.r8.graph.DexEncodedMethod):22:22 -> a
+    10:10:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(com.android.tools.r8.graph.DexMethod):145 -> a
+    11:15: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
+    16:17:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(java.util.function.Predicate):150:151 -> a
+    18:18:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):175:175 -> a
+    19:19:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToDirectPool(com.android.tools.r8.graph.DexEncodedMethod):22:22 -> a
+    19:19:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):175 -> a
+    20:21:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):175:176 -> a
+    22:22:void addDirectMethods(java.util.Collection):187:187 -> a
+    23:23:void com.android.tools.r8.graph.MethodMapBacking.addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):175:175 -> a
     23:23:void addDirectMethods(java.util.Collection):188 -> a
-    24:25:void com.android.tools.r8.graph.MethodMapBacking.addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):175:176 -> a
-    24:25:void addDirectMethods(java.util.Collection):188 -> a
-    26:26:void clearDirectMethods():201:201 -> a
-    27:27:void removeMethods(java.util.Set):216:216 -> a
-    28:35:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):221:228 -> a
+    24:24:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToDirectPool(com.android.tools.r8.graph.DexEncodedMethod):22:22 -> a
+    24:24:void com.android.tools.r8.graph.MethodMapBacking.addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):175 -> a
+    24:24:void addDirectMethods(java.util.Collection):188 -> a
+    25:26:void com.android.tools.r8.graph.MethodMapBacking.addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):175:176 -> a
+    25:26:void addDirectMethods(java.util.Collection):188 -> a
+    27:27:void clearDirectMethods():201:201 -> a
+    28:28:void removeMethods(java.util.Set):216:216 -> a
+    29:33:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):221:225 -> a
+    34:34:int com.android.tools.r8.graph.MethodMapBacking.size():95:95 -> a
+    34:34:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):228 -> a
+    35:35:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):228:228 -> a
     36:36:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap com.android.tools.r8.graph.MethodMapBacking.createMap(int):48:48 -> a
     36:36:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):228 -> a
     37:37:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.<init>(int):165:165 -> a
@@ -23353,10 +23375,10 @@
     45:45: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
     45:45:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):237 -> a
     46:48:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):237:239 -> a
-    49:50:void lambda$setDirectMethods$5(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap,com.android.tools.r8.graph.DexEncodedMethod):231:232 -> a
+    49:50:void lambda$setDirectMethods$6(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap,com.android.tools.r8.graph.DexEncodedMethod):231:232 -> a
     51:51: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
-    51:51:void lambda$setDirectMethods$5(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap,com.android.tools.r8.graph.DexEncodedMethod):232 -> a
-    52:52:void lambda$setDirectMethods$5(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap,com.android.tools.r8.graph.DexEncodedMethod):232:232 -> a
+    51:51:void lambda$setDirectMethods$6(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap,com.android.tools.r8.graph.DexEncodedMethod):232 -> a
+    52:52:void lambda$setDirectMethods$6(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap,com.android.tools.r8.graph.DexEncodedMethod):232:232 -> a
     53:59:void replaceAllDirectMethods(java.util.function.Function):292:298 -> a
     60:60:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):315:315 -> a
     61:61: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
@@ -23365,16 +23387,16 @@
     62:68: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
     62:68: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$6(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap,com.android.tools.r8.graph.DexEncodedMethod):254 -> b
-    2:2:void lambda$setVirtualMethods$6(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap,com.android.tools.r8.graph.DexEncodedMethod):255:255 -> 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:void lambda$setVirtualMethods$6(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap,com.android.tools.r8.graph.DexEncodedMethod):255 -> b
-    4:4:void lambda$setVirtualMethods$6(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap,com.android.tools.r8.graph.DexEncodedMethod):255:255 -> b
+    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:14:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):217:217 -> b
+    14:14:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):212:212 -> b
     14:14:void replace(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.graph.DexEncodedMethod):56 -> b
     15:18:void replace(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.graph.DexEncodedMethod):57:60 -> b
     19:19: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
@@ -23393,29 +23415,32 @@
     31:32:void com.android.tools.r8.graph.MethodMapBacking.addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):181:182 -> b
     31:32:void addVirtualMethods(java.util.Collection):195 -> b
     33:33:void clearVirtualMethods():206:206 -> b
-    34:41:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):244:251 -> b
-    42:42:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap com.android.tools.r8.graph.MethodMapBacking.createMap(int):48:48 -> b
+    34:38:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):244:248 -> b
+    39:39:int com.android.tools.r8.graph.MethodMapBacking.size():95:95 -> b
+    39:39:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):251 -> b
+    40:40:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):251:251 -> b
+    41:41:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap com.android.tools.r8.graph.MethodMapBacking.createMap(int):48:48 -> b
+    41:41:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):251 -> b
+    42:42:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.<init>(int):165:165 -> b
+    42:42:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap com.android.tools.r8.graph.MethodMapBacking.createMap(int):48 -> b
     42:42:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):251 -> b
-    43:43:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.<init>(int):165:165 -> b
-    43:43:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap com.android.tools.r8.graph.MethodMapBacking.createMap(int):48 -> b
-    43:43:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):251 -> b
-    44:44:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):252:252 -> b
-    45:45:void com.android.tools.r8.graph.MethodCollectionBacking.forEachMethod(java.util.function.Consumer):42:42 -> b
-    45:45:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):252 -> b
-    46:48:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):258:260 -> b
-    49:49: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
-    49:49:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):260 -> b
-    50:52:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):260:262 -> b
-    53:53:com.android.tools.r8.graph.DexEncodedMethod lambda$replaceVirtualMethods$8(java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):287:287 -> b
-    54:60:void replaceAllVirtualMethods(java.util.function.Function):303:309 -> b
-    61:61:void virtualizeMethods(java.util.Set):356:356 -> b
-    62:64:boolean com.android.tools.r8.graph.MethodMapBacking.verifyVirtualizedMethods(java.util.Set):360:362 -> b
-    62:64:void virtualizeMethods(java.util.Set):356 -> b
-    65:65: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
-    65:65:boolean com.android.tools.r8.graph.MethodMapBacking.verifyVirtualizedMethods(java.util.Set):362 -> b
+    43:43:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):252:252 -> b
+    44:44:void com.android.tools.r8.graph.MethodCollectionBacking.forEachMethod(java.util.function.Consumer):42:42 -> b
+    44:44:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):252 -> b
+    45:47:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):258:260 -> b
+    48:48: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
+    48:48:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):260 -> b
+    49:51:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):260:262 -> b
+    52:52:com.android.tools.r8.graph.DexEncodedMethod lambda$replaceVirtualMethods$9(java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):287:287 -> b
+    53:59:void replaceAllVirtualMethods(java.util.function.Function):303:309 -> b
+    60:60:void virtualizeMethods(java.util.Set):356:356 -> b
+    61:63:boolean com.android.tools.r8.graph.MethodMapBacking.verifyVirtualizedMethods(java.util.Set):360:362 -> b
+    61:63:void virtualizeMethods(java.util.Set):356 -> b
+    64:64: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
+    64:64:boolean com.android.tools.r8.graph.MethodMapBacking.verifyVirtualizedMethods(java.util.Set):362 -> b
+    64:64:void virtualizeMethods(java.util.Set):356 -> b
+    65:65:boolean com.android.tools.r8.graph.MethodMapBacking.verifyVirtualizedMethods(java.util.Set):362:362 -> b
     65:65:void virtualizeMethods(java.util.Set):356 -> b
-    66:66:boolean com.android.tools.r8.graph.MethodMapBacking.verifyVirtualizedMethods(java.util.Set):362:362 -> b
-    66:66: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
@@ -23447,48 +23472,41 @@
     2:2:void replaceVirtualMethods(java.util.function.Function):287:287 -> e
     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$4(com.android.tools.r8.graph.DexEncodedMethod):216:216 -> 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$4(com.android.tools.r8.graph.DexEncodedMethod):216 -> f
-    11:11:void lambda$removeMethods$4(com.android.tools.r8.graph.DexEncodedMethod):216:216 -> 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: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:1:java.util.Iterator lambda$directMethods$1():116:116 -> k
-    1:1:java.util.Iterator lambda$virtualMethods$2():121:121 -> l
-com.android.tools.r8.graph.NamingLensComparable -> com.android.tools.r8.internal.bs:
+    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.NamingLensComparable -> com.android.tools.r8.internal.Vq:
     1:1:int compareToWithNamingLens(com.android.tools.r8.graph.NamingLensComparable,com.android.tools.r8.naming.NamingLens):13:13 -> a
     2:3:int com.android.tools.r8.utils.structural.CompareToVisitorWithNamingLens.run(java.lang.Object,java.lang.Object,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept):20:21 -> a
     2:3:int compareToWithNamingLens(com.android.tools.r8.graph.NamingLensComparable,com.android.tools.r8.naming.NamingLens):13 -> a
-com.android.tools.r8.graph.NestHostClassAttribute -> com.android.tools.r8.internal.hs:
+com.android.tools.r8.graph.NestHostClassAttribute -> com.android.tools.r8.internal.br:
     com.android.tools.r8.graph.DexType nestHost -> c
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
-    1:1:void <clinit>():13:13 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexType):21:22 -> <init>
-    1:1:com.android.tools.r8.graph.DexType lambda$specify$0(com.android.tools.r8.graph.NestHostClassAttribute):18:18 -> a
-    2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):18:18 -> a
-    3:3:com.android.tools.r8.graph.DexType getNestHost():26:26 -> a
-    4:5:void write(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.naming.NamingLens):34:35 -> a
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():45:45 -> f
-    com.android.tools.r8.utils.structural.StructuralItem self() -> k
-com.android.tools.r8.graph.NestMemberClassAttribute -> com.android.tools.r8.internal.is:
+    1:1:void <clinit>():10:10 -> <clinit>
+    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.cr:
     com.android.tools.r8.graph.DexType nestMember -> c
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
-    1:1:void <clinit>():15:15 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexType):23:24 -> <init>
-    1:1:com.android.tools.r8.graph.DexType lambda$specify$0(com.android.tools.r8.graph.NestMemberClassAttribute):20:20 -> a
-    2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):20:20 -> a
-    3:3:com.android.tools.r8.graph.DexType getNestMember():32:32 -> a
-    4:5:void write(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.naming.NamingLens):36:37 -> a
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():47:47 -> f
-    com.android.tools.r8.utils.structural.StructuralItem self() -> k
-com.android.tools.r8.graph.ObjectAllocationInfoCollection -> com.android.tools.r8.internal.Ft:
-com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl -> com.android.tools.r8.internal.It:
+    1:1:void <clinit>():12:12 -> <clinit>
+    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.Fs:
+com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl -> com.android.tools.r8.internal.Is:
     java.util.Map classesWithAllocationSiteTracking -> b
     java.util.Set classesWithoutAllocationSiteTracking -> c
     java.util.Set interfacesWithUnknownSubtypeHierarchy -> d
@@ -23522,8 +23540,8 @@
     2:2:boolean lambda$removeAllocationsForPrunedItems$5(java.util.Set,com.android.tools.r8.graph.DexProgramClass):231:231 -> b
     1:8:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):79:86 -> c
     1:1:boolean isInterfaceWithUnknownSubtypeHierarchy(com.android.tools.r8.graph.DexProgramClass):112:112 -> d
-com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$1 -> com.android.tools.r8.internal.Gt:
-com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder -> com.android.tools.r8.internal.It$a:
+com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$1 -> com.android.tools.r8.internal.Gs:
+com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder -> com.android.tools.r8.internal.Is$a:
     com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder$Data data -> h
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():255:255 -> <clinit>
@@ -23536,7 +23554,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):325 -> 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):326:335 -> a
     37:37:boolean recordInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):342:342 -> a
-    38:38:boolean com.android.tools.r8.graph.DexClass.isAnnotation():571:571 -> a
+    38:38:boolean com.android.tools.r8.graph.DexClass.isAnnotation():553:553 -> a
     38:38:boolean recordInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):343 -> a
     39:41:boolean recordInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):343:345 -> a
     42:42:void recordInstantiatedLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfo):353:353 -> a
@@ -23552,21 +23570,26 @@
     70:114:com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder rewrittenWithLens(com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):414:458 -> a
     115:122:void lambda$rewrittenWithLens$6(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass):417:424 -> a
     123:136:void lambda$rewrittenWithLens$8(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass,java.util.Set):428:441 -> a
-    137:139:java.util.Set com.android.tools.r8.utils.LensUtils.rewrittenWithRenamedSignature(java.util.Set,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):17:19 -> a
-    137:139:void lambda$rewrittenWithLens$8(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass,java.util.Set):443 -> a
-    140:140:void lambda$rewrittenWithLens$8(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass,java.util.Set):442:442 -> a
-    141:148:void lambda$rewrittenWithLens$9(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexType,java.util.List):460:467 -> a
-    149:151:void lambda$validate$10(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass,java.util.Set):476:478 -> a
-    152:157:void lambda$validate$12(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType,java.util.List):488:493 -> a
-    158:158:void lambda$validate$12(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType,java.util.List):492:492 -> a
-    159:161:void lambda$validate$13(com.android.tools.r8.graph.DexType,java.util.Set):501:503 -> a
-    162:162:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder.isImmediateSuperType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):523:523 -> a
-    162:162:void lambda$validate$13(com.android.tools.r8.graph.DexType,java.util.Set):503 -> a
-    163:163:void lambda$validate$13(com.android.tools.r8.graph.DexType,java.util.Set):503:503 -> a
-    164:165:boolean verifyAllSuperTypesAreInHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.Iterable):511:512 -> a
-    166:167:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder.typeIsInHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType):518:519 -> a
-    166:167:boolean verifyAllSuperTypesAreInHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.Iterable):512 -> a
-    168:168:boolean verifyAllSuperTypesAreInHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.Iterable):512:512 -> a
+    137:138:java.util.Set com.android.tools.r8.utils.LensUtils.rewrittenWithRenamedSignature(java.util.Set,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):17:18 -> a
+    137:138:void lambda$rewrittenWithLens$8(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass,java.util.Set):443 -> a
+    139:139:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.GraphLens.mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):328:328 -> a
+    139:139:java.util.Set com.android.tools.r8.utils.LensUtils.rewrittenWithRenamedSignature(java.util.Set,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):19 -> a
+    139:139:void lambda$rewrittenWithLens$8(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass,java.util.Set):443 -> a
+    140:140:java.util.Set com.android.tools.r8.utils.LensUtils.rewrittenWithRenamedSignature(java.util.Set,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):19:19 -> a
+    140:140:void lambda$rewrittenWithLens$8(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass,java.util.Set):443 -> a
+    141:141:void lambda$rewrittenWithLens$8(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass,java.util.Set):442:442 -> a
+    142:149:void lambda$rewrittenWithLens$9(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexType,java.util.List):460:467 -> a
+    150:152:void lambda$validate$10(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass,java.util.Set):476:478 -> a
+    153:158:void lambda$validate$12(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType,java.util.List):488:493 -> a
+    159:159:void lambda$validate$12(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType,java.util.List):492:492 -> a
+    160:162:void lambda$validate$13(com.android.tools.r8.graph.DexType,java.util.Set):501:503 -> a
+    163:163:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder.isImmediateSuperType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):523:523 -> a
+    163:163:void lambda$validate$13(com.android.tools.r8.graph.DexType,java.util.Set):503 -> a
+    164:164:void lambda$validate$13(com.android.tools.r8.graph.DexType,java.util.Set):503:503 -> a
+    165:166:boolean verifyAllSuperTypesAreInHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.Iterable):511:512 -> a
+    167:168:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder.typeIsInHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType):518:519 -> a
+    167:168:boolean verifyAllSuperTypesAreInHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.Iterable):512 -> a
+    169:169:boolean verifyAllSuperTypesAreInHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.Iterable):512:512 -> a
     1:1:java.util.List lambda$recordInstantiatedLambdaInterface$1(com.android.tools.r8.graph.DexType):353:353 -> b
     2:12:void repopulateInstantiatedHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier):358:368 -> b
     13:13:void lambda$repopulateInstantiatedHierarchy$3(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass):363:363 -> b
@@ -23576,14 +23599,14 @@
     1:1:java.util.Set lambda$recordDirectAllocationSite$0(com.android.tools.r8.graph.DexProgramClass):329:329 -> e
     1:1:java.util.Set lambda$rewrittenWithLens$7(com.android.tools.r8.graph.DexProgramClass):441:441 -> f
     1:3:void markNoLongerInstantiated(com.android.tools.r8.graph.DexProgramClass):405:407 -> g
-com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder$Data -> com.android.tools.r8.internal.Ht:
+com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder$Data -> com.android.tools.r8.internal.Hs:
     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):257:257 -> <init>
     2:4:void <init>(boolean,com.android.tools.r8.shaking.GraphReporter):262:264 -> <init>
     1:1:boolean access$300(com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder$Data):257:257 -> a
     1:1:com.android.tools.r8.shaking.GraphReporter access$400(com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder$Data):257:257 -> b
-com.android.tools.r8.graph.ObjectToOffsetMapping -> com.android.tools.r8.internal.ju:
+com.android.tools.r8.graph.ObjectToOffsetMapping -> com.android.tools.r8.internal.gt:
     com.android.tools.r8.utils.structural.CompareToVisitor compareToVisitor -> n
     com.android.tools.r8.graph.InitClassLens initClassLens -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap methodHandles -> l
@@ -23639,12 +23662,12 @@
     1:1:java.util.Collection getStrings():264:264 -> l
     1:1:java.util.Collection getTypes():252:252 -> m
     1:1:boolean hasJumboStrings():276:276 -> n
-com.android.tools.r8.graph.ObjectToOffsetMapping$1 -> com.android.tools.r8.internal.ju$a:
+com.android.tools.r8.graph.ObjectToOffsetMapping$1 -> com.android.tools.r8.internal.gt$a:
     com.android.tools.r8.graph.ObjectToOffsetMapping val$mapping -> e
     1:1:void <init>(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.naming.NamingLens,java.util.function.ToIntFunction,java.util.function.ToIntFunction,com.android.tools.r8.graph.ObjectToOffsetMapping):112:112 -> <init>
     1:1:int visitDexField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):116:116 -> a
     2:4:int visitDexMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):121:121 -> a
-com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized -> com.android.tools.r8.internal.ju$b:
+com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized -> com.android.tools.r8.internal.gt$b:
     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):176:176 -> <init>
@@ -23656,7 +23679,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):199 -> a
     20:23:int getDepth(com.android.tools.r8.graph.DexProgramClass):200:203 -> a
-com.android.tools.r8.graph.OffsetToObjectMapping -> com.android.tools.r8.internal.qu:
+com.android.tools.r8.graph.OffsetToObjectMapping -> com.android.tools.r8.internal.kt:
     com.android.tools.r8.graph.DexProto[] protos -> d
     com.android.tools.r8.graph.DexMethod[] methods -> c
     com.android.tools.r8.graph.DexMethodHandle[] methodHandles -> i
@@ -23696,7 +23719,7 @@
     1:2:void initializeProtos(int):28:29 -> l
     1:2:void initializeStrings(int):43:44 -> m
     1:2:void initializeTypes(int):38:39 -> n
-com.android.tools.r8.graph.ParameterAnnotationsList -> com.android.tools.r8.graph.H0:
+com.android.tools.r8.graph.ParameterAnnotationsList -> com.android.tools.r8.graph.F0:
     com.android.tools.r8.graph.ParameterAnnotationsList EMPTY_PARAMETER_ANNOTATIONS_LIST -> a
     com.android.tools.r8.graph.DexAnnotationSet[] values -> c
     int missingParameterAnnotations -> d
@@ -23715,8 +23738,8 @@
     13:29:com.android.tools.r8.graph.ParameterAnnotationsList keepIf(java.util.function.Predicate):199:215 -> a
     30:32:com.android.tools.r8.graph.ParameterAnnotationsList rewrite(java.util.function.Function):219:221 -> a
     1:1:int lambda$specify$1(com.android.tools.r8.graph.ParameterAnnotationsList):51:51 -> b
+    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():80:80 -> e
     1:3:boolean equals(java.lang.Object):97:99 -> equals
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():80:80 -> f
     1:5:com.android.tools.r8.graph.DexAnnotationSet get(int):166:170 -> g
     1:2:boolean isMissing(int):153:154 -> h
     1:1:int hashCode():89:89 -> hashCode
@@ -23726,9 +23749,9 @@
     1:1:int size():135:135 -> size
     1:1:int countNonMissing():143:143 -> t
     1:1:com.android.tools.r8.graph.ParameterAnnotationsList empty():55:55 -> u
-com.android.tools.r8.graph.PinnedPredicate -> com.android.tools.r8.internal.hv:
+com.android.tools.r8.graph.PinnedPredicate -> com.android.tools.r8.internal.au:
     boolean isPinned(com.android.tools.r8.graph.DexDefinition) -> a
-com.android.tools.r8.graph.ProgramClassVisitor -> com.android.tools.r8.internal.Zv:
+com.android.tools.r8.graph.ProgramClassVisitor -> com.android.tools.r8.internal.Su:
     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>
@@ -23740,38 +23763,38 @@
     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.aw:
-    com.android.tools.r8.graph.DexProgramClass getContextClass() -> b
-    com.android.tools.r8.graph.DexDefinition getDefinition() -> c
-    boolean isProgramMethod() -> d
-    com.android.tools.r8.graph.ProgramMember asProgramMember() -> h
+com.android.tools.r8.graph.ProgramDefinition -> com.android.tools.r8.internal.Tu:
+    com.android.tools.r8.graph.DexProgramClass getContextClass() -> a
+    com.android.tools.r8.graph.DexDefinition getDefinition() -> b
+    boolean isProgramMethod() -> c
+    com.android.tools.r8.graph.ProgramMember asProgramMember() -> g
     com.android.tools.r8.graph.DexType getContextType() -> i
     com.android.tools.r8.graph.ProgramField asProgramField() -> l
     com.android.tools.r8.graph.DexProgramClass asProgramClass() -> m
     boolean isProgramClass() -> o
     com.android.tools.r8.graph.ProgramMethod asProgramMethod() -> p
     boolean isProgramField() -> q
-com.android.tools.r8.graph.ProgramDexCode -> com.android.tools.r8.internal.bw:
+com.android.tools.r8.graph.ProgramDexCode -> com.android.tools.r8.internal.Uu:
     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>
     1:1:com.android.tools.r8.graph.DexCode getCode():18:18 -> a
     1:1:com.android.tools.r8.graph.ProgramMethod getMethod():22:22 -> b
-com.android.tools.r8.graph.ProgramField -> com.android.tools.r8.graph.I0:
+com.android.tools.r8.graph.ProgramField -> com.android.tools.r8.graph.G0:
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):13:13 -> <init>
-    1:3:com.android.tools.r8.graph.DexProgramClass getHolder():51:53 -> a
-    1:1:com.android.tools.r8.graph.DexDefinition getDefinition():9:9 -> c
-    com.android.tools.r8.graph.ProgramMember asProgramMember() -> h
+    1:1:com.android.tools.r8.graph.DexDefinition getDefinition():9:9 -> b
+    com.android.tools.r8.graph.ProgramMember asProgramMember() -> g
+    1:3:com.android.tools.r8.graph.DexProgramClass getHolder():51:53 -> h
     com.android.tools.r8.graph.ProgramField asProgramField() -> l
     1:1:com.android.tools.r8.graph.DexClass getHolder():9:9 -> n
-com.android.tools.r8.graph.ProgramMember -> com.android.tools.r8.internal.dw:
-    com.android.tools.r8.graph.DexProgramClass getHolder() -> a
-    1:1:com.android.tools.r8.graph.DexProgramClass getContextClass():12:12 -> b
-    com.android.tools.r8.graph.DexEncodedMember getDefinition() -> c
-    com.android.tools.r8.graph.DexType getHolderType() -> e
-com.android.tools.r8.graph.ProgramMethod -> com.android.tools.r8.graph.J0:
+com.android.tools.r8.graph.ProgramMember -> com.android.tools.r8.internal.Wu:
+    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
+    com.android.tools.r8.graph.DexProgramClass getHolder() -> h
+com.android.tools.r8.graph.ProgramMethod -> com.android.tools.r8.graph.H0:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):21:21 -> <init>
@@ -23780,15 +23803,12 @@
     7:7:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
     7:7:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):59 -> a
     8:8:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):61:61 -> a
-    9:11:com.android.tools.r8.graph.DexProgramClass getHolder():87:89 -> a
-    1:1:com.android.tools.r8.graph.DexDefinition getDefinition():17:17 -> c
-    com.android.tools.r8.graph.ProgramMember asProgramMember() -> h
+    1:1:com.android.tools.r8.graph.DexDefinition getDefinition():17:17 -> b
+    com.android.tools.r8.graph.ProgramMember asProgramMember() -> g
+    1:3:com.android.tools.r8.graph.DexProgramClass getHolder():87:89 -> h
     1:1:com.android.tools.r8.graph.DexClass getHolder():17:17 -> n
     com.android.tools.r8.graph.ProgramMethod asProgramMethod() -> p
-    1:1:com.android.tools.r8.position.MethodPosition getPosition():93:93 -> w
-    2:2:com.android.tools.r8.position.MethodPosition com.android.tools.r8.graph.DexEncodedMethod.getPosition():1439:1439 -> w
-    2:2:com.android.tools.r8.position.MethodPosition getPosition():93 -> w
-com.android.tools.r8.graph.ProgramPackage -> com.android.tools.r8.internal.iw:
+com.android.tools.r8.graph.ProgramPackage -> com.android.tools.r8.internal.bv:
     java.util.Set classes -> c
     boolean $assertionsDisabled -> a
     java.lang.String packageDescriptor -> b
@@ -23805,16 +23825,15 @@
     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.jw:
+com.android.tools.r8.graph.ProgramPackageCollection -> com.android.tools.r8.internal.cv:
     java.util.Map packages -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:2:void <init>(java.util.Map):15:16 -> <init>
     1:1:com.android.tools.r8.graph.ProgramPackageCollection createEmpty():29:29 -> a
     2:4:boolean addProgramClass(com.android.tools.r8.graph.DexProgramClass):33:35 -> a
-    1:2:boolean contains(com.android.tools.r8.graph.DexProgramClass):39:40 -> b
-    1:1:boolean isEmpty():44:44 -> isEmpty
-    1:1:java.util.Iterator iterator():49:49 -> iterator
-com.android.tools.r8.graph.PrunedItems -> com.android.tools.r8.internal.qy:
+    1:1:boolean isEmpty():39:39 -> isEmpty
+    1:1:java.util.Iterator iterator():44:44 -> iterator
+com.android.tools.r8.graph.PrunedItems -> com.android.tools.r8.internal.hx:
     com.android.tools.r8.graph.DexApplication prunedApp -> a
     java.util.Set noLongerSyntheticItems -> c
     java.util.Set removedClasses -> d
@@ -23822,26 +23841,25 @@
     1:1:void <init>(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.graph.PrunedItems$1):11:11 -> <init>
     2:6:void <init>(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Set,java.util.Set):22:26 -> <init>
     1:1:com.android.tools.r8.graph.PrunedItems$Builder builder():30:30 -> a
-    2:2:boolean isRemoved(com.android.tools.r8.graph.DexType):42:42 -> a
-    1:1:java.util.Set getAdditionalPinnedItems():50:50 -> b
-    1:1:java.util.Set getNoLongerSyntheticItems():54:54 -> c
-    1:1:com.android.tools.r8.graph.DexApplication getPrunedApp():46:46 -> d
-    1:1:java.util.Set getRemovedClasses():62:62 -> e
-    1:1:boolean hasRemovedClasses():58:58 -> f
+    1:1:java.util.Set getAdditionalPinnedItems():46:46 -> b
+    1:1:java.util.Set getNoLongerSyntheticItems():50:50 -> c
+    1:1:com.android.tools.r8.graph.DexApplication getPrunedApp():42:42 -> d
+    1:1:java.util.Set getRemovedClasses():58:58 -> e
+    1:1:boolean hasRemovedClasses():54:54 -> f
     1:1:boolean isEmpty():38:38 -> g
-com.android.tools.r8.graph.PrunedItems$1 -> com.android.tools.r8.internal.py:
-com.android.tools.r8.graph.PrunedItems$Builder -> com.android.tools.r8.internal.qy$a:
+com.android.tools.r8.graph.PrunedItems$1 -> com.android.tools.r8.internal.gx:
+com.android.tools.r8.graph.PrunedItems$Builder -> com.android.tools.r8.internal.hx$a:
     com.android.tools.r8.graph.DexApplication prunedApp -> a
     java.util.Set noLongerSyntheticItems -> c
     java.util.Set removedClasses -> d
     java.util.Set additionalPinnedItems -> b
-    1:7:void <init>():65:71 -> <init>
-    1:1:com.android.tools.r8.graph.PrunedItems$Builder setPrunedApp(com.android.tools.r8.graph.DexApplication):74:74 -> a
-    2:2:com.android.tools.r8.graph.PrunedItems$Builder addAdditionalPinnedItems(java.util.Collection):80:80 -> a
-    3:3:com.android.tools.r8.graph.PrunedItems$Builder addNoLongerSyntheticItems(java.util.Set):85:85 -> a
-    4:4:com.android.tools.r8.graph.PrunedItems build():96:96 -> a
-    1:2:com.android.tools.r8.graph.PrunedItems$Builder addRemovedClasses(java.util.Set):90:91 -> b
-com.android.tools.r8.graph.ResolutionResult -> com.android.tools.r8.graph.K0:
+    1:7:void <init>():61:67 -> <init>
+    1:1:com.android.tools.r8.graph.PrunedItems$Builder setPrunedApp(com.android.tools.r8.graph.DexApplication):70:70 -> a
+    2:2:com.android.tools.r8.graph.PrunedItems$Builder addAdditionalPinnedItems(java.util.Collection):76:76 -> a
+    3:3:com.android.tools.r8.graph.PrunedItems$Builder addNoLongerSyntheticItems(java.util.Set):81:81 -> a
+    4:4:com.android.tools.r8.graph.PrunedItems build():92:92 -> a
+    1:2:com.android.tools.r8.graph.PrunedItems$Builder addRemovedClasses(java.util.Set):86:87 -> b
+com.android.tools.r8.graph.ResolutionResult -> com.android.tools.r8.graph.I0:
     1:1:void <init>():21:21 -> <init>
     com.android.tools.r8.graph.DexClass getInitialResolutionHolder() -> a
     com.android.tools.r8.graph.DexEncodedMethod lookupInvokeDirectTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> a
@@ -23861,72 +23879,72 @@
     boolean isFailedResolution() -> h
     boolean isSingleResolution() -> i
     boolean isVirtualTarget() -> j
-com.android.tools.r8.graph.ResolutionResult$1 -> com.android.tools.r8.graph.K0$a:
-com.android.tools.r8.graph.ResolutionResult$ArrayCloneMethodResult -> com.android.tools.r8.graph.K0$b:
+com.android.tools.r8.graph.ResolutionResult$1 -> com.android.tools.r8.graph.I0$a:
+com.android.tools.r8.graph.ResolutionResult$ArrayCloneMethodResult -> com.android.tools.r8.graph.I0$b:
     com.android.tools.r8.graph.ResolutionResult$ArrayCloneMethodResult INSTANCE -> a
-    1:1:void <clinit>():755:755 -> <clinit>
-    1:1:void <init>():757:757 -> <init>
+    1:1:void <clinit>():759:759 -> <clinit>
+    1:1:void <init>():761:761 -> <init>
     com.android.tools.r8.graph.DexEncodedMethod lookupInvokeDirectTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> a
     com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> a
     1:1:com.android.tools.r8.graph.LookupResult$LookupResultSuccess com.android.tools.r8.graph.LookupResult.getIncompleteEmptyResult():50:50 -> a
-    1:1:com.android.tools.r8.graph.LookupResult com.android.tools.r8.graph.ResolutionResult$EmptyResult.lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):721 -> a
-    1:1:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):753 -> a
+    1:1:com.android.tools.r8.graph.LookupResult com.android.tools.r8.graph.ResolutionResult$EmptyResult.lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):725 -> a
+    1:1:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):757 -> a
     2:2:com.android.tools.r8.graph.LookupResult$LookupResultSuccess com.android.tools.r8.graph.LookupResult.getIncompleteEmptyResult():50:50 -> a
-    2:2:com.android.tools.r8.graph.LookupResult com.android.tools.r8.graph.ResolutionResult$EmptyResult.lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):730 -> a
-    2:2:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):753 -> a
-    3:3:com.android.tools.r8.utils.OptionalBool isAccessibleFrom(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy):764:764 -> a
+    2:2:com.android.tools.r8.graph.LookupResult com.android.tools.r8.graph.ResolutionResult$EmptyResult.lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):734 -> a
+    2:2:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):757 -> a
+    3:3:com.android.tools.r8.utils.OptionalBool isAccessibleFrom(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy):768:768 -> a
     com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> b
-    1:1:com.android.tools.r8.utils.OptionalBool isAccessibleForVirtualDispatchFrom(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy):770:770 -> b
+    1:1:com.android.tools.r8.utils.OptionalBool isAccessibleForVirtualDispatchFrom(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy):774:774 -> b
     com.android.tools.r8.graph.DexEncodedMethod lookupInvokeStaticTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> c
     com.android.tools.r8.graph.DexClassAndMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> d
     boolean isVirtualTarget() -> j
-com.android.tools.r8.graph.ResolutionResult$ClassNotFoundResult -> com.android.tools.r8.graph.K0$c:
+com.android.tools.r8.graph.ResolutionResult$ClassNotFoundResult -> com.android.tools.r8.graph.I0$c:
     com.android.tools.r8.graph.ResolutionResult$ClassNotFoundResult INSTANCE -> a
-    1:1:void <clinit>():815:815 -> <clinit>
-    1:1:void <init>():817:817 -> <init>
-com.android.tools.r8.graph.ResolutionResult$EmptyResult -> com.android.tools.r8.graph.K0$d:
-    1:1:void <init>():689:689 -> <init>
-    1:1:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.AppInfoWithClassHierarchy):689:689 -> a
+    1:1:void <clinit>():819:819 -> <clinit>
+    1:1:void <init>():821:821 -> <init>
+com.android.tools.r8.graph.ResolutionResult$EmptyResult -> com.android.tools.r8.graph.I0$d:
+    1:1:void <init>():693:693 -> <init>
+    1:1:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.AppInfoWithClassHierarchy):693:693 -> a
     com.android.tools.r8.graph.DexClassAndMethod lookupInvokeSpecialTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> b
     com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> b
-com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult -> com.android.tools.r8.graph.K0$e:
-    1:1:void <init>():780:780 -> <init>
+com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult -> com.android.tools.r8.graph.I0$e:
+    1:1:void <init>():784:784 -> <init>
     void forEachFailureDependency(java.util.function.Consumer) -> a
     com.android.tools.r8.graph.DexEncodedMethod lookupInvokeDirectTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> a
     com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> a
     1:1:com.android.tools.r8.graph.LookupResult$LookupResultSuccess com.android.tools.r8.graph.LookupResult.getIncompleteEmptyResult():50:50 -> a
-    1:1:com.android.tools.r8.graph.LookupResult com.android.tools.r8.graph.ResolutionResult$EmptyResult.lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):721 -> a
-    1:1:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):780 -> a
+    1:1:com.android.tools.r8.graph.LookupResult com.android.tools.r8.graph.ResolutionResult$EmptyResult.lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):725 -> a
+    1:1:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):784 -> a
     2:2:com.android.tools.r8.graph.LookupResult$LookupResultSuccess com.android.tools.r8.graph.LookupResult.getIncompleteEmptyResult():50:50 -> a
-    2:2:com.android.tools.r8.graph.LookupResult com.android.tools.r8.graph.ResolutionResult$EmptyResult.lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):730 -> a
-    2:2:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):780 -> a
-    3:3:com.android.tools.r8.utils.OptionalBool isAccessibleFrom(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy):799:799 -> a
+    2:2:com.android.tools.r8.graph.LookupResult com.android.tools.r8.graph.ResolutionResult$EmptyResult.lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):734 -> a
+    2:2:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):784 -> a
+    3:3:com.android.tools.r8.utils.OptionalBool isAccessibleFrom(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy):803:803 -> a
     com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> b
-    1:1:com.android.tools.r8.utils.OptionalBool isAccessibleForVirtualDispatchFrom(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy):805:805 -> b
+    1:1:com.android.tools.r8.utils.OptionalBool isAccessibleForVirtualDispatchFrom(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy):809:809 -> b
     com.android.tools.r8.graph.DexEncodedMethod lookupInvokeStaticTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> c
     com.android.tools.r8.graph.DexClassAndMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> d
     com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult asFailedResolution() -> e
     boolean isFailedResolution() -> h
     boolean isVirtualTarget() -> j
-com.android.tools.r8.graph.ResolutionResult$FailedResolutionWithCausingMethods -> com.android.tools.r8.graph.K0$f:
+com.android.tools.r8.graph.ResolutionResult$FailedResolutionWithCausingMethods -> com.android.tools.r8.graph.I0$f:
     java.util.Collection methodsCausingError -> a
-    1:1:void <init>(java.util.Collection,com.android.tools.r8.graph.ResolutionResult$1):822:822 -> <init>
-    2:3:void <init>(java.util.Collection):826:827 -> <init>
-    1:1:void forEachFailureDependency(java.util.function.Consumer):832:832 -> a
-com.android.tools.r8.graph.ResolutionResult$IllegalAccessOrNoSuchMethodResult -> com.android.tools.r8.graph.K0$g:
+    1:1:void <init>(java.util.Collection,com.android.tools.r8.graph.ResolutionResult$1):826:826 -> <init>
+    2:3:void <init>(java.util.Collection):830:831 -> <init>
+    1:1:void forEachFailureDependency(java.util.function.Consumer):836:836 -> a
+com.android.tools.r8.graph.ResolutionResult$IllegalAccessOrNoSuchMethodResult -> com.android.tools.r8.graph.I0$g:
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():861:861 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod):864:864 -> <init>
-com.android.tools.r8.graph.ResolutionResult$IncompatibleClassResult -> com.android.tools.r8.graph.K0$h:
+    1:1:void <clinit>():865:865 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod):868:868 -> <init>
+com.android.tools.r8.graph.ResolutionResult$IncompatibleClassResult -> com.android.tools.r8.graph.I0$h:
     com.android.tools.r8.graph.ResolutionResult$IncompatibleClassResult INSTANCE -> b
-    1:2:void <clinit>():837:838 -> <clinit>
-    1:1:void <init>(java.util.Collection):841:841 -> <init>
-    1:3:com.android.tools.r8.graph.ResolutionResult$IncompatibleClassResult create(java.util.Collection):845:847 -> a
-com.android.tools.r8.graph.ResolutionResult$NoSuchMethodResult -> com.android.tools.r8.graph.K0$i:
+    1:2:void <clinit>():841:842 -> <clinit>
+    1:1:void <init>(java.util.Collection):845:845 -> <init>
+    1:3:com.android.tools.r8.graph.ResolutionResult$IncompatibleClassResult create(java.util.Collection):849:851 -> a
+com.android.tools.r8.graph.ResolutionResult$NoSuchMethodResult -> com.android.tools.r8.graph.I0$i:
     com.android.tools.r8.graph.ResolutionResult$NoSuchMethodResult INSTANCE -> a
-    1:1:void <clinit>():858:858 -> <clinit>
-    1:1:void <init>():856:856 -> <init>
-com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult -> com.android.tools.r8.graph.K0$j:
+    1:1:void <clinit>():862:862 -> <clinit>
+    1:1:void <init>():860:860 -> <init>
+com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult -> com.android.tools.r8.graph.I0$j:
     com.android.tools.r8.graph.DexClass initialResolutionHolder -> b
     com.android.tools.r8.graph.DexEncodedMethod resolvedMethod -> d
     boolean $assertionsDisabled -> a
@@ -23949,63 +23967,72 @@
     6:26:com.android.tools.r8.graph.DexClassAndMethod internalInvokeSpecialOrSuper(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.BiPredicate):314:334 -> a
     27:27:com.android.tools.r8.graph.DexEncodedMethod getResolvedMethod():163:163 -> a
     27:27:com.android.tools.r8.graph.DexClassAndMethod internalInvokeSpecialOrSuper(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.BiPredicate):344 -> a
-    28:59:com.android.tools.r8.graph.DexClassAndMethod internalInvokeSpecialOrSuper(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.BiPredicate):344:375 -> a
-    60:64:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeDirectTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):299:303 -> a
-    65:65:boolean isSuperclass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):383:383 -> a
-    65:65:boolean lambda$lookupInvokeSpecialTarget$0(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):230 -> a
-    66:68:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):393:395 -> a
-    69:69:com.android.tools.r8.graph.LookupResult$LookupResultFailure com.android.tools.r8.graph.LookupResult.createFailedResult():46:46 -> a
-    69:69:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):396 -> a
-    70:78:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):398:406 -> a
-    79:84:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):405:410 -> a
-    85:85:com.android.tools.r8.graph.LookupResult$LookupResultSuccess com.android.tools.r8.graph.LookupResult.createResult(java.util.Map,java.util.List,com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState):42:42 -> a
-    85:85:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):404 -> a
-    86:118:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):412:444 -> a
-    119:119:com.android.tools.r8.graph.LookupResult$LookupResultSuccess com.android.tools.r8.graph.LookupResult.createResult(java.util.Map,java.util.List,com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState):42:42 -> a
-    119:119:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):441 -> a
-    120:126:void lambda$lookupVirtualDispatchTargets$2(com.android.tools.r8.graph.LookupCompletenessHelper,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexProgramClass):419:425 -> a
-    127:127:void lambda$lookupVirtualDispatchTargets$2(com.android.tools.r8.graph.LookupCompletenessHelper,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexProgramClass):424:424 -> a
-    128:130:void lambda$lookupVirtualDispatchTargets$3(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.List,java.util.Map,com.android.tools.r8.ir.desugar.LambdaDescriptor):429:429 -> a
-    132:138:void lambda$lookupVirtualDispatchTargets$3(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.List,java.util.Map,com.android.tools.r8.ir.desugar.LambdaDescriptor):431:437 -> a
-    139:139:void lambda$lookupVirtualDispatchTargets$3(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.List,java.util.Map,com.android.tools.r8.ir.desugar.LambdaDescriptor):436:436 -> a
-    140:143:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):453:456 -> a
-    144:161:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):455:472 -> a
-    162:162:com.android.tools.r8.graph.InstantiatedSubTypeInfo instantiatedSubTypeInfoForInstantiatedType(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.Box):482:482 -> a
-    163:174:void lambda$instantiatedSubTypeInfoForInstantiatedType$5(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):483:494 -> a
-    175:177:void lambda$instantiatedSubTypeInfoForInstantiatedType$4(java.util.function.Consumer,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexProgramClass):485:487 -> a
-    178:214:void addVirtualDispatchTarget(com.android.tools.r8.graph.DexClassAndMethod,boolean,java.util.Map):507:543 -> a
-    215:217:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.AppInfoWithClassHierarchy):555:557 -> a
-    218:218:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):563:563 -> a
-    219:219:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):569:569 -> a
-    220:220:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):217:217 -> a
-    220:220:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):569 -> a
-    221:222:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):570:571 -> a
-    223:223:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
-    223:223:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):571 -> a
-    224:229:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):572:577 -> a
-    230:230:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):629:629 -> a
-    230:230:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):579 -> a
-    231:243: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):584:596 -> a
-    244:244:com.android.tools.r8.graph.DexEncodedMethod lookupOverrideCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):640:640 -> a
-    244:244: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):598 -> a
-    245:245:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):484:484 -> a
-    245:245:com.android.tools.r8.graph.DexEncodedMethod lookupOverrideCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):640 -> a
-    245:245: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):598 -> a
-    246:248:com.android.tools.r8.graph.DexEncodedMethod lookupOverrideCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):641:643 -> a
-    246:248: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):598 -> a
-    249:250: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):599:600 -> a
-    251:257: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):651:657 -> a
-    251:257: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):600 -> a
-    258:258:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):484:484 -> a
-    258:258: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):657 -> a
-    258:258: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):600 -> a
-    259:261: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):659:661 -> a
-    259:261: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):600 -> a
-    262:262: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):612:612 -> a
-    263:273: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:616 -> a
-    274:274:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):624:624 -> a
-    274:274: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 -> a
-    275:282:boolean isOverriding(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):678:685 -> a
+    28:28:com.android.tools.r8.graph.DexClassAndMethod 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.DexClassAndMethod com.android.tools.r8.graph.DexClass.lookupClassMethod(com.android.tools.r8.graph.DexMethod):485:485 -> a
+    29:29:com.android.tools.r8.graph.DexClassAndMethod internalInvokeSpecialOrSuper(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.BiPredicate):348 -> a
+    30:30:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.DexClass.toClassMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod):489:489 -> a
+    30:30:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.DexClass.lookupClassMethod(com.android.tools.r8.graph.DexMethod):485 -> a
+    30:30:com.android.tools.r8.graph.DexClassAndMethod internalInvokeSpecialOrSuper(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.BiPredicate):348 -> a
+    31:54:com.android.tools.r8.graph.DexClassAndMethod internalInvokeSpecialOrSuper(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.BiPredicate):352:375 -> a
+    55:59:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeDirectTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):299:303 -> a
+    60:60:boolean isSuperclass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):383:383 -> a
+    60:60:boolean lambda$lookupInvokeSpecialTarget$0(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):230 -> a
+    61:63:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):393:395 -> a
+    64:64:com.android.tools.r8.graph.LookupResult$LookupResultFailure com.android.tools.r8.graph.LookupResult.createFailedResult():46:46 -> a
+    64:64:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):396 -> a
+    65:73:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):398:406 -> a
+    74:79:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):405:410 -> a
+    80:80:com.android.tools.r8.graph.LookupResult$LookupResultSuccess com.android.tools.r8.graph.LookupResult.createResult(java.util.Map,java.util.List,com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState):42:42 -> a
+    80:80:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):404 -> a
+    81:113:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):412:444 -> a
+    114:114:com.android.tools.r8.graph.LookupResult$LookupResultSuccess com.android.tools.r8.graph.LookupResult.createResult(java.util.Map,java.util.List,com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState):42:42 -> a
+    114:114:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):441 -> a
+    115:121:void lambda$lookupVirtualDispatchTargets$2(com.android.tools.r8.graph.LookupCompletenessHelper,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexProgramClass):419:425 -> a
+    122:122:void lambda$lookupVirtualDispatchTargets$2(com.android.tools.r8.graph.LookupCompletenessHelper,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexProgramClass):424:424 -> a
+    123:125:void lambda$lookupVirtualDispatchTargets$3(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.List,java.util.Map,com.android.tools.r8.ir.desugar.LambdaDescriptor):429:429 -> a
+    127:133:void lambda$lookupVirtualDispatchTargets$3(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.List,java.util.Map,com.android.tools.r8.ir.desugar.LambdaDescriptor):431:437 -> a
+    134:134:void lambda$lookupVirtualDispatchTargets$3(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.List,java.util.Map,com.android.tools.r8.ir.desugar.LambdaDescriptor):436:436 -> a
+    135:138:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):453:456 -> a
+    139:156:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):455:472 -> a
+    157:157:com.android.tools.r8.graph.InstantiatedSubTypeInfo instantiatedSubTypeInfoForInstantiatedType(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.Box):482:482 -> a
+    158:169:void lambda$instantiatedSubTypeInfoForInstantiatedType$5(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):483:494 -> a
+    170:172:void lambda$instantiatedSubTypeInfoForInstantiatedType$4(java.util.function.Consumer,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexProgramClass):485:487 -> a
+    173:209:void addVirtualDispatchTarget(com.android.tools.r8.graph.DexClassAndMethod,boolean,java.util.Map):507:543 -> a
+    210:212:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.AppInfoWithClassHierarchy):555:557 -> a
+    213:213:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):563:563 -> a
+    214:214:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):569:569 -> a
+    215:215:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):212:212 -> a
+    215:215:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):569 -> a
+    216:217:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):570:571 -> a
+    218:218:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
+    218:218:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):571 -> a
+    219:219:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):573:573 -> a
+    220:220:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):494:494 -> a
+    220:220:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):576 -> a
+    221:221:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):581:581 -> a
+    222:222:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):633:633 -> a
+    222:222:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):583 -> a
+    223:235: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):588:600 -> a
+    236:236:com.android.tools.r8.graph.DexEncodedMethod lookupOverrideCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):644:644 -> a
+    236:236: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):602 -> a
+    237:237:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):466:466 -> a
+    237:237:com.android.tools.r8.graph.DexEncodedMethod lookupOverrideCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):644 -> a
+    237:237: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):602 -> a
+    238:240:com.android.tools.r8.graph.DexEncodedMethod lookupOverrideCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):645:647 -> a
+    238:240: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):602 -> a
+    241:242: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):603:604 -> a
+    243:249: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):655:661 -> a
+    243:249: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):604 -> a
+    250:250:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):466:466 -> a
+    250:250: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):661 -> a
+    250:250: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):604 -> a
+    251:253: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):663:665 -> a
+    251:253: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):604 -> a
+    254:254: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):616:616 -> a
+    255:265: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):610:620 -> a
+    266:266:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):628:628 -> a
+    266:266: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):623 -> a
+    267:274:boolean isOverriding(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):682:689 -> a
     1:1:com.android.tools.r8.graph.DexClassAndMember getResolutionPair():126: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
     6:7:com.android.tools.r8.graph.DexClassAndMethod lookupInvokeSpecialTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):228:229 -> b
@@ -24022,7 +24049,7 @@
     1:1:com.android.tools.r8.graph.DexClassAndMethod getResolutionPair():174:174 -> k
     1:1:com.android.tools.r8.graph.DexEncodedMethod getResolvedMethod():163:163 -> l
     1:2:com.android.tools.r8.graph.ProgramMethod getResolvedProgramMethod():167:168 -> m
-com.android.tools.r8.graph.RewrittenPrototypeDescription -> com.android.tools.r8.graph.L0:
+com.android.tools.r8.graph.RewrittenPrototypeDescription -> com.android.tools.r8.graph.J0:
     com.android.tools.r8.graph.RewrittenPrototypeDescription NONE -> a
     java.util.List extraParameters -> c
     com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection argumentInfoCollection -> d
@@ -24070,10 +24097,10 @@
     2:2:int numberOfExtraParameters():394:394 -> h
     2:2:boolean requiresRewritingAtCallSite():411 -> h
     3:4:boolean requiresRewritingAtCallSite():411:412 -> h
-com.android.tools.r8.graph.RewrittenPrototypeDescription$1 -> com.android.tools.r8.graph.L0$a:
+com.android.tools.r8.graph.RewrittenPrototypeDescription$1 -> com.android.tools.r8.graph.J0$a:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():31:31 -> <clinit>
-com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo -> com.android.tools.r8.graph.L0$b:
+com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo -> com.android.tools.r8.graph.J0$b:
     com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo NO_INFO -> a
     1:16:void <clinit>():26:41 -> <clinit>
     com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo) -> a
@@ -24082,7 +24109,7 @@
     1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo lambda$static$0(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):43:43 -> b
     boolean isRewrittenTypeInfo() -> c
     com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo asRewrittenTypeInfo() -> d
-com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection -> com.android.tools.r8.graph.L0$c:
+com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection -> com.android.tools.r8.graph.J0$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap argumentInfos -> c
     com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection EMPTY -> a
     boolean $assertionsDisabled -> b
@@ -24115,7 +24142,7 @@
     1:2:boolean hasRemovedArguments():205:206 -> d
     1:1:boolean isEmpty():201:201 -> e
     1:2:int numberOfRemovedArguments():215:216 -> f
-com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection$Builder -> com.android.tools.r8.graph.L0$c$a:
+com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection$Builder -> com.android.tools.r8.graph.J0$c$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap argumentInfos -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():231:231 -> <clinit>
@@ -24123,7 +24150,7 @@
     1:5:void addArgumentInfo(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):236:240 -> a
     6:9:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection build():244:247 -> a
     10:10:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection build():245:245 -> a
-com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo -> com.android.tools.r8.graph.L0$d:
+com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo -> com.android.tools.r8.graph.J0$d:
     com.android.tools.r8.graph.DexType type -> d
     boolean $assertionsDisabled -> b
     boolean isAlwaysNull -> c
@@ -24137,7 +24164,7 @@
     1:1:com.android.tools.r8.graph.DexType getType():103:103 -> f
     1:1:boolean isAlwaysNull():107:107 -> g
     1:1:boolean isNeverUsed():111:111 -> h
-com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo$Builder -> com.android.tools.r8.graph.L0$d$a:
+com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo$Builder -> com.android.tools.r8.graph.J0$d$a:
     com.android.tools.r8.graph.DexType type -> c
     boolean $assertionsDisabled -> a
     boolean isAlwaysNull -> b
@@ -24146,7 +24173,7 @@
     1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo$Builder setType(com.android.tools.r8.graph.DexType):80:80 -> a
     2:3:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo build():85:86 -> a
     1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo$Builder setIsAlwaysNull():75:75 -> b
-com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo -> com.android.tools.r8.graph.L0$e:
+com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo -> com.android.tools.r8.graph.J0$e:
     com.android.tools.r8.graph.DexType newType -> d
     com.android.tools.r8.graph.DexType oldType -> c
     boolean $assertionsDisabled -> b
@@ -24160,7 +24187,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.oC:
+com.android.tools.r8.graph.SmaliWriter -> com.android.tools.r8.internal.aB:
     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
@@ -24169,17 +24196,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.xC:
+com.android.tools.r8.graph.SortedProgramPackage -> com.android.tools.r8.internal.iB:
     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.yC:
+com.android.tools.r8.graph.SortedProgramPackageCollection -> com.android.tools.r8.internal.jB:
     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.bE:
+com.android.tools.r8.graph.SubtypingInfo -> com.android.tools.r8.internal.OC:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     java.util.Map typeInfo -> d
     java.util.Set missingClasses -> f
@@ -24223,7 +24250,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.bE$a:
+com.android.tools.r8.graph.SubtypingInfo$TypeInfo -> com.android.tools.r8.internal.OC$a:
     java.util.Set directSubtypes -> d
     com.android.tools.r8.graph.DexType type -> b
     boolean $assertionsDisabled -> a
@@ -24241,11 +24268,11 @@
     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.cE:
+com.android.tools.r8.graph.SuccessfulMemberResolutionResult -> com.android.tools.r8.internal.PC:
     com.android.tools.r8.graph.DexClass getInitialResolutionHolder() -> a
     com.android.tools.r8.graph.DexClassAndMember getResolutionPair() -> b
     com.android.tools.r8.graph.DexClass getResolvedHolder() -> c
-com.android.tools.r8.graph.TopDownClassHierarchyTraversal -> com.android.tools.r8.internal.WE:
+com.android.tools.r8.graph.TopDownClassHierarchyTraversal -> com.android.tools.r8.internal.PD:
     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
@@ -24269,102 +24296,107 @@
     32:32:boolean com.android.tools.r8.graph.ClassHierarchyTraversal$Scope.shouldBePassedToVisitor(com.android.tools.r8.graph.DexClass):30 -> a
     32:32:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):69 -> a
     33:38:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):72:77 -> a
-    39:48:boolean com.android.tools.r8.graph.TopDownClassHierarchyTraversal.shouldTraverseUpwardsFrom(com.android.tools.r8.graph.DexClass):95:104 -> a
-    39:48:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):78 -> a
-    49:49:boolean com.android.tools.r8.graph.TopDownClassHierarchyTraversal.shouldTraverseUpwardsFrom(com.android.tools.r8.graph.DexClass):101:101 -> a
-    49:49:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):78 -> a
-    50:57:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):79: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
-    68:68:boolean com.android.tools.r8.graph.TopDownClassHierarchyTraversal.shouldTraverseUpwardsFrom(com.android.tools.r8.graph.DexClass):101:101 -> a
-    68:68:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):87 -> a
-    69:69:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):88:88 -> a
+    39:39:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    39:39:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):77 -> a
+    40:49:boolean com.android.tools.r8.graph.TopDownClassHierarchyTraversal.shouldTraverseUpwardsFrom(com.android.tools.r8.graph.DexClass):95:104 -> a
+    40:49:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):78 -> a
+    50:50:boolean com.android.tools.r8.graph.TopDownClassHierarchyTraversal.shouldTraverseUpwardsFrom(com.android.tools.r8.graph.DexClass):101:101 -> a
+    50:50:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):78 -> a
+    51:58:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):79:86 -> a
+    59:59:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    59:59:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):86 -> a
+    60:69:boolean com.android.tools.r8.graph.TopDownClassHierarchyTraversal.shouldTraverseUpwardsFrom(com.android.tools.r8.graph.DexClass):95:104 -> a
+    60:69:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):87 -> a
+    70:70:boolean com.android.tools.r8.graph.TopDownClassHierarchyTraversal.shouldTraverseUpwardsFrom(com.android.tools.r8.graph.DexClass):101:101 -> a
+    70:70:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):87 -> a
+    71:71:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):88:88 -> a
     1:1:com.android.tools.r8.graph.TopDownClassHierarchyTraversal forProgramClasses(com.android.tools.r8.graph.AppView):50:50 -> b
-com.android.tools.r8.graph.TreeFixerBase -> com.android.tools.r8.graph.M0:
+com.android.tools.r8.graph.TreeFixerBase -> com.android.tools.r8.graph.K0:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
-    java.util.Map programClassCache -> d
+    java.util.Map newProgramClasses -> d
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
     java.util.Map synthesizedFromClasses -> e
     java.util.Map protoFixupCache -> f
-    1:1:void <clinit>():14:14 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):23:23 -> <init>
-    2:8:void <init>(com.android.tools.r8.graph.AppView):19:25 -> <init>
+    1:1:void <clinit>():13:13 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):22:22 -> <init>
+    2:8:void <init>(com.android.tools.r8.graph.AppView):18:24 -> <init>
     void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType) -> a
     void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField) -> a
     void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod) -> a
-    1:16:void recordFailedResolutionChanges():54:69 -> a
-    17:17:com.android.tools.r8.graph.DexEncodedMethod recordMethodChange(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):80:80 -> a
-    18:21:java.util.List fixupClasses(java.util.Collection):86:89 -> a
-    22:22:java.util.List fixupClasses(java.util.Collection):88:88 -> a
-    23:23:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):89:89 -> a
-    24:27:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):96:99 -> a
-    28:28:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():650:650 -> a
-    28:28:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):100 -> a
-    29:30:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):101:102 -> a
-    31:32:com.android.tools.r8.graph.DexTypeList fixupTypeList(com.android.tools.r8.graph.DexTypeList):335:336 -> a
-    31:32:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):103 -> a
-    33:33:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClass.getSourceFile():154:154 -> a
-    33:33:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):104 -> a
-    34:34:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):105:105 -> a
-    35:35:com.android.tools.r8.graph.NestHostClassAttribute fixupNestHost(com.android.tools.r8.graph.NestHostClassAttribute):246:246 -> a
-    35:35:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):105 -> a
-    36:36:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):106:106 -> a
-    37:46:java.util.List fixupNestMemberAttributes(java.util.List):252:261 -> a
-    37:46:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):106 -> a
-    47:47:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):107:107 -> a
-    48:60:com.android.tools.r8.graph.EnclosingMethodAttribute fixupEnclosingMethodAttribute(com.android.tools.r8.graph.EnclosingMethodAttribute):150:162 -> a
-    48:60:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):107 -> a
-    61:61:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):108:108 -> a
-    62:68:java.util.List fixupInnerClassAttributes(java.util.List):196:202 -> a
-    62:68:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):108 -> a
-    69:69:com.android.tools.r8.graph.DexType fixupTypeOrNull(com.android.tools.r8.graph.DexType):303:303 -> a
-    69:69:java.util.List fixupInnerClassAttributes(java.util.List):203 -> a
-    69:69:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):108 -> a
-    70:70:java.util.List fixupInnerClassAttributes(java.util.List):204:204 -> a
-    70:70:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):108 -> a
-    71:71:com.android.tools.r8.graph.DexType fixupTypeOrNull(com.android.tools.r8.graph.DexType):303:303 -> a
-    71:71:java.util.List fixupInnerClassAttributes(java.util.List):205 -> a
-    71:71:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):108 -> a
-    72:78:java.util.List fixupInnerClassAttributes(java.util.List):206:206 -> a
-    72:78:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):108 -> a
-    79:93:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):109:123 -> a
-    94:94:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):121:121 -> a
-    95:95:void com.android.tools.r8.graph.DexClass.setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):213:213 -> a
-    95:95:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):120 -> a
-    96:97:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):126:127 -> a
-    98:98:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):125:125 -> a
-    99:99:void com.android.tools.r8.graph.DexClass.setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):233:233 -> a
-    99:99:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):124 -> a
-    100:110:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):129:139 -> a
-    111:111:com.android.tools.r8.graph.DexProgramClass recordClassChange(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):41:41 -> a
-    111:111:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):140 -> a
-    112:116:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List):169:173 -> a
-    117:117:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():164:164 -> a
-    117:117:com.android.tools.r8.graph.DexEncodedField fixupField(com.android.tools.r8.graph.DexEncodedField):179 -> a
-    117:117:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List):173 -> a
-    118:120:com.android.tools.r8.graph.DexEncodedField fixupField(com.android.tools.r8.graph.DexEncodedField):180:182 -> a
-    118:120:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List):173 -> a
-    121:121:com.android.tools.r8.graph.DexEncodedField recordFieldChange(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):46:46 -> a
-    121:121:com.android.tools.r8.graph.DexEncodedField fixupField(com.android.tools.r8.graph.DexEncodedField):182 -> a
-    121:121:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List):173 -> a
-    122:122:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List):173:173 -> a
-    123:125:com.android.tools.r8.graph.DexField fixupFieldReference(com.android.tools.r8.graph.DexField):189:191 -> a
-    126:130:com.android.tools.r8.graph.DexEncodedMethod[] fixupMethods(java.lang.Iterable,int):219:223 -> a
-    131:134:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):230:233 -> a
-    131:134:com.android.tools.r8.graph.DexEncodedMethod[] fixupMethods(java.lang.Iterable,int):224 -> a
-    135:135:com.android.tools.r8.graph.DexEncodedMethod[] fixupMethods(java.lang.Iterable,int):224:224 -> a
-    136:139:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):230:233 -> a
-    140:142:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):240:240 -> a
-    143:148:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):269:274 -> a
-    149:158:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):308:317 -> a
-    159:163:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):324:328 -> a
+    1:1:com.android.tools.r8.graph.DexEncodedMethod recordMethodChange(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):51:51 -> a
+    2:7:java.util.Collection fixupClasses(java.util.Collection):57:62 -> a
+    8:8:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):60:60 -> a
+    9:12:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):67:70 -> a
+    13:13:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():632:632 -> a
+    13:13:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):71 -> a
+    14:14:com.android.tools.r8.graph.ClassAccessFlags com.android.tools.r8.graph.DexClass.getAccessFlags():137:137 -> a
+    14:14:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):72 -> a
+    15:16:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):72:73 -> a
+    17:18:com.android.tools.r8.graph.DexTypeList fixupTypeList(com.android.tools.r8.graph.DexTypeList):307:308 -> a
+    17:18:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):74 -> a
+    19:19:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClass.getSourceFile():149:149 -> a
+    19:19:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):75 -> a
+    20:20:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):76:76 -> a
+    21:21:com.android.tools.r8.graph.NestHostClassAttribute fixupNestHost(com.android.tools.r8.graph.NestHostClassAttribute):217:217 -> a
+    21:21:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):76 -> a
+    22:22:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):77:77 -> a
+    23:32:java.util.List fixupNestMemberAttributes(java.util.List):223:232 -> a
+    23:32:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):77 -> a
+    33:33:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):78:78 -> a
+    34:46:com.android.tools.r8.graph.EnclosingMethodAttribute fixupEnclosingMethodAttribute(com.android.tools.r8.graph.EnclosingMethodAttribute):121:133 -> a
+    34:46:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):78 -> a
+    47:47:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):79:79 -> a
+    48:54:java.util.List fixupInnerClassAttributes(java.util.List):167:173 -> a
+    48:54:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):79 -> a
+    55:55:com.android.tools.r8.graph.DexType fixupTypeOrNull(com.android.tools.r8.graph.DexType):275:275 -> a
+    55:55:java.util.List fixupInnerClassAttributes(java.util.List):174 -> a
+    55:55:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):79 -> a
+    56:56:java.util.List fixupInnerClassAttributes(java.util.List):175:175 -> a
+    56:56:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):79 -> a
+    57:57:com.android.tools.r8.graph.DexType fixupTypeOrNull(com.android.tools.r8.graph.DexType):275:275 -> a
+    57:57:java.util.List fixupInnerClassAttributes(java.util.List):176 -> a
+    57:57:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):79 -> a
+    58:64:java.util.List fixupInnerClassAttributes(java.util.List):177:177 -> a
+    58:64:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):79 -> a
+    65:79:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):80:94 -> a
+    80:80:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):92:92 -> a
+    81:81:void com.android.tools.r8.graph.DexClass.setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):204:204 -> a
+    81:81:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):91 -> a
+    82:83:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):97:98 -> a
+    84:84:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):96:96 -> a
+    85:85:void com.android.tools.r8.graph.DexClass.setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):224:224 -> a
+    85:85:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):95 -> a
+    86:96:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):100:110 -> a
+    97:97:com.android.tools.r8.graph.DexProgramClass recordClassChange(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):40:40 -> a
+    97:97:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):111 -> a
+    98:102:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List):140:144 -> a
+    103:103:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():158:158 -> a
+    103:103:com.android.tools.r8.graph.DexEncodedField fixupField(com.android.tools.r8.graph.DexEncodedField):150 -> a
+    103:103:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List):144 -> a
+    104:106:com.android.tools.r8.graph.DexField fixupFieldReference(com.android.tools.r8.graph.DexField):160:162 -> a
+    104:106:com.android.tools.r8.graph.DexEncodedField fixupField(com.android.tools.r8.graph.DexEncodedField):151 -> a
+    104:106:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List):144 -> a
+    107:107:com.android.tools.r8.graph.DexEncodedField fixupField(com.android.tools.r8.graph.DexEncodedField):153:153 -> a
+    107:107:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List):144 -> a
+    108:108:com.android.tools.r8.graph.DexEncodedField recordFieldChange(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):45:45 -> a
+    108:108:com.android.tools.r8.graph.DexEncodedField fixupField(com.android.tools.r8.graph.DexEncodedField):153 -> a
+    108:108:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List):144 -> a
+    109:109:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List):144:144 -> a
+    110:112:com.android.tools.r8.graph.DexField fixupFieldReference(com.android.tools.r8.graph.DexField):160:162 -> a
+    113:117:com.android.tools.r8.graph.DexEncodedMethod[] fixupMethods(java.lang.Iterable,int):190:194 -> a
+    118:121:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):201:204 -> a
+    118:121:com.android.tools.r8.graph.DexEncodedMethod[] fixupMethods(java.lang.Iterable,int):195 -> a
+    122:122:com.android.tools.r8.graph.DexEncodedMethod[] fixupMethods(java.lang.Iterable,int):195:195 -> a
+    123:126:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):201:204 -> a
+    127:129:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):211:211 -> a
+    130:135:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):240:245 -> a
+    136:145:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):280:289 -> a
+    146:150:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):296:300 -> a
     com.android.tools.r8.graph.DexType mapClassType(com.android.tools.r8.graph.DexType) -> b
-    1:3:void lambda$recordFailedResolutionChanges$0(com.android.tools.r8.graph.DexField):62:64 -> b
-    4:6:void lambda$recordFailedResolutionChanges$1(com.android.tools.r8.graph.DexMethod):71:73 -> b
-    7:21:java.util.Collection fixupSynthesizedFrom(java.util.Collection):282:296 -> b
-    22:22:com.android.tools.r8.graph.DexProgramClass lambda$fixupSynthesizedFrom$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):295:295 -> b
-com.android.tools.r8.graph.UseRegistry -> com.android.tools.r8.graph.N0:
+    1:16:java.util.Collection fixupSynthesizedFrom(java.util.Collection):253:268 -> b
+    17:17:com.android.tools.r8.graph.DexProgramClass lambda$fixupSynthesizedFrom$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):267:267 -> b
+com.android.tools.r8.graph.UseRegistry -> com.android.tools.r8.graph.L0:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():9:9 -> <clinit>
@@ -24406,12 +24438,12 @@
     1:1:void registerStaticFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField):59:59 -> f
     void registerStaticFieldWrite(com.android.tools.r8.graph.DexField) -> g
     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 -> com.android.tools.r8.graph.L0$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>():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.Y5:
+com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis -> com.android.tools.r8.internal.K5:
     java.util.List r8InstructionSequence -> b
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> e
     java.util.List javacInstructionSequence -> a
@@ -24497,7 +24529,7 @@
     88:97:boolean com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis.hasKotlincClinitAssertionCode(com.android.tools.r8.graph.ProgramMethod):160:169 -> a
     88:97:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):46 -> a
     98:98:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):47:47 -> a
-com.android.tools.r8.graph.analysis.DesugaredLibraryConversionWrapperAnalysis -> com.android.tools.r8.internal.D9:
+com.android.tools.r8.graph.analysis.DesugaredLibraryConversionWrapperAnalysis -> com.android.tools.r8.internal.a9:
     java.util.Map synthesizedWrappers -> b
     com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter converter -> a
     1:1:void <init>(com.android.tools.r8.graph.AppView):26:26 -> <init>
@@ -24515,7 +24547,7 @@
     1:1:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):48 -> d
     1:1:void com.android.tools.r8.graph.analysis.DesugaredLibraryConversionWrapperAnalysis.traceInvoke(com.android.tools.r8.graph.DexMethod):38:38 -> e
     1:1:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):63 -> e
-com.android.tools.r8.graph.analysis.EnqueuerAnalysis -> com.android.tools.r8.internal.Ta:
+com.android.tools.r8.graph.analysis.EnqueuerAnalysis -> com.android.tools.r8.internal.oa:
     1:1:void <init>():15:15 -> <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
@@ -24523,16 +24555,16 @@
     void processNewlyLiveClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist) -> a
     void processNewlyLiveField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition) -> a
     void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition) -> a
-com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis -> com.android.tools.r8.internal.Ua:
-com.android.tools.r8.graph.analysis.EnqueuerExceptionGuardAnalysis -> com.android.tools.r8.internal.Va:
-com.android.tools.r8.graph.analysis.EnqueuerInstanceOfAnalysis -> com.android.tools.r8.internal.Wa:
-com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis -> com.android.tools.r8.internal.Xa:
+com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis -> com.android.tools.r8.internal.pa:
+com.android.tools.r8.graph.analysis.EnqueuerExceptionGuardAnalysis -> com.android.tools.r8.internal.qa:
+com.android.tools.r8.graph.analysis.EnqueuerInstanceOfAnalysis -> com.android.tools.r8.internal.ra:
+com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis -> com.android.tools.r8.internal.sa:
     void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod) -> a
     void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod) -> b
     void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod) -> c
     void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod) -> d
     void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod) -> e
-com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis -> com.android.tools.r8.internal.zf:
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis -> com.android.tools.r8.internal.Le:
     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>
@@ -24540,8 +24572,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.yf:
-com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods -> com.android.tools.r8.internal.zf$a:
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$1 -> com.android.tools.r8.internal.Ke:
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods -> com.android.tools.r8.internal.Le$a:
     java.util.Map mapping -> c
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
@@ -24549,7 +24581,7 @@
     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.de:
+com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses -> com.android.tools.r8.internal.qd:
     com.android.tools.r8.utils.collections.BidirectionalManyToOneMap mergedClasses -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():19:19 -> <clinit>
@@ -24558,10 +24590,10 @@
     2:2:void forEachMergeGroup(java.util.function.BiConsumer):36:36 -> a
     3:3:boolean hasBeenMergedIntoDifferentType(com.android.tools.r8.graph.DexType):41:41 -> a
     4:7:boolean verifyAllSourcesPruned(com.android.tools.r8.graph.AppView):51:54 -> a
-com.android.tools.r8.graph.classmerging.MergedClasses -> com.android.tools.r8.internal.zq:
+com.android.tools.r8.graph.classmerging.MergedClasses -> com.android.tools.r8.internal.yp:
     boolean hasBeenMergedIntoDifferentType(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.Aq:
+com.android.tools.r8.graph.classmerging.MergedClassesCollection -> com.android.tools.r8.internal.zp:
     java.util.List collection -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():15:15 -> <clinit>
@@ -24569,7 +24601,23 @@
     1:1:void add(com.android.tools.r8.graph.classmerging.MergedClasses):20:20 -> a
     2:3:boolean hasBeenMergedIntoDifferentType(com.android.tools.r8.graph.DexType):32:33 -> a
     4:5:boolean verifyAllSourcesPruned(com.android.tools.r8.graph.AppView):52:53 -> a
-com.android.tools.r8.graph.classmerging.VerticallyMergedClasses -> com.android.tools.r8.internal.XG:
+com.android.tools.r8.graph.classmerging.StaticallyMergedClasses -> com.android.tools.r8.internal.SB:
+    com.android.tools.r8.utils.collections.BidirectionalManyToOneMap mergedClasses -> a
+    1:2:void <init>(com.android.tools.r8.utils.collections.BidirectionalManyToOneMap):22:23 -> <init>
+    boolean hasBeenMergedIntoDifferentType(com.android.tools.r8.graph.DexType) -> a
+    boolean verifyAllSourcesPruned(com.android.tools.r8.graph.AppView) -> a
+    1:1:com.android.tools.r8.graph.classmerging.StaticallyMergedClasses$Builder builder():31:31 -> a
+    2:2:void forEachMergeGroup(java.util.function.BiConsumer):36:36 -> a
+    1:1:com.android.tools.r8.graph.classmerging.StaticallyMergedClasses empty():27:27 -> b
+com.android.tools.r8.graph.classmerging.StaticallyMergedClasses$1 -> com.android.tools.r8.internal.SB$a:
+com.android.tools.r8.graph.classmerging.StaticallyMergedClasses$Builder -> com.android.tools.r8.internal.SB$b:
+    com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap mergedClasses -> a
+    1:1:void <init>(com.android.tools.r8.graph.classmerging.StaticallyMergedClasses$1):56:56 -> <init>
+    2:2:void <init>():61:61 -> <init>
+    3:3:void <init>():58:58 -> <init>
+    1:4:void recordMerge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):64:67 -> a
+    5:5:com.android.tools.r8.graph.classmerging.StaticallyMergedClasses build():71:71 -> a
+com.android.tools.r8.graph.classmerging.VerticallyMergedClasses -> com.android.tools.r8.internal.pG:
     com.android.tools.r8.utils.collections.BidirectionalManyToOneMap mergedClasses -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():17:17 -> <clinit>
@@ -24586,7 +24634,7 @@
     1:1:java.util.Collection com.android.tools.r8.graph.classmerging.VerticallyMergedClasses.getSourcesFor(com.android.tools.r8.graph.DexType):39:39 -> e
     1:1:boolean isMergeTarget(com.android.tools.r8.graph.DexType):61 -> e
     2:2:boolean isMergeTarget(com.android.tools.r8.graph.DexType):61:61 -> e
-com.android.tools.r8.horizontalclassmerging.ClassInitializerSynthesizedCode -> com.android.tools.r8.internal.f6:
+com.android.tools.r8.horizontalclassmerging.ClassInitializerSynthesizedCode -> com.android.tools.r8.internal.Q5:
     java.util.List staticClassInitializers -> a
     int maxStack -> b
     int maxLocals -> c
@@ -24603,15 +24651,15 @@
     2:4:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.CfVersionUtils.max(java.util.List):16:18 -> b
     2:4:com.android.tools.r8.cf.CfVersion getCfVersion():83 -> b
     1:1:boolean isEmpty():33:33 -> c
-com.android.tools.r8.horizontalclassmerging.ClassInitializerSynthesizedCode$1 -> com.android.tools.r8.internal.d6:
-com.android.tools.r8.horizontalclassmerging.ClassInitializerSynthesizedCode$Builder -> com.android.tools.r8.internal.e6:
+com.android.tools.r8.horizontalclassmerging.ClassInitializerSynthesizedCode$1 -> com.android.tools.r8.internal.O5:
+com.android.tools.r8.horizontalclassmerging.ClassInitializerSynthesizedCode$Builder -> com.android.tools.r8.internal.P5:
     java.util.List staticClassInitializers -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():86:86 -> <clinit>
     1:2:void <init>():86:87 -> <init>
     1:4:void add(com.android.tools.r8.graph.DexEncodedMethod):90:93 -> a
     5:5:com.android.tools.r8.horizontalclassmerging.ClassInitializerSynthesizedCode build():97:97 -> a
-com.android.tools.r8.horizontalclassmerging.ClassInstanceFieldsMerger -> com.android.tools.r8.internal.n6:
+com.android.tools.r8.horizontalclassmerging.ClassInstanceFieldsMerger -> com.android.tools.r8.internal.Y5:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder lensBuilder -> c
     boolean $assertionsDisabled -> a
@@ -24622,18 +24670,18 @@
     2:13:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.MergeGroup):31:42 -> <init>
     1:15:void addFields(com.android.tools.r8.graph.DexProgramClass):57:71 -> a
     16:30:void addFields(com.android.tools.r8.graph.DexProgramClass):66:80 -> a
-    31:31:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():164:164 -> a
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.getType():168 -> a
+    31:31:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():158:158 -> a
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.getType():162 -> a
     31:31:void addFields(com.android.tools.r8.graph.DexProgramClass):80 -> a
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():49:49 -> a
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.getType():168 -> a
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():46:46 -> a
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.getType():162 -> a
     32:32:void addFields(com.android.tools.r8.graph.DexProgramClass):80 -> a
     33:38:void addFields(com.android.tools.r8.graph.DexProgramClass):80:85 -> a
-    39:39:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():164:164 -> a
-    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.getType():168 -> a
+    39:39:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():158:158 -> a
+    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.getType():162 -> a
     39:39:void addFields(com.android.tools.r8.graph.DexProgramClass):86 -> a
-    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():49:49 -> a
-    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.getType():168 -> a
+    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():46:46 -> a
+    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.getType():162 -> a
     40:40:void addFields(com.android.tools.r8.graph.DexProgramClass):86 -> a
     41:42:void addFields(com.android.tools.r8.graph.DexProgramClass):86:87 -> a
     43:48:java.util.Map getAvailableFieldsByExactInfo():92:97 -> a
@@ -24643,13 +24691,13 @@
     58:58:void lambda$getAvailableFieldsByRelaxedInfo$4(java.util.Map,com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo,java.util.LinkedList):112:112 -> a
     59:59:void lambda$merge$7(java.util.List,com.android.tools.r8.graph.DexEncodedField,java.util.List):135:135 -> a
     60:60:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.List):141:141 -> a
-    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.type():94:94 -> a
+    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.type():88:88 -> a
     61:61:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.List):144 -> a
     62:62:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.List):145:145 -> a
-    63:63:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():164:164 -> a
+    63:63:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():158:158 -> a
     63:63:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.List):149 -> a
     64:65:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.List):149:150 -> a
-    66:66:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexField.withType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):191:191 -> a
+    66:66:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexField.withType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):179:179 -> a
     66:66:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.List):150 -> a
     67:75:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.List):147:155 -> a
     76:76:java.lang.Iterable com.android.tools.r8.utils.IterableUtils.append(java.lang.Iterable,java.lang.Object):29:29 -> a
@@ -24659,33 +24707,39 @@
     77:77:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.List):157 -> a
     78:78:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.List):157:157 -> a
     79:79:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.List):156:156 -> a
-    80:80:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():164:164 -> a
+    80:80:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():158:158 -> a
     80:80:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.List):158 -> a
-    81:81:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():164:164 -> a
+    81:81:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():158:158 -> a
     81:81:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.List):159 -> a
     82:82:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.List):155:155 -> a
-    83:83:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():164:164 -> a
-    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.getType():168 -> a
+    83:83:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():158:158 -> a
+    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.getType():162 -> a
     83:83:boolean lambda$mergeSourceFieldsToTargetField$8(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):145 -> a
-    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():49:49 -> a
-    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.getType():168 -> a
+    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():46:46 -> a
+    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.getType():162 -> a
     84:84:boolean lambda$mergeSourceFieldsToTargetField$8(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):145 -> a
-    85:85:boolean com.android.tools.r8.graph.DexEncodedField.isSynthetic():230:230 -> a
+    85:85:boolean com.android.tools.r8.graph.DexEncodedField.isSynthetic():224:224 -> a
     85:85:void fixAccessFlags(com.android.tools.r8.graph.DexEncodedField,java.util.Collection):117 -> a
-    86:87:void fixAccessFlags(com.android.tools.r8.graph.DexEncodedField,java.util.Collection):117:118 -> a
-    88:88:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():204:204 -> a
-    88:88:void fixAccessFlags(com.android.tools.r8.graph.DexEncodedField,java.util.Collection):120 -> a
-    89:90:void fixAccessFlags(com.android.tools.r8.graph.DexEncodedField,java.util.Collection):120:121 -> a
-    91:91:boolean com.android.tools.r8.graph.DexEncodedField.isSynthetic():230:230 -> a
-    91:91:boolean lambda$fixAccessFlags$5(com.android.tools.r8.graph.DexEncodedField):117 -> a
+    86:86:void fixAccessFlags(com.android.tools.r8.graph.DexEncodedField,java.util.Collection):117:117 -> a
+    87:87:com.android.tools.r8.graph.FieldAccessFlags com.android.tools.r8.graph.DexEncodedField.getAccessFlags():128:128 -> a
+    87:87:void fixAccessFlags(com.android.tools.r8.graph.DexEncodedField,java.util.Collection):118 -> a
+    88:88:void fixAccessFlags(com.android.tools.r8.graph.DexEncodedField,java.util.Collection):118:118 -> a
+    89:89:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():194:194 -> a
+    89:89:void fixAccessFlags(com.android.tools.r8.graph.DexEncodedField,java.util.Collection):120 -> a
+    90:90:void fixAccessFlags(com.android.tools.r8.graph.DexEncodedField,java.util.Collection):120:120 -> a
+    91:91:com.android.tools.r8.graph.FieldAccessFlags com.android.tools.r8.graph.DexEncodedField.getAccessFlags():128:128 -> a
+    91:91:void fixAccessFlags(com.android.tools.r8.graph.DexEncodedField,java.util.Collection):121 -> a
+    92:92:void fixAccessFlags(com.android.tools.r8.graph.DexEncodedField,java.util.Collection):121:121 -> a
+    93:93:boolean com.android.tools.r8.graph.DexEncodedField.isSynthetic():224:224 -> a
+    93:93:boolean lambda$fixAccessFlags$5(com.android.tools.r8.graph.DexEncodedField):117 -> a
     1:1:java.util.LinkedList lambda$getAvailableFieldsByRelaxedInfo$3(com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo):111:111 -> b
     2:8:com.android.tools.r8.graph.DexEncodedField[] merge():130:136 -> b
-    9:9:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():204:204 -> b
+    9:9:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():194:194 -> b
     9:9:boolean lambda$fixAccessFlags$6(com.android.tools.r8.graph.DexEncodedField):120 -> b
     1:1:java.util.List lambda$new$0(com.android.tools.r8.graph.DexEncodedField):42:42 -> c
     1:1:void lambda$new$1(com.android.tools.r8.graph.DexEncodedField):42:42 -> d
     1:1:void setClassIdField(com.android.tools.r8.graph.DexEncodedField):126:126 -> e
-com.android.tools.r8.horizontalclassmerging.ClassMerger -> com.android.tools.r8.internal.v6:
+com.android.tools.r8.horizontalclassmerging.ClassMerger -> com.android.tools.r8.internal.g6:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> d
     com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder classMethodsBuilder -> h
     com.android.tools.r8.graph.AppView appView -> b
@@ -24706,7 +24760,7 @@
     1:2:void buildClassIdentifierMap():97:98 -> a
     3:3:void lambda$buildClassIdentifierMap$0(com.android.tools.r8.graph.DexProgramClass):98:98 -> a
     4:8:void lambda$mergeDirectMethods$1(com.android.tools.r8.graph.ProgramMethod):144:148 -> a
-    9:9:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createClassInitializer(com.android.tools.r8.graph.DexType):2033:2033 -> a
+    9:9:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createClassInitializer(com.android.tools.r8.graph.DexType):2014:2014 -> a
     9:9:void lambda$mergeDirectMethods$1(com.android.tools.r8.graph.ProgramMethod):148 -> a
     10:21:void lambda$mergeDirectMethods$1(com.android.tools.r8.graph.ProgramMethod):146:157 -> a
     22:22:void mergeConstructors(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):181:181 -> a
@@ -24715,33 +24769,36 @@
     25:25:void lambda$mergeInterfaces$6(java.util.Set,com.android.tools.r8.graph.DexProgramClass):225:225 -> a
     1:5:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers():109:113 -> b
     1:5:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):102 -> b
-    6:6:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createClassInitializer(com.android.tools.r8.graph.DexType):2033:2033 -> b
+    6:6:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createClassInitializer(com.android.tools.r8.graph.DexType):2014:2014 -> b
     6:6:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers():113 -> b
     6:6:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):102 -> b
     7:19:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers():115:127 -> b
     7:19:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):102 -> b
-    20:20: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):296:296 -> b
+    20:20: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):297:297 -> b
     20:20:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers():127 -> b
     20:20:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):102 -> b
     21:41:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers():117:137 -> b
     21:41:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):102 -> b
     42:44:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):103:105 -> b
     45:49:com.android.tools.r8.graph.DexMethod renameDirectMethod(com.android.tools.r8.graph.ProgramMethod):171:175 -> b
-    50:50:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.getProto():388:388 -> b
+    50:50:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.proto():415:415 -> b
     50:50:com.android.tools.r8.graph.DexMethod renameDirectMethod(com.android.tools.r8.graph.ProgramMethod):175 -> b
-    51:51:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexMethod.getProto():62:62 -> b
-    51:51:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.getProto():388 -> b
-    51:51:com.android.tools.r8.graph.DexMethod renameDirectMethod(com.android.tools.r8.graph.ProgramMethod):175 -> b
-    52:53:com.android.tools.r8.graph.DexMethod renameDirectMethod(com.android.tools.r8.graph.ProgramMethod):175:176 -> b
-    54:54:com.android.tools.r8.graph.DexMethod renameDirectMethod(com.android.tools.r8.graph.ProgramMethod):172:172 -> b
-    55:59:void fixAccessFlags():214:218 -> b
-    60:61:void lambda$mergeInstanceFields$7(com.android.tools.r8.graph.DexProgramClass):234:235 -> b
+    51:52:com.android.tools.r8.graph.DexMethod renameDirectMethod(com.android.tools.r8.graph.ProgramMethod):175:176 -> b
+    53:53:com.android.tools.r8.graph.DexMethod renameDirectMethod(com.android.tools.r8.graph.ProgramMethod):172:172 -> b
+    54:55:void fixAccessFlags():214:215 -> b
+    56:56:com.android.tools.r8.graph.ClassAccessFlags com.android.tools.r8.graph.DexClass.getAccessFlags():137:137 -> b
+    56:56:void fixAccessFlags():215 -> b
+    57:60:void fixAccessFlags():215:218 -> b
+    61:61:com.android.tools.r8.graph.ClassAccessFlags com.android.tools.r8.graph.DexClass.getAccessFlags():137:137 -> b
+    61:61:void fixAccessFlags():218 -> b
+    62:62:void fixAccessFlags():218:218 -> b
+    63:64:void lambda$mergeInstanceFields$7(com.android.tools.r8.graph.DexProgramClass):234:235 -> b
     1:1:com.android.tools.r8.horizontalclassmerging.MergeGroup getGroup():93:93 -> c
     2:2:void lambda$mergeStaticFields$5(com.android.tools.r8.graph.DexProgramClass):210:210 -> c
     3:3:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):241:241 -> c
     4:10:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():197:203 -> c
     4:10:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):242 -> c
-    11:11: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):80:80 -> c
+    11:11: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):74:74 -> c
     11:11:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():203 -> c
     11:11:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):242 -> c
     12:12:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():197:197 -> c
@@ -24750,7 +24807,7 @@
     1:1:void lambda$mergeVirtualMethods$4(com.android.tools.r8.graph.DexProgramClass):193:193 -> d
     2:7:void mergeInstanceFields():232:237 -> d
     1:1:void mergeDirectMethods(com.android.tools.r8.graph.DexProgramClass):142:142 -> e
-    2:2:void com.android.tools.r8.graph.DexProgramClass.forEachProgramDirectMethod(java.util.function.Consumer):229:229 -> e
+    2:2:void com.android.tools.r8.graph.DexProgramClass.forEachProgramDirectMethod(java.util.function.Consumer):179:179 -> e
     2:2:void mergeDirectMethods(com.android.tools.r8.graph.DexProgramClass):142 -> e
     3:3:void mergeDirectMethods(com.android.tools.r8.graph.DexProgramClass):162:162 -> e
     4:4:void mergeInterfaces():223:223 -> e
@@ -24769,12 +24826,12 @@
     11:13:void mergeInterfaces():225:227 -> e
     14:14:void com.android.tools.r8.graph.DexTypeList.<init>(java.util.Collection):46:46 -> e
     14:14:void mergeInterfaces():227 -> e
-    15:15:void com.android.tools.r8.graph.DexClass.setInterfaces(com.android.tools.r8.graph.DexTypeList):150:150 -> e
+    15:15:void com.android.tools.r8.graph.DexClass.setInterfaces(com.android.tools.r8.graph.DexTypeList):145:145 -> e
     15:15:void mergeInterfaces():227 -> e
     1:3:void mergeStaticFields():208:210 -> f
     1:3:void mergeVirtualMethods():191:193 -> g
-com.android.tools.r8.horizontalclassmerging.ClassMerger$1 -> com.android.tools.r8.internal.t6:
-com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder -> com.android.tools.r8.internal.u6:
+com.android.tools.r8.horizontalclassmerging.ClassMerger$1 -> com.android.tools.r8.internal.e6:
+com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder -> com.android.tools.r8.internal.f6:
     com.android.tools.r8.horizontalclassmerging.ClassInitializerSynthesizedCode$Builder classInitializerSynthesizedCodeBuilder -> d
     com.android.tools.r8.horizontalclassmerging.MergeGroup group -> c
     com.android.tools.r8.graph.AppView appView -> b
@@ -24792,34 +24849,31 @@
     11:11:com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder setup():278:278 -> a
     12:17:com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder setup():277:282 -> a
     18:23:void setupForMethodMerging(com.android.tools.r8.graph.DexProgramClass):287:292 -> a
-    24:24:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):249:249 -> a
+    24:24:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):199:199 -> a
     24:24:void setupForMethodMerging(com.android.tools.r8.graph.DexProgramClass):292 -> a
     25:26:void addConstructor(com.android.tools.r8.graph.ProgramMethod):296:297 -> a
-    27:27:boolean com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.isConstructorMergingEnabled():1181:1181 -> a
+    27:27:boolean com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.isConstructorMergingEnabled():1323:1323 -> a
     27:27:void addConstructor(com.android.tools.r8.graph.ProgramMethod):297 -> a
     28:30:void addConstructor(com.android.tools.r8.graph.ProgramMethod):298:300 -> a
-    31:31:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.getProto():388:388 -> a
+    31:31:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.getProto():397:397 -> a
     31:31:void addConstructor(com.android.tools.r8.graph.ProgramMethod):300 -> a
-    32:32:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexMethod.getProto():62:62 -> a
-    32:32:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.getProto():388 -> a
-    32:32:void addConstructor(com.android.tools.r8.graph.ProgramMethod):300 -> a
-    33:33:void addConstructor(com.android.tools.r8.graph.ProgramMethod):300:300 -> a
-    34:39:void addConstructor(com.android.tools.r8.graph.ProgramMethod):299:304 -> a
-    40:40:void addConstructor(com.android.tools.r8.graph.ProgramMethod):303:303 -> a
-    41:41:com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder lambda$addConstructor$0(com.android.tools.r8.graph.DexProto):300:300 -> a
-    42:42:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder lambda$addVirtualMethod$1(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):313:313 -> a
-    43:54:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):326:337 -> a
-    55:55:java.util.Collection com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder.getConstructorMergerBuilders():318:318 -> a
+    32:32:void addConstructor(com.android.tools.r8.graph.ProgramMethod):300:300 -> a
+    33:38:void addConstructor(com.android.tools.r8.graph.ProgramMethod):299:304 -> a
+    39:39:void addConstructor(com.android.tools.r8.graph.ProgramMethod):303:303 -> a
+    40:40:com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder lambda$addConstructor$0(com.android.tools.r8.graph.DexProto):300:300 -> a
+    41:41:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder lambda$addVirtualMethod$1(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):313:313 -> a
+    42:53:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):326:337 -> a
+    54:54:java.util.Collection com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder.getConstructorMergerBuilders():318:318 -> a
+    54:54:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):338 -> a
+    55:55:boolean com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.isConstructorMergingEnabled():1323:1323 -> a
+    55:55:java.util.Collection com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder.getConstructorMergerBuilders():318 -> a
     55:55:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):338 -> a
-    56:56:boolean com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.isConstructorMergingEnabled():1181:1181 -> a
-    56:56:java.util.Collection com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder.getConstructorMergerBuilders():318 -> a
-    56:56:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):338 -> a
-    57:58:java.util.Collection com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder.getConstructorMergerBuilders():319:320 -> a
-    57:58:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):338 -> a
-    59:75:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):338:354 -> a
+    56:57:java.util.Collection com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder.getConstructorMergerBuilders():319:320 -> a
+    56:57:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):338 -> a
+    58:74:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):338:354 -> a
     1:4:void addVirtualMethod(com.android.tools.r8.graph.ProgramMethod):309:312 -> b
     5:8:void addVirtualMethod(com.android.tools.r8.graph.ProgramMethod):311:314 -> b
-com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder -> com.android.tools.r8.internal.w6:
+com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder -> com.android.tools.r8.internal.h6:
     java.util.List directMethods -> d
     java.util.List virtualMethods -> c
     java.util.Set reservedMethods -> b
@@ -24831,8 +24885,11 @@
     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$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):39:39 -> b
-com.android.tools.r8.horizontalclassmerging.ClassStaticFieldsMerger -> com.android.tools.r8.internal.P6:
+    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():651:651 -> 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.A6:
     com.android.tools.r8.horizontalclassmerging.MergeGroup group -> b
     java.util.Map targetFields -> c
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> d
@@ -24841,16 +24898,16 @@
     2:16:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.MergeGroup):19:33 -> <init>
     1:1:boolean isFresh(com.android.tools.r8.graph.DexField):37:37 -> 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():164:164 -> a
+    3:3:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():158:158 -> a
     3:3:void addField(com.android.tools.r8.graph.DexEncodedField):41 -> 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):31:31 -> b
-    2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():164:164 -> b
+    2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():158:158 -> b
     2:2:void lambda$new$0(com.android.tools.r8.graph.DexEncodedField):31 -> b
     3:3:void lambda$new$0(com.android.tools.r8.graph.DexEncodedField):31:31 -> b
     4:4:void merge(com.android.tools.r8.graph.DexProgramClass):59:59 -> b
-com.android.tools.r8.horizontalclassmerging.ConstructorEntryPoint -> com.android.tools.r8.internal.w8:
+com.android.tools.r8.horizontalclassmerging.ConstructorEntryPoint -> com.android.tools.r8.internal.X7:
     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>
@@ -24867,7 +24924,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.x8:
+com.android.tools.r8.horizontalclassmerging.ConstructorEntryPointSynthesizedCode -> com.android.tools.r8.internal.Y7:
     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
@@ -24877,7 +24934,7 @@
     1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():33:33 -> F
     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
-com.android.tools.r8.horizontalclassmerging.ConstructorMerger -> com.android.tools.r8.internal.z8:
+com.android.tools.r8.horizontalclassmerging.ConstructorMerger -> com.android.tools.r8.internal.a8:
     com.android.tools.r8.horizontalclassmerging.MergeGroup group -> c
     java.util.Collection constructors -> d
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> e
@@ -24887,39 +24944,36 @@
     1:10:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.Collection):41:50 -> <init>
     1:1:int getArity():66:66 -> a
     2:5:com.android.tools.r8.graph.DexMethod moveConstructor(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.DexEncodedMethod):112:115 -> a
-    6:6:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.getProto():388:388 -> a
+    6:6:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.proto():415:415 -> a
     6:6:com.android.tools.r8.graph.DexMethod moveConstructor(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.DexEncodedMethod):116 -> a
-    7:7:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexMethod.getProto():62:62 -> a
-    7:7:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.getProto():388 -> a
-    7:7:com.android.tools.r8.graph.DexMethod moveConstructor(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.DexEncodedMethod):116 -> a
-    8:9:com.android.tools.r8.graph.DexMethod moveConstructor(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.DexEncodedMethod):116:117 -> a
-    10:23:com.android.tools.r8.graph.DexMethod moveConstructor(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.DexEncodedMethod):113:126 -> a
-    24:36:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):144:156 -> a
-    37:37:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):155:155 -> a
-    38:38:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.ConstructorMerger.generateReferenceMethodTemplate():58:58 -> a
+    7:8:com.android.tools.r8.graph.DexMethod moveConstructor(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.DexEncodedMethod):116:117 -> a
+    9:22:com.android.tools.r8.graph.DexMethod moveConstructor(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.DexEncodedMethod):113:126 -> a
+    23:35:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):144:156 -> a
+    36:36:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):155:155 -> a
+    37:37:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.ConstructorMerger.generateReferenceMethodTemplate():58:58 -> a
+    37:37:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):159 -> a
+    38:38:boolean com.android.tools.r8.horizontalclassmerging.ConstructorMerger.isTrivialMerge():107:107 -> a
+    38:38:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.ConstructorMerger.generateReferenceMethodTemplate():59 -> a
     38:38:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):159 -> a
-    39:39:boolean com.android.tools.r8.horizontalclassmerging.ConstructorMerger.isTrivialMerge():107:107 -> a
-    39:39:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.ConstructorMerger.generateReferenceMethodTemplate():59 -> a
+    39:39:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.ConstructorMerger.generateReferenceMethodTemplate():60:60 -> a
     39:39:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):159 -> a
-    40:40:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.ConstructorMerger.generateReferenceMethodTemplate():60:60 -> a
-    40:40:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):159 -> a
-    41:42: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):2238:2239 -> a
-    41:42:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.ConstructorMerger.generateReferenceMethodTemplate():60 -> a
-    41:42:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):159 -> a
-    43:46:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):160:163 -> a
-    47:62:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):161:176 -> a
-    63:63:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexMethod.getProto():62:62 -> a
-    63:63:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):180 -> a
-    64:64:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):181:181 -> a
-    65:78:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):177:190 -> a
-    79:79:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.horizontalclassmerging.ConstructorMerger.getAccessFlags():133:133 -> a
-    79:79:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):193 -> a
-    80:82:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):194:196 -> a
-    83:83: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):296:296 -> a
-    83:83:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):196 -> a
-    84:92:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):202:210 -> a
-    93:100:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):209:216 -> a
-com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder -> com.android.tools.r8.internal.y8:
+    40:41: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):2219:2220 -> a
+    40:41:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.ConstructorMerger.generateReferenceMethodTemplate():60 -> a
+    40:41:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):159 -> a
+    42:45:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):160:163 -> a
+    46:61:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):161:176 -> a
+    62:62:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexMethod.getProto() -> a
+    62:62:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):180 -> a
+    63:63:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):181:181 -> a
+    64:77:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):177:190 -> a
+    78:78:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.horizontalclassmerging.ConstructorMerger.getAccessFlags():133:133 -> a
+    78:78:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):193 -> a
+    79:81:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):194:196 -> a
+    82:82: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):297:297 -> a
+    82:82:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):196 -> a
+    83:91:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):202:210 -> a
+    92:99:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):209:216 -> a
+com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder -> com.android.tools.r8.internal.Z7:
     com.android.tools.r8.graph.AppView appView -> d
     java.util.List constructorGroups -> c
     boolean $assertionsDisabled -> a
@@ -24929,7 +24983,7 @@
     2:8:void <init>(com.android.tools.r8.graph.AppView):71:77 -> <init>
     1:2:void createNewGroup():81:82 -> a
     3:6:com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder add(com.android.tools.r8.graph.DexEncodedMethod):86:89 -> a
-    7:7:int com.android.tools.r8.utils.InternalOptions.minimumVerificationSizeLimitInBytes():283:283 -> a
+    7:7:int com.android.tools.r8.utils.InternalOptions.minimumVerificationSizeLimitInBytes():291:291 -> a
     7:7:com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder add(com.android.tools.r8.graph.DexEncodedMethod):89 -> a
     8:8:com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder add(com.android.tools.r8.graph.DexEncodedMethod):89:89 -> a
     9:10:void com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder.createNewGroup():81:82 -> a
@@ -24937,7 +24991,7 @@
     11:12:com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder add(com.android.tools.r8.graph.DexEncodedMethod):94:95 -> a
     13:14:java.util.List build(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.MergeGroup):100:101 -> a
     15:15:com.android.tools.r8.horizontalclassmerging.ConstructorMerger lambda$build$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.List):102:102 -> a
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger -> com.android.tools.r8.internal.Xd:
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger -> com.android.tools.r8.internal.kd:
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():52:52 -> <clinit>
@@ -24971,7 +25025,7 @@
     67:67:void lambda$createFieldAccessInfoCollectionModifier$3(com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.graph.ProgramMethod):122:122 -> a
     1:1:boolean lambda$createFieldAccessInfoCollectionModifier$4(com.android.tools.r8.graph.DexEncodedMethod):124:124 -> b
     2:2:void lambda$createFieldAccessInfoCollectionModifier$5(com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.graph.ProgramMethod):125:125 -> b
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens -> com.android.tools.r8.internal.ae:
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens -> com.android.tools.r8.internal.nd:
     com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses mergedClasses -> m
     java.util.Map methodExtraParameters -> l
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalOneToManyRepresentativeMap,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$1):28:28 -> <init>
@@ -24979,24 +25033,24 @@
     8:16:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalOneToManyRepresentativeMap):40:48 -> <init>
     1:10:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):63:72 -> a
     1:9:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):77:85 -> b
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():49:49 -> b
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():46:46 -> b
     10:10:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):85 -> b
     11:11:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):85:85 -> b
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():49:49 -> b
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():46:46 -> b
     12:12:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):85 -> b
     13:13:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):86:86 -> b
-    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():49:49 -> b
+    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():46:46 -> b
     14:14:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):86 -> b
     15:15:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):86:86 -> b
     16:20:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):84:88 -> b
     1:1:java.lang.Iterable internalGetOriginalTypes(com.android.tools.r8.graph.DexType):53:53 -> g
-    2:2:java.lang.Iterable com.android.tools.r8.utils.IterableUtils.prependSingleton(java.lang.Object,java.lang.Iterable):97:97 -> g
+    2:2:java.lang.Iterable com.android.tools.r8.utils.IterableUtils.prependSingleton(java.lang.Object,java.lang.Iterable):89:89 -> g
     2:2:java.lang.Iterable internalGetOriginalTypes(com.android.tools.r8.graph.DexType):53 -> g
     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):97 -> g
+    3:3:java.lang.Iterable com.android.tools.r8.utils.IterableUtils.prependSingleton(java.lang.Object,java.lang.Iterable):89 -> g
     3:3:java.lang.Iterable internalGetOriginalTypes(com.android.tools.r8.graph.DexType):53 -> g
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$1 -> com.android.tools.r8.internal.Yd:
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder -> com.android.tools.r8.internal.Zd:
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$1 -> com.android.tools.r8.internal.ld:
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder -> com.android.tools.r8.internal.md:
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap fieldMap -> b
     com.android.tools.r8.utils.collections.BidirectionalOneToManyRepresentativeHashMap pendingOriginalMethodSignatureUpdates -> g
     boolean $assertionsDisabled -> a
@@ -25033,7 +25087,7 @@
     3:3:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.recordNewMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):164:164 -> c
     3:3:void moveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):160 -> c
     1:1:void recordNewMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):164:164 -> d
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerResult -> com.android.tools.r8.internal.be:
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerResult -> com.android.tools.r8.internal.od:
     com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier fieldAccessInfoCollectionModifier -> a
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens graphLens -> b
     com.android.tools.r8.shaking.MainDexTracingResult mainDexTracingResult -> c
@@ -25041,7 +25095,7 @@
     1:1:com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier getFieldAccessInfoCollectionModifier():26:26 -> a
     1:1:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens getGraphLens():30:30 -> b
     1:1:com.android.tools.r8.shaking.MainDexTracingResult getMainDexTracingResult():34:34 -> c
-com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses -> com.android.tools.r8.internal.ce:
+com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses -> com.android.tools.r8.internal.pd:
     com.android.tools.r8.utils.collections.BidirectionalManyToOneMap mergedClasses -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():19:19 -> <clinit>
@@ -25059,13 +25113,13 @@
     3:3:boolean com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses.isMergeTarget(com.android.tools.r8.graph.DexType):59:59 -> d
     3:3:boolean hasBeenMergedOrIsMergeTarget(com.android.tools.r8.graph.DexType):63 -> d
     1:1:boolean isMergeTarget(com.android.tools.r8.graph.DexType):59:59 -> e
-com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder -> com.android.tools.r8.internal.ce$a:
+com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder -> com.android.tools.r8.internal.pd$a:
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap mergedClasses -> a
     1:2:void <init>():81:82 -> <init>
     1:1:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses build():86:86 -> a
     2:2:void addMergeGroup(com.android.tools.r8.horizontalclassmerging.MergeGroup):90:90 -> a
     3:3:void lambda$addMergeGroup$0(com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.graph.DexProgramClass):90:90 -> a
-com.android.tools.r8.horizontalclassmerging.MergeGroup -> com.android.tools.r8.internal.yq:
+com.android.tools.r8.horizontalclassmerging.MergeGroup -> com.android.tools.r8.internal.xp:
     com.android.tools.r8.graph.DexProgramClass target -> d
     com.android.tools.r8.graph.DexField classIdField -> c
     boolean $assertionsDisabled -> a
@@ -25098,30 +25152,30 @@
     1:1:com.android.tools.r8.graph.DexProgramClass getTarget():96:96 -> d
     1:1:int com.android.tools.r8.horizontalclassmerging.MergeGroup.size():118:118 -> e
     1:1:boolean isTrivial():105 -> e
-    1:1:com.android.tools.r8.graph.DexProgramClass removeLast():130:130 -> f
+    1:1:com.android.tools.r8.graph.DexProgramClass removeLast():130:130 -> g
     1:1:boolean isEmpty():109:109 -> isEmpty
     1:1:java.util.Iterator iterator():114:114 -> iterator
     1:1:boolean removeIf(java.util.function.Predicate):126:126 -> removeIf
     1:1:int size():118:118 -> size
-com.android.tools.r8.horizontalclassmerging.MultiClassPolicy -> com.android.tools.r8.internal.wr:
+com.android.tools.r8.horizontalclassmerging.MultiClassPolicy -> com.android.tools.r8.internal.tq:
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():10:10 -> <clinit>
     1:1:void <init>():10:10 -> <init>
     java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup) -> a
     1:2:java.util.Collection removeTrivialGroups(java.util.Collection):16:17 -> a
-com.android.tools.r8.horizontalclassmerging.MultiClassSameReferencePolicy -> com.android.tools.r8.internal.xr:
+com.android.tools.r8.horizontalclassmerging.MultiClassSameReferencePolicy -> com.android.tools.r8.internal.uq:
     1:1:void <init>():12:12 -> <init>
     java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass) -> a
     1:6:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):16:21 -> a
     7:7:com.android.tools.r8.horizontalclassmerging.MergeGroup lambda$apply$0(java.lang.Object):18:18 -> a
-com.android.tools.r8.horizontalclassmerging.Policy -> com.android.tools.r8.internal.nv:
+com.android.tools.r8.horizontalclassmerging.Policy -> com.android.tools.r8.internal.gu:
     int numberOfRemovedClasses -> a
     1:1:void <init>():11:11 -> <init>
     void clear() -> a
     boolean shouldSkipPolicy() -> b
-com.android.tools.r8.horizontalclassmerging.PolicyExecutor -> com.android.tools.r8.internal.ov:
+com.android.tools.r8.horizontalclassmerging.PolicyExecutor -> com.android.tools.r8.internal.hu:
     1:1:void <init>():9:9 -> <init>
-com.android.tools.r8.horizontalclassmerging.SimplePolicyExecutor -> com.android.tools.r8.internal.XB:
+com.android.tools.r8.horizontalclassmerging.SimplePolicyExecutor -> com.android.tools.r8.internal.JA:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>():17:17 -> <init>
@@ -25134,10 +25188,10 @@
     19:19:void lambda$applyMultiClassPolicy$1(com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.horizontalclassmerging.MergeGroup):43 -> a
     20:44:java.util.Collection run(java.util.Collection,java.util.Collection):56:80 -> a
     45:45:boolean lambda$run$3(com.android.tools.r8.horizontalclassmerging.MergeGroup):80:80 -> a
-com.android.tools.r8.horizontalclassmerging.SingleClassPolicy -> com.android.tools.r8.internal.YB:
+com.android.tools.r8.horizontalclassmerging.SingleClassPolicy -> com.android.tools.r8.internal.KA:
     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.aE:
+com.android.tools.r8.horizontalclassmerging.SubtypingForrestForClasses -> com.android.tools.r8.internal.NC:
     java.util.Map subtypeMap -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Collection roots -> b
@@ -25159,13 +25213,13 @@
     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.uE:
+com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass -> com.android.tools.r8.internal.iD:
     java.util.List syntheticClassTypes -> a
     1:1:void <init>(java.util.List,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass$1):43:43 -> <init>
     2:3:void <init>(java.util.List):48:49 -> <init>
     1:1:java.util.List getArgumentClasses():53:53 -> a
-com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass$1 -> com.android.tools.r8.internal.sE:
-com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass$Builder -> com.android.tools.r8.internal.tE:
+com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass$1 -> com.android.tools.r8.internal.gD:
+com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass$Builder -> com.android.tools.r8.internal.hD:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.shaking.MainDexTracingResult$Builder mainDexTracingResultBuilder -> d
     com.android.tools.r8.shaking.MainDexTracingResult mainDexTracingResult -> c
@@ -25178,11 +25232,11 @@
     38:38:com.android.tools.r8.graph.DexType synthesizeClass(com.android.tools.r8.graph.DexProgramClass,boolean,boolean,int):115:115 -> a
     39:39:boolean lambda$synthesizeClass$0(com.android.tools.r8.graph.DexType):84:84 -> a
     40:52:com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass build(java.lang.Iterable):120:132 -> a
-    53:53:int com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.getSyntheticArgumentCount():1177:1177 -> a
+    53:53:int com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.getSyntheticArgumentCount():1319:1319 -> a
     53:53:com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass build(java.lang.Iterable):132 -> a
     54:54:com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass build(java.lang.Iterable):135:135 -> a
     55:59:com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass build(java.lang.Iterable):134:138 -> a
-com.android.tools.r8.horizontalclassmerging.TreeFixer -> com.android.tools.r8.internal.eF:
+com.android.tools.r8.horizontalclassmerging.TreeFixer -> com.android.tools.r8.internal.XD:
     com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses mergedClasses -> h
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder lensBuilder -> i
     com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass syntheticArgumentClass -> l
@@ -25193,56 +25247,56 @@
     1:1:void <clinit>():39:39 -> <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.horizontalclassmerging.SyntheticArgumentClass):53:53 -> <init>
     2:14: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.horizontalclassmerging.SyntheticArgumentClass):46:58 -> <init>
-    1:7: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):135:141 -> a
-    8:8:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSet():218:218 -> a
-    8:8: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):143 -> a
-    9:19: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:155 -> a
-    20:32:com.android.tools.r8.graph.DexEncodedMethod fixupProgramMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):214:226 -> a
-    33:47:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):234:248 -> a
-    48:55:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):246:253 -> a
-    56:62:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):251:257 -> a
-    63:77:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):256:270 -> a
-    78:78:boolean lambda$fixupDirectMethod$3(java.util.Set,com.android.tools.r8.graph.DexMethod):249:249 -> a
-    79:80: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):299:300 -> a
-    81:94: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):276:289 -> a
-    81:94: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):303 -> a
-    95:95:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.TreeFixerBase.fixupMethodSignature(com.android.tools.r8.graph.DexMethodSignature):341:341 -> a
-    95:95: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):306 -> a
-    96:119: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:335 -> a
-    120:124: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):334:338 -> a
-    125:129: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):319:323 -> a
-    130:157: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):320:347 -> a
-    158:160:boolean lambda$fixupVirtualMethod$5(java.util.Set,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.DexMethodSignature):325:327 -> a
-    161:164:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):354:357 -> a
-    165:165:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():164:164 -> a
-    165:165:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):358 -> a
-    166:176:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):359:369 -> a
-    177:177:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.DexItemFactory.createFreshMember(java.util.function.Function,java.lang.String):1912:1912 -> a
-    177:177:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):365 -> a
-    178:189:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):365:376 -> a
-    190:190:java.util.Optional lambda$fixupFields$7(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexString):367:367 -> a
-    191:191: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):187:187 -> a
-    191:191:java.util.Optional lambda$fixupFields$7(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexString):367 -> a
-    192:193:java.util.Optional lambda$fixupFields$7(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexString):367:368 -> a
-    194:194:boolean lambda$fixupFields$6(java.util.Set,com.android.tools.r8.graph.DexField):368:368 -> a
-    195:195:void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):389:389 -> a
-    196:196:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):395:395 -> a
-    197:197:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):401:401 -> a
-    1:11:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens fixupTypeReferences():115:125 -> b
-    12:12: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):147:147 -> b
-    13:13:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):161:161 -> b
-    14:14:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexMethod.getProto():62:62 -> b
-    14:14:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):166 -> b
-    15:15:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):166:166 -> b
-    16:34:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):165:183 -> b
-    35:47:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):182:194 -> b
-    48:59:void fixupInterfaceClass(com.android.tools.r8.graph.DexProgramClass):198:209 -> b
-    60:60:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupInterfaceClass$2(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):205:205 -> b
-    61:62:boolean lambda$fixupDirectMethod$4(java.util.Set,com.android.tools.r8.graph.DexMethod):262:263 -> b
-    63:63:com.android.tools.r8.graph.DexType mapClassType(com.android.tools.r8.graph.DexType):383:383 -> b
+    1:11:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens fixupTypeReferences():115:125 -> a
+    12:18: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):135:141 -> a
+    19:19:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSet():218:218 -> a
+    19:19: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):143 -> a
+    20:30: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:155 -> a
+    31:43:com.android.tools.r8.graph.DexEncodedMethod fixupProgramMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):214:226 -> a
+    44:58:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):234:248 -> a
+    59:66:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):246:253 -> a
+    67:73:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):251:257 -> a
+    74:88:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):256:270 -> a
+    89:89:boolean lambda$fixupDirectMethod$3(java.util.Set,com.android.tools.r8.graph.DexMethod):249:249 -> a
+    90:91: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):299:300 -> a
+    92:105: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):276:289 -> a
+    92:105: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):303 -> a
+    106:106:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.TreeFixerBase.fixupMethodSignature(com.android.tools.r8.graph.DexMethodSignature):313:313 -> a
+    106:106: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):306 -> a
+    107:130: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:335 -> a
+    131:135: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):334:338 -> a
+    136:140: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):319:323 -> a
+    141:168: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):320:347 -> a
+    169:171:boolean lambda$fixupVirtualMethod$5(java.util.Set,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.DexMethodSignature):325:327 -> a
+    172:175:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):354:357 -> a
+    176:176:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():158:158 -> a
+    176:176:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):358 -> a
+    177:187:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):359:369 -> a
+    188:188:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.DexItemFactory.createFreshMember(java.util.function.Function,java.lang.String):1893:1893 -> a
+    188:188:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):365 -> a
+    189:200:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):365:376 -> a
+    201:201:java.util.Optional lambda$fixupFields$7(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexString):367:367 -> a
+    202:202: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):175:175 -> a
+    202:202:java.util.Optional lambda$fixupFields$7(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexString):367 -> a
+    203:204:java.util.Optional lambda$fixupFields$7(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexString):367:368 -> a
+    205:205:boolean lambda$fixupFields$6(java.util.Set,com.android.tools.r8.graph.DexField):368:368 -> a
+    206:206:void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):389:389 -> a
+    207:207:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):395:395 -> a
+    208:208:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):401:401 -> a
+    1:1: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):147:147 -> b
+    2:2:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):161:161 -> b
+    3:3:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexMethod.getProto():62:62 -> b
+    3:3:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):166 -> b
+    4:4:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):166:166 -> b
+    5:23:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):165:183 -> b
+    24:36:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):182:194 -> b
+    37:48:void fixupInterfaceClass(com.android.tools.r8.graph.DexProgramClass):198:209 -> b
+    49:49:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupInterfaceClass$2(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):205:205 -> b
+    50:51:boolean lambda$fixupDirectMethod$4(java.util.Set,com.android.tools.r8.graph.DexMethod):262:263 -> b
+    52:52:com.android.tools.r8.graph.DexType mapClassType(com.android.tools.r8.graph.DexType):383:383 -> b
     1:1:void fixupProgramClassSuperType(com.android.tools.r8.graph.DexProgramClass):130:130 -> c
     2:2:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupProgramClass$1(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):150:150 -> c
-com.android.tools.r8.horizontalclassmerging.VirtualMethodEntryPoint -> com.android.tools.r8.internal.ZG:
+com.android.tools.r8.horizontalclassmerging.VirtualMethodEntryPoint -> com.android.tools.r8.internal.rG:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap mappedMethods -> n
     com.android.tools.r8.graph.DexField classIdField -> o
@@ -25260,14 +25314,14 @@
     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.aH:
+com.android.tools.r8.horizontalclassmerging.VirtualMethodEntryPointSynthesizedCode -> com.android.tools.r8.internal.sG:
     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):23:28 -> <init>
     boolean isHorizontalClassMergingCode() -> C
     1:1:java.util.function.Consumer getRegistryCallback():33:33 -> E
     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):25:25 -> a
     1:2:void registerReachableDefinitions(com.android.tools.r8.graph.UseRegistry):37:38 -> b
-com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger -> com.android.tools.r8.internal.cH:
+com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger -> com.android.tools.r8.internal.uG:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.horizontalclassmerging.MergeGroup group -> c
     java.util.List methods -> d
@@ -25283,14 +25337,14 @@
     46:46:boolean lambda$isNop$6(com.android.tools.r8.graph.ProgramMethod):154:154 -> a
     47:81:void mergeTrivial(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):180:214 -> a
     82:82:void lambda$mergeTrivial$9(com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.graph.DexEncodedMethod$Builder):209:209 -> a
-    83:83:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setIsLibraryMethodOverrideIfKnown(com.android.tools.r8.utils.OptionalBool):1614:1614 -> a
+    83:83:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setIsLibraryMethodOverrideIfKnown(com.android.tools.r8.utils.OptionalBool):1629:1629 -> a
     83:83:void lambda$mergeTrivial$9(com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.graph.DexEncodedMethod$Builder):209 -> a
-    84:84:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setIsLibraryMethodOverrideIf(boolean,com.android.tools.r8.utils.OptionalBool):1607:1607 -> a
-    84:84:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setIsLibraryMethodOverrideIfKnown(com.android.tools.r8.utils.OptionalBool):1613 -> a
+    84:84:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setIsLibraryMethodOverrideIf(boolean,com.android.tools.r8.utils.OptionalBool):1622:1622 -> a
+    84:84:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setIsLibraryMethodOverrideIfKnown(com.android.tools.r8.utils.OptionalBool):1628 -> a
     84:84:void lambda$mergeTrivial$9(com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.graph.DexEncodedMethod$Builder):209 -> a
     85:124:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):221:260 -> a
     125:146:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):256:277 -> a
-    147:147: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):296:296 -> a
+    147:147: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):297:297 -> a
     147:147:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):277 -> a
     148:160:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):281:293 -> a
     161:161:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):225:225 -> a
@@ -25301,10 +25355,10 @@
     4:4:boolean lambda$isTrivial$7(com.android.tools.r8.graph.ProgramMethod):170:170 -> b
     1:1:boolean lambda$getAccessFlags$2(com.android.tools.r8.graph.MethodAccessFlags):128:128 -> c
     2:2:com.android.tools.r8.graph.DexMethod getNewMethodReference():145:145 -> c
-    3:3:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexItemFactory):279:279 -> c
+    3:3:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexItemFactory):274:274 -> c
     3:3:com.android.tools.r8.graph.DexMethod getNewMethodReference():145 -> c
-    4:4:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):283:283 -> c
-    4:4:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexItemFactory):279 -> c
+    4:4:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):278:278 -> c
+    4:4:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexItemFactory):274 -> c
     4:4:com.android.tools.r8.graph.DexMethod getNewMethodReference():145 -> c
     5:5:boolean lambda$mergeTrivial$8(com.android.tools.r8.graph.ProgramMethod):184:184 -> c
     1:1:boolean lambda$getAccessFlags$3(com.android.tools.r8.graph.MethodAccessFlags):131:131 -> d
@@ -25312,41 +25366,41 @@
     1:1:boolean lambda$getAccessFlags$4(com.android.tools.r8.graph.MethodAccessFlags):134:134 -> e
     2:9:boolean isTrivial():163:170 -> e
     1:1:boolean lambda$getAccessFlags$5(com.android.tools.r8.graph.MethodAccessFlags):137:137 -> f
-com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder -> com.android.tools.r8.internal.bH:
+com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder -> com.android.tools.r8.internal.tG:
     java.util.List methods -> a
     1:2:void <init>():51:52 -> <init>
     1:1:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder add(com.android.tools.r8.graph.ProgramMethod):55:55 -> a
     2:2:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.MergeGroup):85:85 -> 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):61:64 -> a
     3:6:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.MergeGroup):85 -> a
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getSuperType():658:658 -> a
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getSuperType():640:640 -> 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):65 -> a
     7:7:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.MergeGroup):85 -> 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):65:76 -> a
     8:19:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.MergeGroup):85 -> a
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getSuperType():658:658 -> a
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getSuperType():640:640 -> 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):77 -> a
     20:20:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.MergeGroup):85 -> 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):77:79 -> a
     21:23:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.MergeGroup):85 -> a
     24:24:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.MergeGroup):86:86 -> a
-com.android.tools.r8.horizontalclassmerging.policies.AllInstantiatedOrUninstantiated -> com.android.tools.r8.internal.V0:
+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.CheckAbstractClasses -> com.android.tools.r8.internal.N5:
+com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses -> com.android.tools.r8.internal.z5:
     com.android.tools.r8.utils.InternalOptions options -> c
     1:2:void <init>(com.android.tools.r8.graph.AppView):23:24 -> <init>
     1:3:com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses$AbstractClassification com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses.getMergeKey(com.android.tools.r8.graph.DexProgramClass):36:38 -> a
     1:3:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):14 -> a
     1:1:boolean shouldSkipPolicy():31:31 -> b
-com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses$AbstractClassification -> com.android.tools.r8.internal.M5:
+com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses$AbstractClassification -> com.android.tools.r8.internal.y5:
     com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses$AbstractClassification NOT_ABSTRACT -> b
     com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses$AbstractClassification ABSTRACT -> a
     1:2:void <clinit>():17:18 -> <clinit>
     1:1:void <init>(java.lang.String,int):16:16 -> <init>
-com.android.tools.r8.horizontalclassmerging.policies.DontInlinePolicy -> com.android.tools.r8.internal.wa:
+com.android.tools.r8.horizontalclassmerging.policies.DontInlinePolicy -> com.android.tools.r8.internal.T9:
     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>
@@ -25357,20 +25411,21 @@
     4:27:boolean lambda$canMerge$0(com.android.tools.r8.graph.ProgramMethod):64 -> a
     28:28:boolean com.android.tools.r8.horizontalclassmerging.policies.DontInlinePolicy.disallowInlining(com.android.tools.r8.graph.ProgramMethod):52:52 -> a
     28:28:boolean lambda$canMerge$0(com.android.tools.r8.graph.ProgramMethod):64 -> a
-com.android.tools.r8.horizontalclassmerging.policies.DontMergeSynchronizedClasses -> com.android.tools.r8.internal.xa:
+com.android.tools.r8.horizontalclassmerging.policies.DontMergeSynchronizedClasses -> com.android.tools.r8.internal.U9:
     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:4:boolean lambda$apply$0(java.util.Collection,com.android.tools.r8.graph.DexProgramClass):36:38 -> a
     5:29:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):31:55 -> a
-com.android.tools.r8.horizontalclassmerging.policies.IgnoreSynthetics -> com.android.tools.r8.internal.ue:
+com.android.tools.r8.horizontalclassmerging.policies.IgnoreSynthetics -> com.android.tools.r8.internal.Gd:
     com.android.tools.r8.graph.AppView appView -> b
     1:2:void <init>(com.android.tools.r8.graph.AppView):16:17 -> <init>
-    1:3:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):22:24 -> a
-    4:4:boolean com.android.tools.r8.synthesis.SyntheticItems.isLegacySyntheticClass(com.android.tools.r8.graph.DexProgramClass):209:209 -> a
-    4:4:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):24 -> a
-com.android.tools.r8.horizontalclassmerging.policies.LimitGroups -> com.android.tools.r8.internal.Ao:
+    1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):22:22 -> a
+    2:2:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):247:247 -> a
+    2:2:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):22 -> a
+    3:4:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):23:24 -> a
+com.android.tools.r8.horizontalclassmerging.policies.LimitGroups -> com.android.tools.r8.internal.En:
     int maxGroupSize -> d
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():16:16 -> <clinit>
@@ -25382,7 +25437,7 @@
     10:11:com.android.tools.r8.horizontalclassmerging.MergeGroup com.android.tools.r8.horizontalclassmerging.policies.LimitGroups.createNewGroup(java.util.LinkedList):51:52 -> a
     10:11:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):35 -> a
     12:19:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):37:44 -> a
-com.android.tools.r8.horizontalclassmerging.policies.MinimizeFieldCasts -> com.android.tools.r8.internal.kr:
+com.android.tools.r8.horizontalclassmerging.policies.MinimizeFieldCasts -> com.android.tools.r8.internal.iq:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():20:20 -> <clinit>
     1:1:void <init>():20:20 -> <init>
@@ -25392,65 +25447,71 @@
     39:39:com.android.tools.r8.horizontalclassmerging.MergeGroup lambda$addExact$2(com.android.tools.r8.com.google.common.collect.Multiset):63:63 -> a
     40:41:com.android.tools.r8.com.google.common.collect.Multiset com.android.tools.r8.horizontalclassmerging.policies.MinimizeFieldCasts.getExactMergeKey(com.android.tools.r8.graph.DexProgramClass):67:68 -> a
     40:41:void addExact(com.android.tools.r8.graph.DexProgramClass,java.util.Map):63 -> a
-    42:42:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():164:164 -> a
-    42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.getType():168 -> a
+    42:42:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():158:158 -> a
+    42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.getType():162 -> a
     42:42:com.android.tools.r8.com.google.common.collect.Multiset com.android.tools.r8.horizontalclassmerging.policies.MinimizeFieldCasts.getExactMergeKey(com.android.tools.r8.graph.DexProgramClass):69 -> a
     42:42:void addExact(com.android.tools.r8.graph.DexProgramClass,java.util.Map):63 -> a
-    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():49:49 -> a
-    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.getType():168 -> a
+    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():46:46 -> a
+    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.getType():162 -> a
     43:43:com.android.tools.r8.com.google.common.collect.Multiset com.android.tools.r8.horizontalclassmerging.policies.MinimizeFieldCasts.getExactMergeKey(com.android.tools.r8.graph.DexProgramClass):69 -> a
     43:43:void addExact(com.android.tools.r8.graph.DexProgramClass,java.util.Map):63 -> a
     44:44:com.android.tools.r8.com.google.common.collect.Multiset com.android.tools.r8.horizontalclassmerging.policies.MinimizeFieldCasts.getExactMergeKey(com.android.tools.r8.graph.DexProgramClass):69:69 -> a
     44:44:void addExact(com.android.tools.r8.graph.DexProgramClass,java.util.Map):63 -> a
     45:45:void addExact(com.android.tools.r8.graph.DexProgramClass,java.util.Map):63:63 -> a
-com.android.tools.r8.horizontalclassmerging.policies.NoAnnotations -> com.android.tools.r8.internal.qs:
+com.android.tools.r8.horizontalclassmerging.policies.NoAnnotations -> com.android.tools.r8.internal.mr:
     1:1:void <init>():10:10 -> <init>
-    1:1:boolean com.android.tools.r8.graph.DexClass.isAnnotation():571:571 -> a
+    1:1:boolean com.android.tools.r8.graph.DexClass.isAnnotation():553:553 -> a
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):13 -> a
-com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerWithObservableSideEffects -> com.android.tools.r8.internal.rs:
+com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerWithObservableSideEffects -> com.android.tools.r8.internal.nr:
     1:1:void <init>():16:16 -> <init>
     1:5:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):20:24 -> a
     6:7:boolean com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerWithObservableSideEffects.isKotlinLambda(com.android.tools.r8.graph.DexProgramClass):28:29 -> a
     6:7:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):24 -> a
-com.android.tools.r8.horizontalclassmerging.policies.NoClassesOrMembersWithAnnotations -> com.android.tools.r8.internal.ss:
+com.android.tools.r8.horizontalclassmerging.policies.NoClassesOrMembersWithAnnotations -> com.android.tools.r8.internal.or:
     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.NoDirectRuntimeTypeChecks -> com.android.tools.r8.internal.ts:
+com.android.tools.r8.horizontalclassmerging.policies.NoDirectRuntimeTypeChecks -> com.android.tools.r8.internal.pr:
     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):20:20 -> a
-com.android.tools.r8.horizontalclassmerging.policies.NoEnums -> com.android.tools.r8.internal.us:
+com.android.tools.r8.horizontalclassmerging.policies.NoEnums -> com.android.tools.r8.internal.qr:
     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:void clear():26:26 -> a
     2:5:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):31:34 -> a
-    6:18:boolean isEnumSubtype(com.android.tools.r8.graph.DexClass):41:53 -> a
-com.android.tools.r8.horizontalclassmerging.policies.NoIndirectRuntimeTypeChecks -> com.android.tools.r8.internal.vs:
+    6:15:boolean isEnumSubtype(com.android.tools.r8.graph.DexClass):41:50 -> a
+    16:16:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    16:16:boolean isEnumSubtype(com.android.tools.r8.graph.DexClass):50 -> a
+    17:19:boolean isEnumSubtype(com.android.tools.r8.graph.DexClass):51:53 -> a
+com.android.tools.r8.horizontalclassmerging.policies.NoIndirectRuntimeTypeChecks -> com.android.tools.r8.internal.rr:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap cache -> e
     com.android.tools.r8.graph.AppView appView -> c
     com.android.tools.r8.shaking.RuntimeTypeCheckInfo runtimeTypeCheckInfo -> d
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RuntimeTypeCheckInfo):26:26 -> <init>
     2:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RuntimeTypeCheckInfo):23:28 -> <init>
     1:1:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):18:18 -> a
-    2:21:boolean computeInterfaceHasDirectOrIndirectRuntimeTypeCheck(com.android.tools.r8.graph.DexType):43:62 -> a
-    22:22:boolean computeInterfaceHasDirectOrIndirectRuntimeTypeCheck(com.android.tools.r8.graph.DexType):48:48 -> a
+    2:5:boolean computeInterfaceHasDirectOrIndirectRuntimeTypeCheck(com.android.tools.r8.graph.DexType):43:46 -> a
+    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    6:6:boolean computeInterfaceHasDirectOrIndirectRuntimeTypeCheck(com.android.tools.r8.graph.DexType):46 -> a
+    7:22:boolean computeInterfaceHasDirectOrIndirectRuntimeTypeCheck(com.android.tools.r8.graph.DexType):47:62 -> a
+    23:23:boolean computeInterfaceHasDirectOrIndirectRuntimeTypeCheck(com.android.tools.r8.graph.DexType):48:48 -> a
     1:2:com.android.tools.r8.graph.DexTypeList getMergeKey(com.android.tools.r8.graph.DexProgramClass):37:38 -> b
-    3:4:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexTypeList.keepIf(java.util.function.Predicate):62:63 -> b
+    3:4:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexTypeList.keepIf(java.util.function.Predicate):58:59 -> b
     3:4:com.android.tools.r8.graph.DexTypeList getMergeKey(com.android.tools.r8.graph.DexProgramClass):38 -> b
     5:5:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexTypeList.create(com.android.tools.r8.graph.DexType[]):50:50 -> b
-    5:5:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexTypeList.keepIf(java.util.function.Predicate):64 -> b
+    5:5:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexTypeList.keepIf(java.util.function.Predicate):60 -> b
     5:5:com.android.tools.r8.graph.DexTypeList getMergeKey(com.android.tools.r8.graph.DexProgramClass):38 -> b
-    6:12:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexTypeList.getSorted():149:155 -> b
+    6:12:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexTypeList.getSorted():145:151 -> b
     6:12:com.android.tools.r8.graph.DexTypeList getMergeKey(com.android.tools.r8.graph.DexProgramClass):39 -> b
-com.android.tools.r8.horizontalclassmerging.policies.NoInnerClasses -> com.android.tools.r8.internal.ws:
+com.android.tools.r8.horizontalclassmerging.policies.NoInnerClasses -> com.android.tools.r8.internal.sr:
     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.NoInterfaces -> com.android.tools.r8.internal.xs:
+com.android.tools.r8.horizontalclassmerging.policies.NoInterfaces -> com.android.tools.r8.internal.tr:
     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.ys:
+com.android.tools.r8.horizontalclassmerging.policies.NoKeepRules -> com.android.tools.r8.internal.ur:
     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>
@@ -25459,14 +25520,14 @@
     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.NoKotlinLambdas -> com.android.tools.r8.internal.zs:
+com.android.tools.r8.horizontalclassmerging.policies.NoKotlinLambdas -> com.android.tools.r8.internal.vr:
     com.android.tools.r8.graph.AppView appView -> b
     1:2:void <init>(com.android.tools.r8.graph.AppView):15:16 -> <init>
     1:6:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):26:31 -> a
     1:1:boolean shouldSkipPolicy():21:21 -> b
-    2:2:boolean com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.isKotlinLambdaMergingEnabled():1197:1197 -> b
+    2:2:boolean com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.isKotlinLambdaMergingEnabled():1339:1339 -> b
     2:2:boolean shouldSkipPolicy():21 -> b
-com.android.tools.r8.horizontalclassmerging.policies.NoKotlinMetadata -> com.android.tools.r8.internal.As:
+com.android.tools.r8.horizontalclassmerging.policies.NoKotlinMetadata -> com.android.tools.r8.internal.wr:
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -25477,69 +25538,68 @@
     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.Bs:
+com.android.tools.r8.horizontalclassmerging.policies.NoNativeMethods -> com.android.tools.r8.internal.xr:
     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.NoServiceLoaders -> com.android.tools.r8.internal.Cs:
+com.android.tools.r8.horizontalclassmerging.policies.NoServiceLoaders -> com.android.tools.r8.internal.yr:
     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.NotMatchedByNoHorizontalClassMerging -> com.android.tools.r8.internal.Os:
+com.android.tools.r8.horizontalclassmerging.policies.NotMatchedByNoHorizontalClassMerging -> com.android.tools.r8.internal.Ir:
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set deadEnumLiteMaps -> c
     1:5:void <init>(com.android.tools.r8.graph.AppView):21:25 -> <init>
     6:6:void <init>(com.android.tools.r8.graph.AppView):24:24 -> <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.Qs:
+com.android.tools.r8.horizontalclassmerging.policies.NotVerticallyMergedIntoSubtype -> com.android.tools.r8.internal.Kr:
     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.PreserveMethodCharacteristics -> com.android.tools.r8.internal.Iv:
+com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics -> com.android.tools.r8.internal.Bu:
     com.android.tools.r8.graph.AppView appView -> d
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():28:28 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView):77:78 -> <init>
-    1:16:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):120:135 -> a
-    17:17:boolean lambda$apply$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$TargetGroup):123:123 -> a
-com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$MethodCharacteristics -> com.android.tools.r8.internal.Gv:
+    1:16:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):112:127 -> a
+    17:17:boolean lambda$apply$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$TargetGroup):115:115 -> a
+com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$MethodCharacteristics -> com.android.tools.r8.internal.zu:
     com.android.tools.r8.utils.OptionalBool isLibraryMethodOverride -> c
     com.android.tools.r8.graph.MethodAccessFlags accessFlags -> a
     boolean isAssumeNoSideEffectsMethod -> b
     1:11:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):36:46 -> <init>
     1:2:com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$MethodCharacteristics create(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):51:52 -> a
-    3:3:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeNoSideEffectsMethod(com.android.tools.r8.graph.DexMethod):587:587 -> a
+    3:3:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeNoSideEffectsMethod(com.android.tools.r8.graph.DexMethod):580:580 -> a
     3:3:com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$MethodCharacteristics create(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):52 -> a
     4:4:com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$MethodCharacteristics create(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):52:52 -> a
     1:5:boolean equals(java.lang.Object):65:69 -> equals
     1:1:int hashCode():57:57 -> hashCode
-com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$TargetGroup -> com.android.tools.r8.internal.Hv:
+com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$TargetGroup -> com.android.tools.r8.internal.Au:
     com.android.tools.r8.horizontalclassmerging.MergeGroup group -> a
     java.util.Map methodMap -> b
     1:4:void <init>():81:84 -> <init>
     1:1:com.android.tools.r8.horizontalclassmerging.MergeGroup getGroup():87:87 -> a
     2:4:boolean tryAdd(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):91:93 -> a
-    5:5:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexEncodedMethod.getSignature():406:406 -> a
+    5:5:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexEncodedMethod.getSignature():407:407 -> a
     5:5:boolean tryAdd(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):93 -> a
     6:6:void com.android.tools.r8.graph.DexMethodSignature.<init>(com.android.tools.r8.graph.DexMethod):14:14 -> a
-    6:6:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexEncodedMethod.getSignature():406 -> a
+    6:6:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexEncodedMethod.getSignature():407 -> a
     6:6:boolean tryAdd(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):93 -> a
     7:18:boolean tryAdd(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):94:105 -> a
-    19:19:boolean isSubjectToMethodMerging(com.android.tools.r8.graph.DexEncodedMethod):110:110 -> a
-com.android.tools.r8.horizontalclassmerging.policies.PreventMergeIntoMainDex -> com.android.tools.r8.internal.Kv:
+com.android.tools.r8.horizontalclassmerging.policies.PreventMergeIntoMainDex -> com.android.tools.r8.internal.Du:
     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):27:29 -> <init>
     1:10:com.android.tools.r8.horizontalclassmerging.policies.PreventMergeIntoMainDex$MainDexClassification com.android.tools.r8.horizontalclassmerging.policies.PreventMergeIntoMainDex.getMergeKey(com.android.tools.r8.graph.DexProgramClass):34:43 -> a
     1:10:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):15 -> a
-com.android.tools.r8.horizontalclassmerging.policies.PreventMergeIntoMainDex$MainDexClassification -> com.android.tools.r8.internal.Jv:
+com.android.tools.r8.horizontalclassmerging.policies.PreventMergeIntoMainDex$MainDexClassification -> com.android.tools.r8.internal.Cu:
     com.android.tools.r8.horizontalclassmerging.policies.PreventMergeIntoMainDex$MainDexClassification MAIN_DEX_LIST -> a
     com.android.tools.r8.horizontalclassmerging.policies.PreventMergeIntoMainDex$MainDexClassification MAIN_DEX_ROOT -> b
     com.android.tools.r8.horizontalclassmerging.policies.PreventMergeIntoMainDex$MainDexClassification MAIN_DEX_DEPENDENCY -> c
     com.android.tools.r8.horizontalclassmerging.policies.PreventMergeIntoMainDex$MainDexClassification NOT_IN_MAIN_DEX -> d
     1:4:void <clinit>():20:23 -> <clinit>
     1:1:void <init>(java.lang.String,int):19:19 -> <init>
-com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation -> com.android.tools.r8.internal.Tv:
+com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation -> com.android.tools.r8.internal.Mu:
     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
@@ -25558,37 +25618,42 @@
     26:26:com.android.tools.r8.horizontalclassmerging.MergeGroup lambda$apply$0(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$DispatchSignature):168:168 -> a
     1:1:com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$InterfaceDefaultSignaturesCache access$600(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation):51:51 -> b
     1:1:com.android.tools.r8.horizontalclassmerging.SubtypingForrestForClasses access$700(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation):51:51 -> c
-com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$1 -> com.android.tools.r8.internal.Lv:
-com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$DexClassSignaturesCache -> com.android.tools.r8.internal.Mv:
+com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$1 -> com.android.tools.r8.internal.Eu:
+com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$DexClassSignaturesCache -> com.android.tools.r8.internal.Fu:
     com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation this$0 -> b
     1:1:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation):78:78 -> <init>
     2:2:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation,com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$1):78:78 -> <init>
-    1:2:com.android.tools.r8.utils.collections.DexMethodSignatureSet getOrComputeSignatures(com.android.tools.r8.graph.DexType):81:82 -> a
-com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$DispatchSignature -> com.android.tools.r8.internal.Nv:
+    1:1:com.android.tools.r8.utils.collections.DexMethodSignatureSet getOrComputeSignatures(com.android.tools.r8.graph.DexType):81:81 -> a
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    2:2:com.android.tools.r8.utils.collections.DexMethodSignatureSet getOrComputeSignatures(com.android.tools.r8.graph.DexType):81 -> a
+    3:3:com.android.tools.r8.utils.collections.DexMethodSignatureSet getOrComputeSignatures(com.android.tools.r8.graph.DexType):82:82 -> a
+com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$DispatchSignature -> com.android.tools.r8.internal.Gu:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():131:131 -> <clinit>
     1:1:void <init>():131:131 -> <init>
-com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$InterfaceDefaultSignaturesCache -> com.android.tools.r8.internal.Ov:
+com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$InterfaceDefaultSignaturesCache -> com.android.tools.r8.internal.Hu:
     1:1:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation):86:86 -> <init>
     2:2:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation,com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$1):86:86 -> <init>
     1:2:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):90:91 -> a
-com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$MethodCategory -> com.android.tools.r8.internal.Pv:
+com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$MethodCategory -> com.android.tools.r8.internal.Iu:
     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>():127:128 -> <clinit>
     1:1:void <init>(java.lang.String,int):126:126 -> <init>
-com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$ParentClassSignaturesCache -> com.android.tools.r8.internal.Qv:
+com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$ParentClassSignaturesCache -> com.android.tools.r8.internal.Ju:
     com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation this$0 -> c
     1:1:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation):95:95 -> <init>
     2:2:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation,com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$1):95:95 -> <init>
     1:1:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):99:99 -> a
-    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getSuperType():658:658 -> a
+    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getSuperType():640:640 -> a
     2:2:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):100 -> a
     3:3:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):101:101 -> a
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getSuperType():658:658 -> a
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getSuperType():640:640 -> a
     4:4:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):101 -> a
-    5:7:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):101:103 -> a
-com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$ReservedInterfaceSignaturesFor -> com.android.tools.r8.internal.Rv:
+    5:5:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    5:5:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):101 -> a
+    6:6:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):103:103 -> a
+com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$ReservedInterfaceSignaturesFor -> com.android.tools.r8.internal.Ku:
     com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation this$0 -> b
     1:1:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation):109:109 -> <init>
     2:2:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation,com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$1):109:109 -> <init>
@@ -25596,14 +25661,14 @@
     2:2:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):114:114 -> a
     3:6:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):113:116 -> a
     7:9:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):115:117 -> a
-com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$SignaturesCache -> com.android.tools.r8.internal.Sv:
+com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$SignaturesCache -> com.android.tools.r8.internal.Lu:
     java.util.Map memoizedSignatures -> a
     1:2:void <init>():62:63 -> <init>
     3:3:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$1):62:62 -> <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):66:66 -> 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):69:70 -> a
-com.android.tools.r8.horizontalclassmerging.policies.RespectPackageBoundaries -> com.android.tools.r8.internal.pA:
+com.android.tools.r8.horizontalclassmerging.policies.RespectPackageBoundaries -> com.android.tools.r8.internal.bz:
     com.android.tools.r8.graph.AppView appView -> c
     1:2:void <init>(com.android.tools.r8.graph.AppView):23:24 -> <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):47:52 -> a
@@ -25611,21 +25676,18 @@
     8:10:boolean lambda$tryFindRestrictedPackage$1(java.util.Map,com.android.tools.r8.graph.DexProgramClass):62:64 -> a
     11:34:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):73:96 -> a
     35:35:com.android.tools.r8.horizontalclassmerging.MergeGroup lambda$apply$2(java.lang.String):80:80 -> a
-    36:36:boolean com.android.tools.r8.graph.DexClass.isPublic():630:630 -> a
+    36:36:boolean com.android.tools.r8.graph.DexClass.isPublic():612:612 -> a
     36:36:boolean shouldRestrictMergingAcrossPackageBoundary(com.android.tools.r8.graph.DexProgramClass):29 -> a
     37:38:boolean shouldRestrictMergingAcrossPackageBoundary(com.android.tools.r8.graph.DexProgramClass):34:35 -> a
     39:39:boolean com.android.tools.r8.graph.AccessFlags.isPackagePrivateOrProtected():145:145 -> a
     39:39:boolean shouldRestrictMergingAcrossPackageBoundary(com.android.tools.r8.graph.DexProgramClass):35 -> a
     40:51:boolean shouldRestrictMergingAcrossPackageBoundary(com.android.tools.r8.graph.DexProgramClass):43:54 -> a
-com.android.tools.r8.horizontalclassmerging.policies.SameFeatureSplit -> com.android.tools.r8.internal.pB:
+com.android.tools.r8.horizontalclassmerging.policies.SameFeatureSplit -> com.android.tools.r8.internal.bA:
     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
-    2:2:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition):124:124 -> a
-    2:2:com.android.tools.r8.FeatureSplit com.android.tools.r8.horizontalclassmerging.policies.SameFeatureSplit.getMergeKey(com.android.tools.r8.graph.DexProgramClass):22 -> a
-    2:2:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):13 -> a
-com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields -> com.android.tools.r8.internal.rB:
+com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields -> com.android.tools.r8.internal.dA:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     1:2:void <init>(com.android.tools.r8.graph.AppView):24:25 -> <init>
     1:3:com.android.tools.r8.com.google.common.collect.Multiset com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields.getMergeKey(com.android.tools.r8.graph.DexProgramClass):30:32 -> a
@@ -25634,45 +25696,49 @@
     4:4:boolean com.android.tools.r8.com.google.common.collect.HashMultiset.add(java.lang.Object):33 -> a
     4:4:com.android.tools.r8.com.google.common.collect.Multiset com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields.getMergeKey(com.android.tools.r8.graph.DexProgramClass):32 -> a
     4:4:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):20 -> a
-com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo -> com.android.tools.r8.internal.qB:
+com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo -> com.android.tools.r8.internal.cA:
     com.android.tools.r8.graph.DexType type -> b
     com.android.tools.r8.graph.FieldAccessFlags accessFlags -> a
     1:6:void <init>(com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.DexType):42:47 -> <init>
     1:1:com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo createExact(com.android.tools.r8.graph.DexEncodedField):51:51 -> a
-    2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():164:164 -> a
-    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.getType():168 -> a
+    2:2:com.android.tools.r8.graph.FieldAccessFlags com.android.tools.r8.graph.DexEncodedField.getAccessFlags():128:128 -> a
     2:2:com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo createExact(com.android.tools.r8.graph.DexEncodedField):51 -> a
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():49:49 -> a
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.getType():168 -> a
+    3:3:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():158:158 -> a
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.getType():162 -> a
     3:3:com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo createExact(com.android.tools.r8.graph.DexEncodedField):51 -> a
-    4:4:com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo createExact(com.android.tools.r8.graph.DexEncodedField):51:51 -> a
-    5:6:com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo createRelaxed(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexItemFactory):56:57 -> a
-    7:7:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():164:164 -> a
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.getType():168 -> a
-    7:7:com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo createRelaxed(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexItemFactory):58 -> a
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():49:49 -> a
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.getType():168 -> a
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():46:46 -> a
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.getType():162 -> a
+    4:4:com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo createExact(com.android.tools.r8.graph.DexEncodedField):51 -> a
+    5:5:com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo createExact(com.android.tools.r8.graph.DexEncodedField):51:51 -> a
+    6:6:com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo createRelaxed(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexItemFactory):56:56 -> a
+    7:7:com.android.tools.r8.graph.FieldAccessFlags com.android.tools.r8.graph.DexEncodedField.getAccessFlags():128:128 -> a
+    7:7:com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo createRelaxed(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexItemFactory):57 -> a
+    8:8:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():158:158 -> a
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.getType():162 -> a
     8:8:com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo createRelaxed(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexItemFactory):58 -> a
-    9:9:com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo createRelaxed(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexItemFactory):58:58 -> a
-    10:10:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():164:164 -> a
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.getType():168 -> a
-    10:10:com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo createRelaxed(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexItemFactory):58 -> a
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():49:49 -> a
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.getType():168 -> a
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():46:46 -> a
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.getType():162 -> a
+    9:9:com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo createRelaxed(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexItemFactory):58 -> a
+    10:10:com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo createRelaxed(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexItemFactory):58:58 -> a
+    11:11:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():158:158 -> a
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.getType():162 -> a
     11:11:com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo createRelaxed(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexItemFactory):58 -> a
-    12:12:com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo createRelaxed(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexItemFactory):58:58 -> a
-    13:14:com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo toInfoWithRelaxedType(com.android.tools.r8.graph.DexItemFactory):66:67 -> a
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():46:46 -> a
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.getType():162 -> a
+    12:12:com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo createRelaxed(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexItemFactory):58 -> a
+    13:13:com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo createRelaxed(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexItemFactory):58:58 -> a
+    14:15:com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo toInfoWithRelaxedType(com.android.tools.r8.graph.DexItemFactory):66:67 -> a
     1:5:boolean equals(java.lang.Object):72:76 -> equals
     1:1:int hashCode():81:81 -> hashCode
-com.android.tools.r8.horizontalclassmerging.policies.SameNestHost -> com.android.tools.r8.internal.sB:
+com.android.tools.r8.horizontalclassmerging.policies.SameNestHost -> com.android.tools.r8.internal.eA:
     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.tB:
+com.android.tools.r8.horizontalclassmerging.policies.SameParentClass -> com.android.tools.r8.internal.fA:
     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.m6:
+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>
@@ -25682,7 +25748,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.ec:
+com.android.tools.r8.inspector.internal.FieldInspectorImpl -> com.android.tools.r8.internal.xb:
     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
@@ -25691,19 +25757,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():209:209 -> getInitialValue
+    2:2:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():199:199 -> 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.Nf:
+com.android.tools.r8.inspector.internal.InspectorImpl -> com.android.tools.r8.internal.Ze:
     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.Uq:
+com.android.tools.r8.inspector.internal.MethodInspectorImpl -> com.android.tools.r8.internal.Tp:
     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
@@ -25713,7 +25779,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.wG:
+com.android.tools.r8.inspector.internal.ValueInspectorImpl -> com.android.tools.r8.internal.MF:
     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>
@@ -25774,9 +25840,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.internal.StatelessLibraryMethodModelCollection-$$ExternalSyntheticThrowCCEIfNotNull0 -> com.android.tools.r8.internal.RC:
-    void m(java.lang.Object) -> a
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis -> com.android.tools.r8.internal.X5:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis -> com.android.tools.r8.internal.J5:
     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
@@ -25800,59 +25864,74 @@
     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.W5:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$1 -> com.android.tools.r8.internal.I5:
     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.X5$a:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption -> com.android.tools.r8.internal.J5$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.X5$b:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$InstructionUtils -> com.android.tools.r8.internal.J5$b:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():233:233 -> <clinit>
-    1: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):241:246 -> a
-    7:7: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
-    8:8:boolean forInstancePut(com.android.tools.r8.ir.code.InstancePut,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):264:264 -> a
-    9:9:boolean forInstanceGetOrPut(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):273:273 -> a
-    10:10:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
-    10:10:boolean forInstanceGetOrPut(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):273 -> a
-    11:14:boolean forInstanceGetOrPut(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):273:276 -> a
-    15:15:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
-    15:15:boolean forInstanceGetOrPut(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):276 -> a
-    16:25:boolean forInstanceGetOrPut(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):277:286 -> a
-    26:33: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:302 -> a
-    34:34:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
-    34:34: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
-    35:36: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
-    37:54:boolean forInvokeInterface(com.android.tools.r8.ir.code.InvokeInterface,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):314:331 -> a
-    55:66:boolean forInvokeInterface(com.android.tools.r8.ir.code.InvokeInterface,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):330:341 -> a
-    67:73: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
-    74:91: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
-    92:111: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:402 -> a
+    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):273:273 -> 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
+    9:9:boolean forInstancePut(com.android.tools.r8.ir.code.InstancePut,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):264:264 -> a
+    10:10:boolean forInstanceGetOrPut(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):273:273 -> a
+    11:11:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
+    11:11:boolean forInstanceGetOrPut(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):273 -> a
+    12:15:boolean forInstanceGetOrPut(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):273:276 -> a
+    16:16:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
+    16:16:boolean forInstanceGetOrPut(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):276 -> a
+    17:26:boolean forInstanceGetOrPut(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):277:286 -> a
+    27:34: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:302 -> a
+    35:35:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
+    35:35: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
+    36:36:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    36:36:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89 -> a
+    36:36: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
+    37:38: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
+    39:56:boolean forInvokeInterface(com.android.tools.r8.ir.code.InvokeInterface,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):314:331 -> a
+    57:68:boolean forInvokeInterface(com.android.tools.r8.ir.code.InvokeInterface,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):330:341 -> a
+    69:75: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
+    76:93: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
+    94:99: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
+    100:100:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    100:100: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
+    101:111: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
     112:129: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
     130:141: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
-    142:147: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:453 -> a
-    148:148: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
-    149:149:boolean forStaticPut(com.android.tools.r8.ir.code.StaticPut,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):471:471 -> a
-    150:165: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):496:511 -> a
-    166:166:boolean com.android.tools.r8.graph.DexDefinition.isDexEncodedField():0:0 -> a
-    166:166: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
-    167:191: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:537 -> a
-    192:192: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
-    193:193: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):521:521 -> a
-    194:195:void enqueue(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Deque):546:547 -> a
-    196:217:void enqueueInitializedClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.List,java.util.Set,java.util.Deque):556:577 -> a
+    142:146: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
+    147:147:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    147:147: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
+    148:148: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
+    149:149: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
+    150:150:boolean forStaticPut(com.android.tools.r8.ir.code.StaticPut,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):471:471 -> a
+    151:166: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):496:511 -> a
+    167:167:boolean com.android.tools.r8.graph.DexDefinition.isDexEncodedField():0:0 -> a
+    167:167: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
+    168:183: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
+    184:184:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    184:184: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
+    185:188: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
+    189:189: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
+    190:190: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):521:521 -> a
+    191:192:void enqueue(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Deque):546:547 -> a
+    193:214:void enqueueInitializedClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.List,java.util.Set,java.util.Deque):556:577 -> a
     1:1: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:480 -> b
     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.X5$c:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query -> com.android.tools.r8.internal.J5$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.K9:
+com.android.tools.r8.ir.analysis.DeterminismAnalysis -> com.android.tools.r8.internal.h9:
     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
@@ -25887,9 +25966,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.Bf:
+com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis -> com.android.tools.r8.internal.Ne:
     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.Af:
+com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis$Visitor -> com.android.tools.r8.internal.Me:
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set initializedClassesOnNormalExit -> d
     boolean $assertionsDisabled -> a
@@ -25899,16 +25978,19 @@
     2:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):60:64 -> <init>
     1:1:java.util.Set build():68:68 -> a
     2:2:void markInitializedOnNormalExit(java.lang.Iterable):72:72 -> a
-    3:38:void markInitializedOnNormalExit(com.android.tools.r8.graph.DexType):76:111 -> a
-    39:45:java.lang.Void com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis$Visitor.handleFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction):117:123 -> a
-    39:45:java.lang.Object handleFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction):56 -> a
-    46:57:java.lang.Void com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis$Visitor.handleInvoke(com.android.tools.r8.ir.code.Invoke):131:142 -> a
-    46:57:java.lang.Object handleInvoke(com.android.tools.r8.ir.code.Invoke):56 -> a
-    58:64:java.lang.Void com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis$Visitor.handleInvoke(com.android.tools.r8.ir.code.Invoke):138:144 -> a
-    58:64:java.lang.Object handleInvoke(com.android.tools.r8.ir.code.Invoke):56 -> a
-    65:65:java.lang.Void com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis$Visitor.visit(com.android.tools.r8.ir.code.NewInstance):153:153 -> a
-    65:65: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.yF:
+    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):273:273 -> 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
+    37:43:java.lang.Object handleFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction):56 -> a
+    44:55:java.lang.Void com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis$Visitor.handleInvoke(com.android.tools.r8.ir.code.Invoke):131:142 -> a
+    44:55:java.lang.Object handleInvoke(com.android.tools.r8.ir.code.Invoke):56 -> a
+    56:62:java.lang.Void com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis$Visitor.handleInvoke(com.android.tools.r8.ir.code.Invoke):138:144 -> a
+    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.NE:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.ir.analysis.VerifyTypesHelper verifyTypesHelper -> c
     boolean $assertionsDisabled -> a
@@ -25918,18 +26000,26 @@
     4:4:boolean com.android.tools.r8.ir.analysis.TypeChecker.check(com.android.tools.r8.ir.code.InstancePut):66:66 -> a
     4:4:boolean check(com.android.tools.r8.ir.code.IRCode):45 -> a
     5:6:boolean check(com.android.tools.r8.ir.code.IRCode):48:49 -> a
-    7:21:boolean com.android.tools.r8.ir.analysis.TypeChecker.check(com.android.tools.r8.ir.code.Return,com.android.tools.r8.graph.DexEncodedMethod):70:84 -> a
-    7:21:boolean check(com.android.tools.r8.ir.code.IRCode):49 -> a
-    22:23:boolean check(com.android.tools.r8.ir.code.IRCode):52:53 -> a
-    24:24:boolean com.android.tools.r8.ir.analysis.TypeChecker.check(com.android.tools.r8.ir.code.StaticPut):91:91 -> a
-    24:24:boolean check(com.android.tools.r8.ir.code.IRCode):53 -> a
-    25:26:boolean check(com.android.tools.r8.ir.code.IRCode):56:57 -> a
-    27:30:boolean com.android.tools.r8.ir.analysis.TypeChecker.check(com.android.tools.r8.ir.code.Throw):114:117 -> a
-    27:30:boolean check(com.android.tools.r8.ir.code.IRCode):57 -> a
-    31:33:boolean com.android.tools.r8.ir.analysis.TypeChecker.check(com.android.tools.r8.ir.code.Throw):116:118 -> a
-    31:33:boolean check(com.android.tools.r8.ir.code.IRCode):57 -> a
-    34:46:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):95:107 -> a
-com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis -> com.android.tools.r8.internal.yG:
+    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):273:273 -> 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
+    22:22:boolean check(com.android.tools.r8.ir.code.IRCode):49 -> a
+    23:24:boolean check(com.android.tools.r8.ir.code.IRCode):52:53 -> a
+    25:25:boolean com.android.tools.r8.ir.analysis.TypeChecker.check(com.android.tools.r8.ir.code.StaticPut):91:91 -> a
+    25:25:boolean check(com.android.tools.r8.ir.code.IRCode):53 -> a
+    26:27:boolean check(com.android.tools.r8.ir.code.IRCode):56:57 -> a
+    28:31:boolean com.android.tools.r8.ir.analysis.TypeChecker.check(com.android.tools.r8.ir.code.Throw):114:117 -> a
+    28:31:boolean check(com.android.tools.r8.ir.code.IRCode):57 -> a
+    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):273:273 -> 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.OF:
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
     com.android.tools.r8.graph.ProgramMethod context -> c
@@ -25943,71 +26033,79 @@
     24:24:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.addConstantValueToValueGraph(com.android.tools.r8.ir.code.Value):165 -> a
     24:24: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:24:boolean anyValueMayDependOnEnvironment(java.lang.Iterable):100 -> a
-    25:25:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.addConstantValueToValueGraph(com.android.tools.r8.ir.code.Value):166:166 -> a
+    25:25:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    25:25:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89 -> a
+    25:25:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.addConstantValueToValueGraph(com.android.tools.r8.ir.code.Value):165 -> a
     25:25: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
     25:25:boolean anyValueMayDependOnEnvironment(java.lang.Iterable):100 -> a
-    26:26:boolean com.android.tools.r8.graph.DexEncodedField.isEnum():200:200 -> a
-    26:26:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.addConstantValueToValueGraph(com.android.tools.r8.ir.code.Value):167 -> a
+    26:26:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.addConstantValueToValueGraph(com.android.tools.r8.ir.code.Value):166:166 -> a
     26:26: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
     26:26:boolean anyValueMayDependOnEnvironment(java.lang.Iterable):100 -> a
-    27:35:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.addArrayValueToValueGraph(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):181:189 -> a
-    27:35: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):147 -> a
-    27:35:boolean anyValueMayDependOnEnvironment(java.lang.Iterable):100 -> a
-    36:36:boolean com.android.tools.r8.ir.code.Instruction.isInvokeNewArray():0:0 -> a
-    36:36:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.addArrayValueToValueGraph(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):189 -> a
-    36:36: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):147 -> a
-    36:36:boolean anyValueMayDependOnEnvironment(java.lang.Iterable):100 -> a
-    37:40:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.addArrayValueToValueGraph(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):190:193 -> a
-    37:40: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):147 -> a
-    37:40:boolean anyValueMayDependOnEnvironment(java.lang.Iterable):100 -> a
-    41:41:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> a
-    41:41:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.addArrayValueToValueGraph(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):195 -> a
-    41:41: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):147 -> a
-    41:41:boolean anyValueMayDependOnEnvironment(java.lang.Iterable):100 -> a
-    42:65:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.addArrayValueToValueGraph(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):196:219 -> a
-    42:65: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):147 -> a
-    42:65:boolean anyValueMayDependOnEnvironment(java.lang.Iterable):100 -> a
-    66:66:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayFilledData():0:0 -> a
-    66:66:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.addArrayValueToValueGraph(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):220 -> a
-    66:66: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):147 -> a
-    66:66:boolean anyValueMayDependOnEnvironment(java.lang.Iterable):100 -> a
-    67:82:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.addArrayValueToValueGraph(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):221:236 -> a
-    67:82: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):147 -> a
-    67:82:boolean anyValueMayDependOnEnvironment(java.lang.Iterable):100 -> a
-    83:83: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):149:149 -> a
-    83:83:boolean anyValueMayDependOnEnvironment(java.lang.Iterable):100 -> a
-    84:108:boolean anyValueMayDependOnEnvironment(java.lang.Iterable):112:136 -> a
-    109:110:boolean lambda$anyValueMayDependOnEnvironment$0(java.util.Set,java.util.Set,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node):121:122 -> a
-    111:123: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:259 -> a
-    124:124:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):42:42 -> a
-    124:124: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
-    125:154: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:289 -> a
-    155:155:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():204:204 -> a
-    155:155: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
-    156:161: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
-    162:170:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):309:317 -> a
-    171:173:com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.computeBlockEntryState(com.android.tools.r8.ir.code.BasicBlock,java.util.Map):360:362 -> a
-    171:173:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):318 -> a
-    174:175:void com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState.add(com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState):379:380 -> a
-    174:175:com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.computeBlockEntryState(com.android.tools.r8.ir.code.BasicBlock,java.util.Map):362 -> a
-    174:175:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):318 -> a
-    176:182:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):320:326 -> a
-    183:183:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState.isTrackingValue(com.android.tools.r8.ir.code.Value):388:388 -> a
-    183:183:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):326 -> a
-    184:187:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState.recordTrackedValueHasEscaped():392:395 -> a
-    184:187:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):327 -> a
-    188:188:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState.hasTrackedValueEscaped():384:384 -> a
-    188:188:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):329 -> a
-    189:197:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):330:338 -> a
-    198:201:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState.recordTrackedValueHasEscaped():392:395 -> a
-    198:201:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):339 -> a
-    202:202:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState.hasTrackedValueEscaped():384:384 -> a
-    202:202:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):341 -> a
-    203:209:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):341:347 -> a
-    210:210:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState.startTrackingValue(com.android.tools.r8.ir.code.Value):400:400 -> a
-    210:210:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):347 -> a
-    211:213:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):350:352 -> a
-com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState -> com.android.tools.r8.internal.xG:
+    27:27:boolean com.android.tools.r8.graph.DexEncodedField.isEnum():190:190 -> a
+    27:27:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.addConstantValueToValueGraph(com.android.tools.r8.ir.code.Value):167 -> a
+    27:27: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
+    27:27:boolean anyValueMayDependOnEnvironment(java.lang.Iterable):100 -> a
+    28:36:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.addArrayValueToValueGraph(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):181:189 -> a
+    28:36: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):147 -> a
+    28:36:boolean anyValueMayDependOnEnvironment(java.lang.Iterable):100 -> a
+    37:37:boolean com.android.tools.r8.ir.code.Instruction.isInvokeNewArray():0:0 -> a
+    37:37:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.addArrayValueToValueGraph(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):189 -> a
+    37:37: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):147 -> a
+    37:37:boolean anyValueMayDependOnEnvironment(java.lang.Iterable):100 -> a
+    38:41:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.addArrayValueToValueGraph(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):190:193 -> a
+    38:41: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):147 -> a
+    38:41:boolean anyValueMayDependOnEnvironment(java.lang.Iterable):100 -> a
+    42:42:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> a
+    42:42:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.addArrayValueToValueGraph(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):195 -> a
+    42:42: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):147 -> a
+    42:42:boolean anyValueMayDependOnEnvironment(java.lang.Iterable):100 -> a
+    43:66:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.addArrayValueToValueGraph(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):196:219 -> a
+    43:66: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):147 -> a
+    43:66:boolean anyValueMayDependOnEnvironment(java.lang.Iterable):100 -> a
+    67:67:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayFilledData():0:0 -> a
+    67:67:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.addArrayValueToValueGraph(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):220 -> a
+    67:67: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):147 -> a
+    67:67:boolean anyValueMayDependOnEnvironment(java.lang.Iterable):100 -> a
+    68:83:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.addArrayValueToValueGraph(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):221:236 -> a
+    68:83: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):147 -> a
+    68:83:boolean anyValueMayDependOnEnvironment(java.lang.Iterable):100 -> a
+    84:84: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):149:149 -> a
+    84:84:boolean anyValueMayDependOnEnvironment(java.lang.Iterable):100 -> a
+    85:109:boolean anyValueMayDependOnEnvironment(java.lang.Iterable):112:136 -> a
+    110:111:boolean lambda$anyValueMayDependOnEnvironment$0(java.util.Set,java.util.Set,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node):121:122 -> a
+    112:117: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
+    118:118:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    118:118: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
+    119:126: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
+    127:127:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):42:42 -> a
+    127:127: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
+    128:157: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:289 -> a
+    158:158:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():194:194 -> a
+    158:158: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
+    159:164: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
+    165:173:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):309:317 -> a
+    174:176:com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.computeBlockEntryState(com.android.tools.r8.ir.code.BasicBlock,java.util.Map):360:362 -> a
+    174:176:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):318 -> a
+    177:178:void com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState.add(com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState):379:380 -> a
+    177:178:com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.computeBlockEntryState(com.android.tools.r8.ir.code.BasicBlock,java.util.Map):362 -> a
+    177:178:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):318 -> a
+    179:185:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):320:326 -> a
+    186:186:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState.isTrackingValue(com.android.tools.r8.ir.code.Value):388:388 -> a
+    186:186:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):326 -> a
+    187:190:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState.recordTrackedValueHasEscaped():392:395 -> a
+    187:190:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):327 -> a
+    191:191:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState.hasTrackedValueEscaped():384:384 -> a
+    191:191:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):329 -> a
+    192:200:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):330:338 -> a
+    201:204:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState.recordTrackedValueHasEscaped():392:395 -> a
+    201:204:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):339 -> a
+    205:205:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState.hasTrackedValueEscaped():384:384 -> a
+    205:205:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):341 -> a
+    206:212:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):341:347 -> a
+    213:213:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState.startTrackingValue(com.android.tools.r8.ir.code.Value):400:400 -> a
+    213:213:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):347 -> a
+    214:216:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):350:352 -> a
+com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState -> com.android.tools.r8.internal.NF:
     java.util.Set trackedValues -> c
     com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState EMPTY -> a
     boolean hasTrackedValueEscaped -> b
@@ -26015,20 +26113,20 @@
     1:6:void <init>():367:372 -> <init>
     1:1:com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState empty():375:375 -> a
     2:2:boolean isTrackingValue(com.android.tools.r8.ir.code.Value):388:388 -> a
-com.android.tools.r8.ir.analysis.VerifyTypesHelper -> com.android.tools.r8.internal.CG:
+com.android.tools.r8.ir.analysis.VerifyTypesHelper -> com.android.tools.r8.internal.SF:
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():10:10 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView):14:15 -> <init>
     1:1:com.android.tools.r8.ir.analysis.VerifyTypesHelper create(com.android.tools.r8.graph.AppView):19:19 -> a
     2:28:boolean isAssignable(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.TypeElement):23:49 -> a
-com.android.tools.r8.ir.analysis.constant.Bottom -> com.android.tools.r8.internal.f3:
+com.android.tools.r8.ir.analysis.constant.Bottom -> com.android.tools.r8.internal.S2:
     com.android.tools.r8.ir.analysis.constant.Bottom 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.Bottom getInstance():13:13 -> c
-com.android.tools.r8.ir.analysis.constant.ConstLatticeElement -> com.android.tools.r8.internal.k8:
+com.android.tools.r8.ir.analysis.constant.ConstLatticeElement -> com.android.tools.r8.internal.M7:
     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
@@ -26043,7 +26141,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.o8:
+com.android.tools.r8.ir.analysis.constant.ConstRangeLatticeElement -> com.android.tools.r8.internal.Q7:
     com.android.tools.r8.ir.code.Value value -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():8:8 -> <clinit>
@@ -26065,12 +26163,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.ao:
+com.android.tools.r8.ir.analysis.constant.LatticeElement -> com.android.tools.r8.internal.fn:
     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.BC:
+com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation -> com.android.tools.r8.internal.mB:
     java.util.BitSet visitedBlocks -> i
     java.util.Map mapping -> d
     com.android.tools.r8.graph.AppView appView -> b
@@ -26084,7 +26182,7 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):45:45 -> <init>
     2:14:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):38:50 -> <init>
     1:41:void rewriteCode():85:125 -> a
-    42:42:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
+    42:42:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView) -> a
     42:42:void rewriteCode():125 -> a
     43:45:void rewriteCode():125:127 -> a
     46:46:boolean lambda$rewriteCode$0(java.util.Map$Entry):88:88 -> a
@@ -26159,13 +26257,13 @@
     117:130:void com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation.addFlowEdgesForJumpInstruction(com.android.tools.r8.ir.code.JumpInstruction):234:247 -> b
     117:130:void visitInstruction(com.android.tools.r8.ir.code.Instruction):180 -> b
     131:136:void setExecutableEdge(int,int):253:258 -> b
-com.android.tools.r8.ir.analysis.constant.Top -> com.android.tools.r8.internal.UE:
+com.android.tools.r8.ir.analysis.constant.Top -> com.android.tools.r8.internal.ND:
     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.vG:
+com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph -> com.android.tools.r8.internal.LF:
     java.util.Map nodes -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():27:27 -> <clinit>
@@ -26177,7 +26275,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.uG:
+com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node -> com.android.tools.r8.internal.KF:
     java.util.Set predecessors -> c
     java.util.Set successors -> d
     com.android.tools.r8.ir.code.Value value -> a
@@ -26192,7 +26290,7 @@
     1:1:java.util.Set access$200(com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node):68:68 -> c
     1:1:com.android.tools.r8.ir.code.Value access$300(com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node):68:68 -> d
     1:12:void moveEdgesTo(com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node):99:110 -> e
-com.android.tools.r8.ir.analysis.equivalence.BasicBlockBehavioralSubsumption -> com.android.tools.r8.internal.e2:
+com.android.tools.r8.ir.analysis.equivalence.BasicBlockBehavioralSubsumption -> com.android.tools.r8.internal.Z1:
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
     com.android.tools.r8.graph.ProgramMethod context -> c
@@ -26248,7 +26346,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.Eb:
+com.android.tools.r8.ir.analysis.escape.EscapeAnalysis -> com.android.tools.r8.internal.Ya:
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set trackedValues -> d
     java.util.Deque valuesToTrack -> e
@@ -26277,9 +26375,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.Fb:
+com.android.tools.r8.ir.analysis.escape.EscapeAnalysisConfiguration -> com.android.tools.r8.internal.Za:
     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.Rb:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldAccessAnalysis -> com.android.tools.r8.internal.kb:
     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
@@ -26290,8 +26388,11 @@
     3:4:void acceptClassInitializerDefaultsResult(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):58:59 -> a
     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:41: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:97 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker -> com.android.tools.r8.internal.Xb:
+    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):273:273 -> 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.qb:
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set nonZeroFields -> e
     com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$FieldAccessGraph fieldAccessGraph -> c
@@ -26330,7 +26431,7 @@
     104:104: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
     105:107: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
     105:107: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
-    108:108:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():209:209 -> a
+    108:108:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():199:199 -> a
     108:108: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
     108:108: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
     109:109: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
@@ -26348,7 +26449,7 @@
     163:171:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):288:296 -> a
     172:172: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.Xb$a:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$FieldAccessGraph -> com.android.tools.r8.internal.qb$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>
@@ -26358,7 +26459,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.Xb$b:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$ObjectAllocationGraph -> com.android.tools.r8.internal.qb$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>
@@ -26367,7 +26468,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.Yb:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis -> com.android.tools.r8.internal.rb:
     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
@@ -26379,144 +26480,58 @@
     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.lF:
-    java.util.Map readFields -> d
+com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor -> com.android.tools.r8.internal.eE:
     com.android.tools.r8.graph.AppView appView -> b
-    java.util.Set constantFields -> f
-    com.android.tools.r8.utils.collections.ProgramMethodSet methodsToReprocess -> g
+    java.util.Set fieldsOfInterest -> d
     com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder postMethodProcessorBuilder -> c
+    com.android.tools.r8.utils.collections.ProgramMethodSet methodsToReprocess -> e
     boolean $assertionsDisabled -> a
-    java.util.Map writtenFields -> e
-    1:1:void <clinit>():41:41 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder):61:61 -> <init>
-    2:18:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder):47:63 -> <init>
-    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor):41:41 -> a
-    2:7:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing):69:74 -> a
-    8:22:void com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor.computeConstantFields():93:107 -> a
-    8:22:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing):75 -> a
-    23:25:boolean com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor.verifyNoConstantFieldsOnSynthesizedClasses(com.android.tools.r8.graph.AppView):238:240 -> a
-    23:25:void com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor.computeConstantFields():107 -> a
-    23:25:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing):75 -> a
-    26:32:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing):76:82 -> a
-    33:37:void com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor.clearReadsAndWritesFromFieldsOfInterest(com.android.tools.r8.shaking.AppInfoWithLiveness):111:115 -> a
-    33:37:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing):83 -> a
-    38:38:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():164:164 -> a
-    38:38:void com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor.clearReadsAndWritesFromFieldsOfInterest(com.android.tools.r8.shaking.AppInfoWithLiveness):116 -> a
-    38:38:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing):83 -> a
-    39:41:void com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor.clearReadsAndWritesFromFieldsOfInterest(com.android.tools.r8.shaking.AppInfoWithLiveness):116:118 -> a
-    39:41:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing):83 -> a
-    42:42:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():164:164 -> a
-    42:42:void com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor.clearReadsAndWritesFromFieldsOfInterest(com.android.tools.r8.shaking.AppInfoWithLiveness):119 -> a
-    42:42:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing):83 -> a
-    43:43:void com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor.clearReadsAndWritesFromFieldsOfInterest(com.android.tools.r8.shaking.AppInfoWithLiveness):119:119 -> a
-    43:43:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing):83 -> a
-    44:49:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing):84:89 -> a
-    50:52:void enqueueMethodsForReprocessing(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.concurrent.ExecutorService):125:127 -> a
-    53:59:void enqueueMethodsForReprocessing(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.concurrent.ExecutorService):126:132 -> a
-    60:60:void processClass(com.android.tools.r8.graph.DexProgramClass):136:136 -> a
-    61:61:void lambda$processClass$0(com.android.tools.r8.graph.ProgramMethod):138:138 -> a
-    62:62:boolean canOptimizeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView):144:144 -> a
-    63:63:boolean com.android.tools.r8.graph.FieldAccessInfo.isAccessedFromMethodHandle():38:38 -> a
-    63:63:boolean canOptimizeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView):145 -> a
-    64:77:boolean canOptimizeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView):148:161 -> a
-    78:86:void processFieldsNeverRead(com.android.tools.r8.shaking.AppInfoWithLiveness):168:176 -> a
-    87:87:boolean lambda$processFieldsNeverRead$1(com.android.tools.r8.graph.FieldAccessInfoCollection,java.util.Map$Entry):173:173 -> a
-    88:88:boolean com.android.tools.r8.graph.AbstractAccessContexts.isConcrete():0:0 -> a
-    88:88:boolean lambda$processFieldsNeverRead$1(com.android.tools.r8.graph.FieldAccessInfoCollection,java.util.Map$Entry):173 -> a
-    89:89:boolean lambda$processFieldsNeverRead$1(com.android.tools.r8.graph.FieldAccessInfoCollection,java.util.Map$Entry):175:175 -> a
-    90:90:boolean lambda$processFieldsNeverRead$1(com.android.tools.r8.graph.FieldAccessInfoCollection,java.util.Map$Entry):174:174 -> a
-    91:91:void lambda$processFieldsNeverRead$2(com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AbstractAccessContexts):178:178 -> a
-    92:92:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():164:164 -> a
-    92:92:void lambda$processFieldsNeverRead$2(com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AbstractAccessContexts):179 -> a
-    93:95:void lambda$processFieldsNeverRead$2(com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AbstractAccessContexts):179:181 -> a
-    96:96:void lambda$processFieldsNeverRead$2(com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AbstractAccessContexts):180:180 -> a
-    97:99:void lambda$processFieldsNeverWritten$4(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AbstractAccessContexts):196:198 -> a
-    100:100:void lambda$processFieldsNeverWritten$4(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AbstractAccessContexts):197:197 -> a
-    101:101:boolean canOptimizeOnlyReadOrWrittenField(com.android.tools.r8.graph.DexEncodedField,boolean,com.android.tools.r8.graph.FieldAccessInfoCollection):206:206 -> a
-    102:102:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():164:164 -> a
-    102:102:boolean canOptimizeOnlyReadOrWrittenField(com.android.tools.r8.graph.DexEncodedField,boolean,com.android.tools.r8.graph.FieldAccessInfoCollection):207 -> a
-    103:111:boolean canOptimizeOnlyReadOrWrittenField(com.android.tools.r8.graph.DexEncodedField,boolean,com.android.tools.r8.graph.FieldAccessInfoCollection):207:215 -> a
-    112:112:boolean com.android.tools.r8.graph.FieldAccessInfo.isAccessedFromMethodHandle():38:38 -> a
-    112:112:boolean canOptimizeOnlyReadOrWrittenField(com.android.tools.r8.graph.DexEncodedField,boolean,com.android.tools.r8.graph.FieldAccessInfoCollection):216 -> a
-    113:113:boolean canOptimizeOnlyReadOrWrittenField(com.android.tools.r8.graph.DexEncodedField,boolean,com.android.tools.r8.graph.FieldAccessInfoCollection):217:217 -> a
-    114:114:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():164:164 -> a
-    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.getType():168 -> a
-    114:114:boolean canOptimizeOnlyReadOrWrittenField(com.android.tools.r8.graph.DexEncodedField,boolean,com.android.tools.r8.graph.FieldAccessInfoCollection):221 -> a
-    115:115:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():49:49 -> a
-    115:115:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.getType():168 -> a
-    115:115:boolean canOptimizeOnlyReadOrWrittenField(com.android.tools.r8.graph.DexEncodedField,boolean,com.android.tools.r8.graph.FieldAccessInfoCollection):221 -> a
-    116:117:boolean canOptimizeOnlyReadOrWrittenField(com.android.tools.r8.graph.DexEncodedField,boolean,com.android.tools.r8.graph.FieldAccessInfoCollection):221:222 -> a
-    118:118:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():164:164 -> a
-    118:118:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexEncodedField.getTypeElement(com.android.tools.r8.graph.AppView):172 -> a
-    118:118:boolean canOptimizeOnlyReadOrWrittenField(com.android.tools.r8.graph.DexEncodedField,boolean,com.android.tools.r8.graph.FieldAccessInfoCollection):222 -> a
-    119:119:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():49:49 -> a
-    119:119:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexField.getTypeElement(com.android.tools.r8.graph.AppView):53 -> a
-    119:119:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexEncodedField.getTypeElement(com.android.tools.r8.graph.AppView):172 -> a
-    119:119:boolean canOptimizeOnlyReadOrWrittenField(com.android.tools.r8.graph.DexEncodedField,boolean,com.android.tools.r8.graph.FieldAccessInfoCollection):222 -> a
-    120:120:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexField.getTypeElement(com.android.tools.r8.graph.AppView):53:53 -> a
-    120:120:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexEncodedField.getTypeElement(com.android.tools.r8.graph.AppView):172 -> a
-    120:120:boolean canOptimizeOnlyReadOrWrittenField(com.android.tools.r8.graph.DexEncodedField,boolean,com.android.tools.r8.graph.FieldAccessInfoCollection):222 -> a
-    121:126:boolean canOptimizeOnlyReadOrWrittenField(com.android.tools.r8.graph.DexEncodedField,boolean,com.android.tools.r8.graph.FieldAccessInfoCollection):222:227 -> a
-    1:1:java.util.Map access$100(com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor):41:41 -> b
-    2:10:void processFieldsNeverWritten(com.android.tools.r8.shaking.AppInfoWithLiveness):186:194 -> b
-    11:11:boolean lambda$processFieldsNeverWritten$3(com.android.tools.r8.graph.FieldAccessInfoCollection,java.util.Map$Entry):191:191 -> b
-    12:12:boolean com.android.tools.r8.graph.AbstractAccessContexts.isConcrete():0:0 -> b
-    12:12:boolean lambda$processFieldsNeverWritten$3(com.android.tools.r8.graph.FieldAccessInfoCollection,java.util.Map$Entry):191 -> b
-    13:13:boolean lambda$processFieldsNeverWritten$3(com.android.tools.r8.graph.FieldAccessInfoCollection,java.util.Map$Entry):193:193 -> b
-    14:14:boolean lambda$processFieldsNeverWritten$3(com.android.tools.r8.graph.FieldAccessInfoCollection,java.util.Map$Entry):192:192 -> b
-    1:1:java.util.Map access$200(com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor):41:41 -> c
-    1:1:java.util.Set access$300(com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor):41:41 -> d
-    1:1:com.android.tools.r8.utils.collections.ProgramMethodSet access$400(com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor):41:41 -> e
-com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$TrivialFieldAccessUseRegistry -> com.android.tools.r8.internal.kF:
-    com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor this$0 -> e
-    boolean $assertionsDisabled -> c
-    com.android.tools.r8.graph.ProgramMethod method -> d
-    1:1:void <clinit>():246:246 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor,com.android.tools.r8.graph.ProgramMethod):250:252 -> <init>
+    1:1:void <clinit>():34:34 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder):47:47 -> <init>
+    2:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder):40:49 -> <init>
+    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor):34:34 -> a
+    2:7:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing):55:60 -> a
+    8:22:void com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor.computeFieldsOfInterest():83:97 -> a
+    8:22:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing):61 -> a
+    23:25:boolean com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor.verifyNoConstantFieldsOnSynthesizedClasses(com.android.tools.r8.graph.AppView):152:154 -> a
+    23:25:void com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor.computeFieldsOfInterest():97 -> a
+    23:25:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing):61 -> a
+    26:37:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing):62:73 -> a
+    38:40:void com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor.clearReadsFromFieldsOfInterest(com.android.tools.r8.shaking.AppInfoWithLiveness):101:103 -> a
+    38:40:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing):74 -> a
+    41:45:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing):75:79 -> a
+    46:48:void enqueueMethodsForReprocessing(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.concurrent.ExecutorService):109:111 -> a
+    49:53:void enqueueMethodsForReprocessing(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.concurrent.ExecutorService):110:114 -> a
+    54:54:void processClass(com.android.tools.r8.graph.DexProgramClass):118:118 -> a
+    55:55:void lambda$processClass$0(com.android.tools.r8.graph.ProgramMethod):120:120 -> a
+    56:56:boolean canOptimizeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView):126:126 -> a
+    57:57:boolean com.android.tools.r8.graph.FieldAccessInfo.isAccessedFromMethodHandle():38:38 -> a
+    57:57:boolean canOptimizeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView):127 -> a
+    58:71: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.dE:
+    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:8:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean,boolean):256:263 -> a
-    9:9:boolean com.android.tools.r8.graph.DexClassAndField.isProgramField():0:0 -> a
-    9:9:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean,boolean):266 -> a
-    10:15:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean,boolean):266:271 -> a
-    16:19:void com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$TrivialFieldAccessUseRegistry.destroyFieldAccessContexts(com.android.tools.r8.graph.DexEncodedField):320:323 -> a
-    16:19:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean,boolean):274 -> a
-    20:21:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean,boolean):279:280 -> a
-    22:22:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():209:209 -> a
-    22:22:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean,boolean):284 -> a
-    23:28:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean,boolean):285:290 -> a
-    29:32:void recordFieldAccessContext(com.android.tools.r8.graph.DexEncodedField,java.util.Map,java.util.Map):298:301 -> a
-    33:33:boolean com.android.tools.r8.graph.AbstractAccessContexts.isBottom():0:0 -> a
-    33:33:void recordFieldAccessContext(com.android.tools.r8.graph.DexEncodedField,java.util.Map,java.util.Map):301 -> a
-    34:36:void recordFieldAccessContext(com.android.tools.r8.graph.DexEncodedField,java.util.Map,java.util.Map):303:305 -> a
-    37:37:boolean com.android.tools.r8.graph.AbstractAccessContexts.isConcrete():0:0 -> a
-    37:37:void recordFieldAccessContext(com.android.tools.r8.graph.DexEncodedField,java.util.Map,java.util.Map):305 -> a
-    38:39:void recordFieldAccessContext(com.android.tools.r8.graph.DexEncodedField,java.util.Map,java.util.Map):305:306 -> a
-    40:40:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():164:164 -> a
-    40:40:void recordFieldAccessContext(com.android.tools.r8.graph.DexEncodedField,java.util.Map,java.util.Map):306 -> a
-    41:41:void recordFieldAccessContext(com.android.tools.r8.graph.DexEncodedField,java.util.Map,java.util.Map):306:306 -> a
-    42:42:boolean com.android.tools.r8.graph.AbstractAccessContexts.isTop():0:0 -> a
-    42:42:void recordFieldAccessContext(com.android.tools.r8.graph.DexEncodedField,java.util.Map,java.util.Map):307 -> a
-    43:47:void recordFieldAccessContext(com.android.tools.r8.graph.DexEncodedField,java.util.Map,java.util.Map):309:313 -> a
-    48:48:boolean com.android.tools.r8.graph.AbstractAccessContexts.isTop():0:0 -> a
-    48:48:void recordFieldAccessContext(com.android.tools.r8.graph.DexEncodedField,java.util.Map,java.util.Map):313 -> a
-    49:50:void recordFieldAccessContext(com.android.tools.r8.graph.DexEncodedField,java.util.Map,java.util.Map):313:314 -> a
-    51:51:boolean com.android.tools.r8.graph.AbstractAccessContexts.isTop():0:0 -> a
-    51:51:void recordFieldAccessContext(com.android.tools.r8.graph.DexEncodedField,java.util.Map,java.util.Map):314 -> a
-    52:54:void recordFieldAccessContext(com.android.tools.r8.graph.DexEncodedField,java.util.Map,java.util.Map):314:316 -> a
-    55:55:com.android.tools.r8.graph.AbstractAccessContexts lambda$recordFieldAccessContext$0(com.android.tools.r8.graph.DexEncodedField):304:304 -> a
-    56:56:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):328:328 -> 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():199:199 -> 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):333:333 -> c
+    1:1:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):191:191 -> c
     void registerInstanceOf(com.android.tools.r8.graph.DexType) -> d
     void registerInvokeSuper(com.android.tools.r8.graph.DexMethod) -> d
     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):338:338 -> e
+    1:1:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):201:201 -> e
     void registerTypeReference(com.android.tools.r8.graph.DexType) -> f
-    1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):343:343 -> g
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet -> com.android.tools.r8.internal.n:
+    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>
     1:1:void <init>():27:27 -> <init>
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet asConcreteFieldSet() -> a
@@ -26524,7 +26539,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.h8:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet -> com.android.tools.r8.internal.J7:
     java.util.Set fields -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():18:18 -> <clinit>
@@ -26548,7 +26563,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.Ha:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet -> com.android.tools.r8.internal.ca:
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet INSTANCE -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
@@ -26557,7 +26572,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.rc:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis -> com.android.tools.r8.internal.Kb:
     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
@@ -26650,13 +26665,13 @@
     55:55:java.util.Map createFieldsMaybeReadBeforeBlockInclusive():285 -> c
     56:80:java.util.Map createFieldsMaybeReadBeforeBlockInclusive():286:310 -> c
     1:4:com.android.tools.r8.ir.code.DominatorTree getOrCreateDominatorTree():69:72 -> d
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis$FieldInitializationInfo -> com.android.tools.r8.internal.qc:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis$FieldInitializationInfo -> com.android.tools.r8.internal.Jb:
     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):44:46 -> <init>
     1:1:com.android.tools.r8.ir.code.Instruction access$000(com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis$FieldInitializationInfo):38:38 -> a
     1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo access$100(com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis$FieldInitializationInfo):38:38 -> b
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis -> com.android.tools.r8.internal.Vf:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis -> com.android.tools.r8.internal.hf:
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder builder -> j
     com.android.tools.r8.graph.DexClassAndMethod parentConstructor -> l
     boolean $assertionsDisabled -> i
@@ -26671,7 +26686,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):133:133 -> a
-    30:30:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():204:204 -> a
+    30:30:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():194:194 -> 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):232 -> 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):133 -> 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):236:268 -> a
@@ -26686,29 +26701,29 @@
     67:67:void com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis.recordInstanceFieldIsInitializedWithValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):226 -> a
     67:67:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.Value):134 -> a
     68:93:void analyzeForwardingConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.Value):139:164 -> a
-    94:101:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo getInstanceFieldInitializationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):197:204 -> a
-    102:102:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.type():94:94 -> a
-    102:102:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo getInstanceFieldInitializationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):206 -> a
-    103:111:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo getInstanceFieldInitializationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):207:215 -> a
-    112:112:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():204:204 -> a
-    112:112:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis.fieldNeverWrittenBetweenParentConstructorCallAndMethodExit(com.android.tools.r8.graph.DexEncodedField):277 -> a
-    112:112:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):182 -> a
-    113:113:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis.fieldNeverWrittenBetweenParentConstructorCallAndMethodExit(com.android.tools.r8.graph.DexEncodedField):280:280 -> a
-    113:113:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):182 -> a
-    114:117:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):183:186 -> a
-    118:118:void com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis.recordInstanceFieldIsInitializedWithValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):227:227 -> a
-    118:118:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):185 -> a
-    119:120:void com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis.recordInstanceFieldIsInitializedWithInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):220:221 -> a
-    119:120:void com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis.recordInstanceFieldIsInitializedWithValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):226 -> a
-    119:120:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):185 -> a
-    121:121: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):50:50 -> a
-    121:121:void com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis.recordInstanceFieldIsInitializedWithInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):221 -> a
-    121:121:void com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis.recordInstanceFieldIsInitializedWithValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):226 -> a
-    121:121:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):185 -> a
-    122:123:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):188:189 -> a
-    124:124: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):50:50 -> a
-    124:124:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):189 -> a
-    125:125:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():209:209 -> a
+    94:94:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():194:194 -> a
+    94:94:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis.fieldNeverWrittenBetweenParentConstructorCallAndMethodExit(com.android.tools.r8.graph.DexEncodedField):277 -> a
+    94:94:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):182 -> a
+    95:95:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis.fieldNeverWrittenBetweenParentConstructorCallAndMethodExit(com.android.tools.r8.graph.DexEncodedField):280:280 -> a
+    95:95:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):182 -> a
+    96:99:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):183:186 -> a
+    100:100:void com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis.recordInstanceFieldIsInitializedWithValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):227:227 -> a
+    100:100:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):185 -> a
+    101:102:void com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis.recordInstanceFieldIsInitializedWithInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):220:221 -> a
+    101:102:void com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis.recordInstanceFieldIsInitializedWithValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):226 -> a
+    101:102:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):185 -> a
+    103:103: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):50:50 -> a
+    103:103:void com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis.recordInstanceFieldIsInitializedWithInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):221 -> a
+    103:103:void com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis.recordInstanceFieldIsInitializedWithValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):226 -> a
+    103:103:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):185 -> a
+    104:105:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):188:189 -> a
+    106:106: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):50:50 -> a
+    106:106:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):189 -> a
+    107:114:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo getInstanceFieldInitializationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):197:204 -> a
+    115:115:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.type():88:88 -> a
+    115:115:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo getInstanceFieldInitializationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):206 -> a
+    116:124:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo getInstanceFieldInitializationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):207:215 -> a
+    125:125:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():199:199 -> a
     125:125:boolean isSubjectToOptimization(com.android.tools.r8.graph.DexEncodedField):123 -> a
     126:126:boolean isSubjectToOptimization(com.android.tools.r8.graph.DexEncodedField):123:123 -> a
     1:1:boolean isSubjectToOptimizationIgnoringPinning(com.android.tools.r8.graph.DexEncodedField):128:128 -> b
@@ -26716,195 +26731,190 @@
     4:4: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):50:50 -> b
     4:4:void recordInstanceFieldIsInitializedWithInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):221 -> b
     1:11:void analyzeParentConstructorCall():169:179 -> e
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet -> com.android.tools.r8.internal.am:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet -> com.android.tools.r8.internal.fl:
     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.TC:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis -> com.android.tools.r8.internal.IB:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$Builder builder -> j
-    java.util.Map computedValues -> k
     1:1:void <clinit>():44:44 -> <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):51:51 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):47:52 -> <init>
-    1:6:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues 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):61:66 -> a
-    7:8:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis.analyze(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):83:84 -> a
-    7:8:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues 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):67 -> a
-    9:9:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues 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):68:68 -> a
-    10:12:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):89:91 -> a
-    13:23:void lambda$computeFieldOptimizationInfo$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexValue):93:103 -> a
-    24:32:void lambda$computeFieldOptimizationInfo$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexValue):100:108 -> a
-    33:33:void lambda$computeFieldOptimizationInfo$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexValue):105:105 -> a
-    34:34:boolean com.android.tools.r8.graph.DexValue.isDexItemBasedValueString():0:0 -> a
-    34:34:void lambda$computeFieldOptimizationInfo$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexValue):109 -> a
-    35:35:void lambda$computeFieldOptimizationInfo$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexValue):112:112 -> a
-    36:37:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.Value):135:136 -> a
-    38:55:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.value.AbstractValue,boolean):141:158 -> a
-    56:56:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.ReferenceTypeElement.asMaybeNull():86:86 -> a
-    56:56:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.value.AbstractValue,boolean):158 -> a
-    57:64:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.value.AbstractValue,boolean):160:167 -> a
-    65:65:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.ReferenceTypeElement.asMaybeNull():86:86 -> a
-    65:65:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.value.AbstractValue,boolean):168 -> a
-    66:68:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.value.AbstractValue,boolean):168:170 -> a
-    69:75:void updateFieldOptimizationInfoWith2Values(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexValue):178:184 -> a
-    76:78:com.android.tools.r8.ir.analysis.value.AbstractValue getOrComputeAbstractValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField):188:190 -> a
-    79:79: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):197:197 -> a
-    79:79:com.android.tools.r8.ir.analysis.value.AbstractValue getOrComputeAbstractValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField):191 -> a
-    80:87:com.android.tools.r8.ir.analysis.value.SingleFieldValue com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis.computeSingleEnumFieldValue(com.android.tools.r8.ir.code.Value):217:224 -> a
-    80:87: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):198 -> a
-    80:87:com.android.tools.r8.ir.analysis.value.AbstractValue getOrComputeAbstractValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField):191 -> a
-    88:88:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> a
-    88:88:com.android.tools.r8.ir.analysis.value.SingleFieldValue com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis.computeSingleEnumFieldValue(com.android.tools.r8.ir.code.Value):224 -> a
-    88:88: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):198 -> a
-    88:88:com.android.tools.r8.ir.analysis.value.AbstractValue getOrComputeAbstractValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField):191 -> a
-    89:92:com.android.tools.r8.ir.analysis.value.SingleFieldValue com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis.computeSingleEnumFieldValue(com.android.tools.r8.ir.code.Value):225:228 -> a
-    89:92: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):198 -> a
-    89:92:com.android.tools.r8.ir.analysis.value.AbstractValue getOrComputeAbstractValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField):191 -> a
-    93:95: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):202:204 -> a
-    93:95:com.android.tools.r8.ir.analysis.value.AbstractValue getOrComputeAbstractValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField):191 -> a
-    96:96:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():209:209 -> a
-    96:96:boolean isSubjectToOptimization(com.android.tools.r8.graph.DexEncodedField):119 -> a
-    97:98:boolean isSubjectToOptimization(com.android.tools.r8.graph.DexEncodedField):120:121 -> a
-    99:100:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):435:436 -> a
-    101:101:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():23:23 -> a
-    101:101:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):437 -> a
-    102:104:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):440:442 -> a
-    105:105:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):42:42 -> a
-    105:105:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):442 -> a
-    106:106:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():23:23 -> a
-    106:106:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):444 -> a
-    107:107:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):447:447 -> a
-    108:108:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():23:23 -> a
-    108:108:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):449 -> a
-    109:113:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):454:458 -> a
-    114:114:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():23:23 -> a
-    114:114:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):459 -> a
-    115:115:com.android.tools.r8.ir.analysis.value.ObjectState$Builder com.android.tools.r8.ir.analysis.value.ObjectState.builder():19:19 -> a
-    115:115:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):462 -> a
-    116:139:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):463:486 -> a
-    140:141: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):472:473 -> a
-    142:142:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():164:164 -> a
-    142:142: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):473 -> a
-    143:143:boolean com.android.tools.r8.graph.DexItemFactory$EnumMembers.isNameOrOrdinalField(com.android.tools.r8.graph.DexField):1403:1403 -> a
-    143:143: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):473 -> a
-    144:151: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):476:483 -> a
+    1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):50:51 -> <init>
+    1:7:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues 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):60:66 -> a
+    8:9:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis.analyze(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.graph.DexType):83:84 -> a
+    8:9:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues 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):66 -> a
+    10:10:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues 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):67:67 -> a
+    11:13:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):89:91 -> a
+    14:24:void lambda$computeFieldOptimizationInfo$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexValue):93:103 -> a
+    25:33:void lambda$computeFieldOptimizationInfo$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexValue):100:108 -> a
+    34:34:void lambda$computeFieldOptimizationInfo$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexValue):105:105 -> a
+    35:35:boolean com.android.tools.r8.graph.DexValue.isDexItemBasedValueString():0:0 -> a
+    35:35:void lambda$computeFieldOptimizationInfo$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexValue):109 -> a
+    36:36:void lambda$computeFieldOptimizationInfo$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexValue):112:112 -> a
+    37:38:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.Value):135:136 -> a
+    39:56:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.value.AbstractValue,boolean):141:158 -> a
+    57:57:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.ReferenceTypeElement.asMaybeNull():86:86 -> a
+    57:57:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.value.AbstractValue,boolean):158 -> a
+    58:65:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.value.AbstractValue,boolean):160:167 -> a
+    66:66:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.ReferenceTypeElement.asMaybeNull():86:86 -> a
+    66:66:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.value.AbstractValue,boolean):168 -> a
+    67:69:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.value.AbstractValue,boolean):168:170 -> a
+    70:76:void updateFieldOptimizationInfoWith2Values(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexValue):178:184 -> a
+    77:79:com.android.tools.r8.ir.analysis.value.AbstractValue getOrComputeAbstractValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField):188:190 -> a
+    80:80: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):197:197 -> a
+    80:80:com.android.tools.r8.ir.analysis.value.AbstractValue getOrComputeAbstractValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField):191 -> a
+    81:88:com.android.tools.r8.ir.analysis.value.SingleFieldValue com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis.computeSingleEnumFieldValue(com.android.tools.r8.ir.code.Value):217:224 -> a
+    81:88: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):198 -> a
+    81:88:com.android.tools.r8.ir.analysis.value.AbstractValue getOrComputeAbstractValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField):191 -> a
+    89:91: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):202:204 -> a
+    89:91:com.android.tools.r8.ir.analysis.value.AbstractValue getOrComputeAbstractValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField):191 -> a
+    92:92:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():199:199 -> a
+    92:92:boolean isSubjectToOptimization(com.android.tools.r8.graph.DexEncodedField):119 -> a
+    93:94:boolean isSubjectToOptimization(com.android.tools.r8.graph.DexEncodedField):120:121 -> a
+    95:96:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):407:408 -> a
+    97:97:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():22:22 -> a
+    97:97:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):409 -> a
+    98:100:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):412:414 -> a
+    101:101:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):42:42 -> a
+    101:101:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):414 -> a
+    102:102:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():22:22 -> a
+    102:102:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):416 -> a
+    103:103:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):419:419 -> a
+    104:104:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():22:22 -> a
+    104:104:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):421 -> a
+    105:109:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):426:430 -> a
+    110:110:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():22:22 -> a
+    110:110:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):431 -> a
+    111:111:com.android.tools.r8.ir.analysis.value.ObjectState$Builder com.android.tools.r8.ir.analysis.value.ObjectState.builder():18:18 -> a
+    111:111:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):434 -> a
+    112:135:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):435:458 -> a
+    136:137: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):444:445 -> a
+    138:138:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():158:158 -> a
+    138:138: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):445 -> a
+    139:139:boolean com.android.tools.r8.graph.DexItemFactory$EnumMembers.isNameOrOrdinalField(com.android.tools.r8.graph.DexField):1380:1380 -> a
+    139:139: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):445 -> a
+    140:147: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):448:455 -> a
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis asStaticFieldValueAnalysis() -> b
-    1:1:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():209:209 -> b
+    1:1:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():199:199 -> b
     1:1:boolean isSubjectToOptimizationIgnoringPinning(com.android.tools.r8.graph.DexEncodedField):126 -> b
     2:5:boolean isSubjectToOptimizationIgnoringPinning(com.android.tools.r8.graph.DexEncodedField):127:130 -> b
-    6:44:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForInstance(com.android.tools.r8.ir.code.Value):374:412 -> b
-    45:47:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForInstance(com.android.tools.r8.ir.code.Value):402:404 -> b
-    48:49:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForInstance(com.android.tools.r8.ir.code.Value):394:395 -> b
-    50:51:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis.isEnumValuesArray(com.android.tools.r8.ir.code.Value):490:491 -> b
-    50:51:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForInstance(com.android.tools.r8.ir.code.Value):395 -> b
-    52:52:boolean com.android.tools.r8.ir.analysis.value.ObjectState.isEnumValuesObjectState():0:0 -> b
-    52:52:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis.isEnumValuesArray(com.android.tools.r8.ir.code.Value):491 -> b
-    52:52:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForInstance(com.android.tools.r8.ir.code.Value):395 -> b
-    53:55:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForInstance(com.android.tools.r8.ir.code.Value):429:431 -> b
-    1:1:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):234:234 -> c
-    2:2:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> c
-    2:2:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):234 -> c
-    3:8:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):237:242 -> c
-    9:9:boolean com.android.tools.r8.ir.analysis.value.ObjectState.isEnumValuesObjectState():0:0 -> c
-    9:9:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):242 -> c
-    10:12:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):248:250 -> c
-    13:13:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):249:249 -> c
-    1:52:com.android.tools.r8.ir.analysis.value.SingleFieldValue internalComputeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):255:306 -> d
-    53:64:com.android.tools.r8.ir.analysis.value.SingleFieldValue internalComputeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):279:290 -> d
-    65:66:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis.computeEnumInstanceObjectState(com.android.tools.r8.ir.code.Value):337:338 -> d
-    65:66:com.android.tools.r8.ir.analysis.value.SingleFieldValue internalComputeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):290 -> d
-    67:67:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():23:23 -> d
-    67:67:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis.computeEnumInstanceObjectState(com.android.tools.r8.ir.code.Value):339 -> d
-    67:67:com.android.tools.r8.ir.analysis.value.SingleFieldValue internalComputeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):290 -> d
-    68:70:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis.computeEnumInstanceObjectState(com.android.tools.r8.ir.code.Value):341:343 -> d
-    68:70:com.android.tools.r8.ir.analysis.value.SingleFieldValue internalComputeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):290 -> d
-    71:71:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> d
-    71:71:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis.computeEnumInstanceObjectState(com.android.tools.r8.ir.code.Value):345 -> d
-    71:71:com.android.tools.r8.ir.analysis.value.SingleFieldValue internalComputeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):290 -> d
-    72:72:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():23:23 -> d
-    72:72:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis.computeEnumInstanceObjectState(com.android.tools.r8.ir.code.Value):351 -> d
-    72:72:com.android.tools.r8.ir.analysis.value.SingleFieldValue internalComputeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):290 -> d
-    73:73:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():23:23 -> d
-    73:73:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis.computeEnumInstanceObjectState(com.android.tools.r8.ir.code.Value):353 -> d
-    73:73:com.android.tools.r8.ir.analysis.value.SingleFieldValue internalComputeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):290 -> d
-    74:74:com.android.tools.r8.ir.analysis.value.SingleFieldValue internalComputeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):291:291 -> d
-    75:78:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis.valuesArrayIndexMatchesOrdinal(int,com.android.tools.r8.ir.analysis.value.ObjectState):357:360 -> d
-    75:78:com.android.tools.r8.ir.analysis.value.SingleFieldValue internalComputeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):295 -> d
-    79:79: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):232:232 -> d
-    79:79:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis.valuesArrayIndexMatchesOrdinal(int,com.android.tools.r8.ir.analysis.value.ObjectState):360 -> d
-    79:79:com.android.tools.r8.ir.analysis.value.SingleFieldValue internalComputeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):295 -> d
-    80:80:com.android.tools.r8.graph.FieldResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):863:863 -> d
-    80:80: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):232 -> d
-    80:80:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis.valuesArrayIndexMatchesOrdinal(int,com.android.tools.r8.ir.analysis.value.ObjectState):360 -> d
-    80:80:com.android.tools.r8.ir.analysis.value.SingleFieldValue internalComputeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):295 -> d
-    81:85:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis.valuesArrayIndexMatchesOrdinal(int,com.android.tools.r8.ir.analysis.value.ObjectState):361:365 -> d
-    81:85:com.android.tools.r8.ir.analysis.value.SingleFieldValue internalComputeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):295 -> d
-    86:86:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> d
-    86:86:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis.valuesArrayIndexMatchesOrdinal(int,com.android.tools.r8.ir.analysis.value.ObjectState):366 -> d
-    86:86:com.android.tools.r8.ir.analysis.value.SingleFieldValue internalComputeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):295 -> d
-    87:87:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis.valuesArrayIndexMatchesOrdinal(int,com.android.tools.r8.ir.analysis.value.ObjectState):369:369 -> d
-    87:87:com.android.tools.r8.ir.analysis.value.SingleFieldValue internalComputeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):295 -> d
-    88:123:com.android.tools.r8.ir.analysis.value.SingleFieldValue internalComputeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):298:333 -> d
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues -> com.android.tools.r8.internal.ZC:
+    6:13:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForInstance(com.android.tools.r8.ir.code.Value):344:351 -> b
+    14:14:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> b
+    14:14:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForInstance(com.android.tools.r8.ir.code.Value):351 -> b
+    15:47:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForInstance(com.android.tools.r8.ir.code.Value):352:384 -> b
+    48:50:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForInstance(com.android.tools.r8.ir.code.Value):374:376 -> b
+    51:88:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForInstance(com.android.tools.r8.ir.code.Value):366:403 -> b
+    1:52:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):228:279 -> c
+    53:64:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):254:265 -> c
+    65:66:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis.computeEnumInstanceObjectState(com.android.tools.r8.ir.code.Value):310:311 -> c
+    65:66:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):265 -> c
+    67:67:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():22:22 -> c
+    67:67:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis.computeEnumInstanceObjectState(com.android.tools.r8.ir.code.Value):312 -> c
+    67:67:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):265 -> c
+    68:70:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis.computeEnumInstanceObjectState(com.android.tools.r8.ir.code.Value):314:316 -> c
+    68:70:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):265 -> c
+    71:71:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> c
+    71:71:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis.computeEnumInstanceObjectState(com.android.tools.r8.ir.code.Value):318 -> c
+    71:71:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):265 -> c
+    72:72:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():22:22 -> c
+    72:72:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis.computeEnumInstanceObjectState(com.android.tools.r8.ir.code.Value):324 -> c
+    72:72:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):265 -> c
+    73:73:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():22:22 -> c
+    73:73:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis.computeEnumInstanceObjectState(com.android.tools.r8.ir.code.Value):326 -> c
+    73:73:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):265 -> c
+    74:78:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):266:270 -> c
+    79:82:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis.verifyValuesArrayIndexMatchesOrdinal(int,com.android.tools.r8.ir.analysis.value.ObjectState):330:333 -> c
+    79:82:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):270 -> c
+    83:83: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):237:237 -> c
+    83:83:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis.verifyValuesArrayIndexMatchesOrdinal(int,com.android.tools.r8.ir.analysis.value.ObjectState):333 -> c
+    83:83:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):270 -> c
+    84:88:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis.verifyValuesArrayIndexMatchesOrdinal(int,com.android.tools.r8.ir.analysis.value.ObjectState):334:338 -> c
+    84:88:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):270 -> c
+    89:89:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> c
+    89:89:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis.verifyValuesArrayIndexMatchesOrdinal(int,com.android.tools.r8.ir.analysis.value.ObjectState):338 -> c
+    89:89:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):270 -> c
+    90:91:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis.verifyValuesArrayIndexMatchesOrdinal(int,com.android.tools.r8.ir.analysis.value.ObjectState):338:339 -> c
+    90:91:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):270 -> c
+    92:127:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):271:306 -> c
+    1:6:boolean isEnumValuesArray(com.android.tools.r8.ir.code.Value):462:467 -> d
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.toArrayType(int,com.android.tools.r8.graph.DexItemFactory):457:457 -> d
+    7:7:boolean isEnumValuesArray(com.android.tools.r8.ir.code.Value):467 -> d
+    8:8:boolean isEnumValuesArray(com.android.tools.r8.ir.code.Value):467:467 -> d
+    9:20:boolean isEnumValuesArray(com.android.tools.r8.ir.code.Value):465:476 -> d
+    21:21:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> d
+    21:21:boolean isEnumValuesArray(com.android.tools.r8.ir.code.Value):476 -> d
+    22:23:boolean isEnumValuesArray(com.android.tools.r8.ir.code.Value):477:478 -> d
+    24:24:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> d
+    24:24:boolean isEnumValuesArray(com.android.tools.r8.ir.code.Value):482 -> d
+    25:25:boolean isEnumValuesArray(com.android.tools.r8.ir.code.Value):483:483 -> d
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues -> com.android.tools.r8.internal.OB:
     1:1:void <init>():15:15 -> <init>
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues asEnumStaticFieldValues() -> a
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$Builder builder(com.android.tools.r8.graph.DexProgramClass):26:26 -> a
-    2:2:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$Builder com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues.builder():47:47 -> a
+    2:2:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$Builder com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues.builder():54:54 -> a
     2:2:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$Builder builder(com.android.tools.r8.graph.DexProgramClass):26 -> a
-    3:3:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$Builder com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues.builder():111:111 -> a
+    3:3:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$Builder com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues.builder():126:126 -> a
     3:3:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$Builder builder(com.android.tools.r8.graph.DexProgramClass):26 -> a
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$Builder -> com.android.tools.r8.internal.UC:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$Builder -> com.android.tools.r8.internal.JB:
     1:1:void <init>():29:29 -> <init>
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues build() -> a
     void recordStaticField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexItemFactory) -> a
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues -> com.android.tools.r8.internal.WC:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues -> com.android.tools.r8.internal.LB:
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues INSTANCE -> a
-    1:1:void <clinit>():102:102 -> <clinit>
-    1:1:void <init>():104:104 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues getInstance():107:107 -> b
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues$Builder -> com.android.tools.r8.internal.VC:
-    1:1:void <init>():114:114 -> <init>
+    1:1:void <clinit>():117:117 -> <clinit>
+    1:1:void <init>():119:119 -> <init>
+    1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues getInstance():122:122 -> b
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues$Builder -> com.android.tools.r8.internal.KB:
+    1:1:void <init>():129:129 -> <init>
     void recordStaticField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexItemFactory) -> a
-    1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues build():124:124 -> a
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues -> com.android.tools.r8.internal.YC:
-    com.android.tools.r8.com.google.common.collect.ImmutableMap enumAbstractValues -> a
-    1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap):42:43 -> <init>
-    com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues asEnumStaticFieldValues() -> a
-    1:1:com.android.tools.r8.ir.analysis.value.ObjectState getObjectStateForPossiblyPinnedField(com.android.tools.r8.graph.DexField):97:97 -> a
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues$Builder -> com.android.tools.r8.internal.XC:
-    com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder enumObjectStateBuilder -> b
+    1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues build():139:139 -> a
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues -> com.android.tools.r8.internal.NB:
+    com.android.tools.r8.com.google.common.collect.ImmutableMap enumAbstractValues -> b
+    com.android.tools.r8.graph.DexField valuesField -> c
     boolean $assertionsDisabled -> a
-    com.android.tools.r8.ir.analysis.value.AbstractValue valuesCandidateAbstractValue -> c
-    1:1:void <clinit>():50:50 -> <clinit>
-    1:1:void <init>():55:55 -> <init>
-    2:2:void <init>():52:52 -> <init>
-    1:3:void recordStaticField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexItemFactory):60:62 -> a
-    4:4:boolean com.android.tools.r8.ir.analysis.value.ObjectState.isEnumValuesObjectState():0:0 -> a
-    4:4:void recordStaticField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexItemFactory):62 -> a
-    5:7:void recordStaticField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexItemFactory):63:63 -> a
-    9:14:void recordStaticField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexItemFactory):65:70 -> a
-    15:20:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues build():77:82 -> a
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet -> com.android.tools.r8.internal.VF:
+    com.android.tools.r8.ir.analysis.value.AbstractValue valuesAbstractValue -> d
+    1:1:void <clinit>():39:39 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.value.AbstractValue):47:50 -> <init>
+    com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues asEnumStaticFieldValues() -> a
+    1:1:com.android.tools.r8.ir.analysis.value.ObjectState getObjectStateForPossiblyPinnedField(com.android.tools.r8.graph.DexField):99:99 -> a
+    2:2:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isZero():36:36 -> a
+    2:2:com.android.tools.r8.ir.analysis.value.ObjectState getObjectStateForPossiblyPinnedField(com.android.tools.r8.graph.DexField):100 -> a
+    3:6:com.android.tools.r8.ir.analysis.value.ObjectState getObjectStateForPossiblyPinnedField(com.android.tools.r8.graph.DexField):103:106 -> a
+    7:7:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():22:22 -> a
+    7:7:com.android.tools.r8.ir.analysis.value.ObjectState getObjectStateForPossiblyPinnedField(com.android.tools.r8.graph.DexField):107 -> a
+    1:2:com.android.tools.r8.ir.analysis.value.AbstractValue getValuesAbstractValueForPossiblyPinnedField(com.android.tools.r8.graph.DexField):111:112 -> b
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues$Builder -> com.android.tools.r8.internal.MB:
+    com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder enumAbstractValuesBuilder -> a
+    com.android.tools.r8.graph.DexField valuesFields -> b
+    com.android.tools.r8.ir.analysis.value.AbstractValue valuesAbstractValue -> c
+    1:1:void <init>():63:63 -> <init>
+    2:2:void <init>():59:59 -> <init>
+    1:3:void recordStaticField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexItemFactory):69:71 -> a
+    4:4:boolean com.android.tools.r8.graph.DexEncodedField.isEnum():190:190 -> a
+    4:4:void recordStaticField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexItemFactory):72 -> a
+    5:5:void recordStaticField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexItemFactory):73:73 -> a
+    6:11:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues build():79:84 -> a
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet -> com.android.tools.r8.internal.lF:
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet INSTANCE -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
     boolean contains(com.android.tools.r8.graph.DexEncodedField) -> a
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> a
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet getInstance():18:18 -> d
-com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState -> com.android.tools.r8.internal.N0:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState -> com.android.tools.r8.internal.M0:
     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.M8:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult -> com.android.tools.r8.internal.l8:
     1:1:void <init>():20:20 -> <init>
-com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$FailedDataflowAnalysisResult -> com.android.tools.r8.internal.K8:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$FailedDataflowAnalysisResult -> com.android.tools.r8.internal.j8:
     1:1:void <init>():38:38 -> <init>
-com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$SuccessfulDataflowAnalysisResult -> com.android.tools.r8.internal.L8:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$SuccessfulDataflowAnalysisResult -> com.android.tools.r8.internal.k8:
     1:1:void <init>():30:30 -> <init>
-com.android.tools.r8.ir.analysis.framework.intraprocedural.FailedTransferFunctionResult -> com.android.tools.r8.internal.Pb:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.FailedTransferFunctionResult -> com.android.tools.r8.internal.ib:
     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.hi:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis -> com.android.tools.r8.internal.th:
     java.util.Map blockExitStates -> d
     com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunction transfer -> c
     boolean $assertionsDisabled -> a
@@ -26925,19 +26935,19 @@
     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.YE:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunction -> com.android.tools.r8.internal.RD:
     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.ZE:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult -> com.android.tools.r8.internal.SD:
     com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState asAbstractState() -> a
     boolean isFailedTransferResult() -> b
     boolean isAbstractState() -> c
-com.android.tools.r8.ir.analysis.inlining.AlwaysSimpleInliningConstraint -> com.android.tools.r8.internal.Z0:
+com.android.tools.r8.ir.analysis.inlining.AlwaysSimpleInliningConstraint -> com.android.tools.r8.internal.Y0:
     com.android.tools.r8.ir.analysis.inlining.AlwaysSimpleInliningConstraint INSTANCE -> b
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():16:16 -> <init>
     boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod) -> a
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint rewrittenWithUnboxedArguments(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList) -> a
-com.android.tools.r8.ir.analysis.inlining.BooleanFalseSimpleInliningConstraint -> com.android.tools.r8.internal.P2:
+com.android.tools.r8.ir.analysis.inlining.BooleanFalseSimpleInliningConstraint -> com.android.tools.r8.internal.J2:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>(int):15:15 -> <init>
@@ -26947,7 +26957,7 @@
     4:4:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> a
     4:4:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):32 -> a
     5:6:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):32:33 -> a
-com.android.tools.r8.ir.analysis.inlining.BooleanTrueSimpleInliningConstraint -> com.android.tools.r8.internal.c3:
+com.android.tools.r8.ir.analysis.inlining.BooleanTrueSimpleInliningConstraint -> com.android.tools.r8.internal.P2:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>(int):15:15 -> <init>
@@ -26957,33 +26967,33 @@
     4:4:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> a
     4:4:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):32 -> a
     5:6:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):32:33 -> a
-com.android.tools.r8.ir.analysis.inlining.NeverSimpleInliningConstraint -> com.android.tools.r8.internal.ls:
+com.android.tools.r8.ir.analysis.inlining.NeverSimpleInliningConstraint -> com.android.tools.r8.internal.hr:
     com.android.tools.r8.ir.analysis.inlining.NeverSimpleInliningConstraint INSTANCE -> b
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
     boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod) -> a
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint rewrittenWithUnboxedArguments(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList) -> a
-com.android.tools.r8.ir.analysis.inlining.NotNullSimpleInliningConstraint -> com.android.tools.r8.internal.Ps:
+com.android.tools.r8.ir.analysis.inlining.NotNullSimpleInliningConstraint -> com.android.tools.r8.internal.Jr:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>(int):15:15 -> <init>
     1:1:com.android.tools.r8.ir.analysis.inlining.NotNullSimpleInliningConstraint create(int,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):21:21 -> a
     2:4:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):31:33 -> a
     5:7:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint rewrittenWithUnboxedArguments(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):38:40 -> a
-com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint -> com.android.tools.r8.internal.Ss:
+com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint -> com.android.tools.r8.internal.Mr:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>(int):15:15 -> <init>
     1:1:com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint create(int,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):21:21 -> a
     2:4:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):31:33 -> a
     5:7:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint rewrittenWithUnboxedArguments(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):38:40 -> a
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint -> com.android.tools.r8.internal.QB:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint -> com.android.tools.r8.internal.CA:
     int argumentIndex -> b
     1:2:void <init>(int):14:15 -> <init>
     1:1:com.android.tools.r8.ir.code.Value getArgument(com.android.tools.r8.ir.code.InvokeMethod):19:19 -> b
     boolean isArgumentConstraint() -> d
     1:1:int getArgumentIndex():23:23 -> h
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint -> com.android.tools.r8.internal.RB:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint -> com.android.tools.r8.internal.DA:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():12:12 -> <init>
@@ -27032,7 +27042,7 @@
     boolean isConjunction() -> e
     boolean isDisjunction() -> f
     boolean isNever() -> g
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintAnalysis -> com.android.tools.r8.internal.TB:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintAnalysis -> com.android.tools.r8.internal.FA:
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory factory -> b
     java.util.Set seen -> e
     com.android.tools.r8.utils.InternalOptions options -> d
@@ -27041,74 +27051,71 @@
     1:1:void <clinit>():39:39 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):49:49 -> <init>
     2:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):46:53 -> <init>
-    1:14:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeCode(com.android.tools.r8.ir.code.IRCode):57:70 -> a
-    15:16:int com.android.tools.r8.ir.code.IRCode.getNumberOfArguments():1074:1075 -> a
-    15:16:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeCode(com.android.tools.r8.ir.code.IRCode):70 -> a
-    17:18:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeCode(com.android.tools.r8.ir.code.IRCode):70:71 -> a
-    19:28:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):81:90 -> a
-    29:29:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
-    29:29:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):91 -> a
-    30:91:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):94:155 -> a
-    92:92:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):150:150 -> a
-    93:98:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):107:112 -> a
-    99:105:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getArgumentType(int):210:216 -> a
-    99:105:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):112 -> a
-    106:106:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):119:119 -> a
-    107:120:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):118:131 -> a
-    121:132:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):130:141 -> a
-    133:133:boolean com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.isAlways():0:0 -> a
-    133:133:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.join(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):89 -> a
+    1:15:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeCode(com.android.tools.r8.ir.code.IRCode):57:71 -> a
+    16:25:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):81:90 -> a
+    26:26:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
+    26:26:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):91 -> a
+    27:88:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):94:155 -> a
+    89:89:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):150:150 -> a
+    90:95:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):107:112 -> a
+    96:102:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getArgumentType(int):211:217 -> a
+    96:102:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):112 -> a
+    103:103:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):119:119 -> a
+    104:117:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):118:131 -> a
+    118:129:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):130:141 -> a
+    130:130:boolean com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.isAlways():0:0 -> a
+    130:130:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.join(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):89 -> a
+    130:130:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):141 -> a
+    131:131:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.join(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):89:89 -> a
+    131:131:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):141 -> a
+    132:132:boolean com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.isAlways():0:0 -> a
+    132:132:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.join(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):89 -> a
+    132:132:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):141 -> a
+    133:133:boolean com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.isNever():0:0 -> a
+    133:133:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.join(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):92 -> a
     133:133:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):141 -> a
-    134:134:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.join(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):89:89 -> a
+    134:134:boolean com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.isNever():0:0 -> a
+    134:134:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.join(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):95 -> a
     134:134:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):141 -> a
-    135:135:boolean com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.isAlways():0:0 -> a
-    135:135:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.join(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):89 -> a
+    135:135:boolean com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.isDisjunction():0:0 -> a
+    135:135:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.join(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):98 -> a
     135:135:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):141 -> a
-    136:136:boolean com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.isNever():0:0 -> a
-    136:136:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.join(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):92 -> a
+    136:136:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.join(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):99:99 -> a
     136:136:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):141 -> a
-    137:137:boolean com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.isNever():0:0 -> a
-    137:137:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.join(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):95 -> a
+    137:137:boolean com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.isDisjunction():0:0 -> a
+    137:137:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.join(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):101 -> a
     137:137:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):141 -> a
-    138:138:boolean com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.isDisjunction():0:0 -> a
-    138:138:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.join(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):98 -> a
-    138:138:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):141 -> a
-    139:139:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.join(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):99:99 -> a
-    139:139:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):141 -> a
-    140:140:boolean com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.isDisjunction():0:0 -> a
-    140:140:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.join(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):101 -> a
-    140:140:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):141 -> a
-    141:143:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.join(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):102:104 -> a
-    141:143:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):141 -> a
+    138:140:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.join(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):102:104 -> a
+    138:140:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):141 -> a
+    141:141:boolean com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.isConjunction():0:0 -> a
+    141:141:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.join(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):104 -> a
+    141:141:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):141 -> a
+    142:143:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.join(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):104:105 -> a
+    142:143:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):141 -> a
     144:144:boolean com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.isConjunction():0:0 -> a
-    144:144:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.join(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):104 -> a
+    144:144:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.join(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):105 -> a
     144:144:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):141 -> a
-    145:146:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.join(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):104:105 -> a
+    145:146:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.join(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):105:106 -> a
     145:146:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):141 -> a
-    147:147:boolean com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.isConjunction():0:0 -> a
-    147:147:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.join(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):105 -> a
+    147:147:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.join(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):90:90 -> a
     147:147:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):141 -> a
-    148:149:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.join(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):105:106 -> a
-    148:149:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):141 -> a
-    150:150:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.join(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):90:90 -> a
-    150:150:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):141 -> a
-    151:151:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):162:162 -> a
-    152:152:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):147:147 -> a
-    153:153:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintAnalysis.analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int):75:75 -> a
-    153:153:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):147 -> a
-    154:154:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint lambda$analyzeInstructionsInBlock$0(com.android.tools.r8.ir.code.If,int):125:125 -> a
-    155:155:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintAnalysis.analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int):75:75 -> a
-    155:155:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint lambda$analyzeInstructionsInBlock$0(com.android.tools.r8.ir.code.If,int):124 -> a
-    156:176:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint computeConstraintFromIfZeroTest(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.If$Type):167:187 -> a
-    177:183:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint computeConstraintFromIfZeroTest(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.If$Type):178:184 -> a
-    184:190:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint computeConstraintFromIfZeroTest(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.If$Type):169:175 -> a
+    148:148:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):162:162 -> a
+    149:149:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):147:147 -> a
+    150:150:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintAnalysis.analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int):75:75 -> a
+    150:150:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):147 -> a
+    151:151:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint lambda$analyzeInstructionsInBlock$0(com.android.tools.r8.ir.code.If,int):125:125 -> a
+    152:152:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintAnalysis.analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int):75:75 -> a
+    152:152:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint lambda$analyzeInstructionsInBlock$0(com.android.tools.r8.ir.code.If,int):124 -> a
+    153:173:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint computeConstraintFromIfZeroTest(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.If$Type):167:187 -> a
+    174:180:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint computeConstraintFromIfZeroTest(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.If$Type):178:184 -> a
+    181:187:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint computeConstraintFromIfZeroTest(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.If$Type):169:175 -> a
     1:1:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint lambda$analyzeInstructionsInBlock$1(com.android.tools.r8.ir.code.If,int):137:137 -> b
     2:2:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintAnalysis.analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int):75:75 -> b
     2:2:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint lambda$analyzeInstructionsInBlock$1(com.android.tools.r8.ir.code.If,int):136 -> b
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintAnalysis$1 -> com.android.tools.r8.internal.SB:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintAnalysis$1 -> com.android.tools.r8.internal.EA:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
     1:1:void <clinit>():167:167 -> <clinit>
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintConjunction -> com.android.tools.r8.internal.UB:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintConjunction -> com.android.tools.r8.internal.GA:
     java.util.List constraints -> c
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():13:13 -> <clinit>
@@ -27133,7 +27140,7 @@
     21:22:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):60:61 -> a
     23:29:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint rewrittenWithUnboxedArguments(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):70:76 -> a
     30:30:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint lambda$rewrittenWithUnboxedArguments$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):73:73 -> a
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintDisjunction -> com.android.tools.r8.internal.VB:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintDisjunction -> com.android.tools.r8.internal.HA:
     java.util.List constraints -> c
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():13:13 -> <clinit>
@@ -27158,7 +27165,7 @@
     23:29:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint rewrittenWithUnboxedArguments(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):70:76 -> a
     30:30:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint lambda$rewrittenWithUnboxedArguments$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):73:73 -> a
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintDisjunction asDisjunction() -> b
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory -> com.android.tools.r8.internal.WB:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory -> com.android.tools.r8.internal.IA:
     com.android.tools.r8.ir.analysis.inlining.BooleanFalseSimpleInliningConstraint[] lowBooleanFalseConstraints -> a
     com.android.tools.r8.ir.analysis.inlining.NotNullSimpleInliningConstraint[] lowNotNullConstraints -> c
     com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint[] lowNullConstraints -> d
@@ -27179,14 +27186,14 @@
     1:1:com.android.tools.r8.ir.analysis.inlining.BooleanTrueSimpleInliningConstraint lambda$createBooleanTrueConstraint$1(int):61:61 -> f
     1:1:com.android.tools.r8.ir.analysis.inlining.NotNullSimpleInliningConstraint lambda$createNotNullConstraint$2(int):69:69 -> g
     1:1:com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint lambda$createNullConstraint$3(int):77:77 -> h
-com.android.tools.r8.ir.analysis.modeling.LibraryMethodReadSetModeling -> com.android.tools.r8.internal.vo:
+com.android.tools.r8.ir.analysis.modeling.LibraryMethodReadSetModeling -> com.android.tools.r8.internal.zn:
     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):1318:1318 -> a
+    15:15:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1295:1295 -> 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.fb:
+com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker -> com.android.tools.r8.internal.Aa:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> c
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set deadEnumLiteMaps -> d
@@ -27195,7 +27202,7 @@
     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():59:59 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.isEnumLiteProtoShrinkingEnabled():1224:1224 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.isEnumLiteProtoShrinkingEnabled():1366:1366 -> 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
@@ -27253,7 +27260,7 @@
     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.gd:
+com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker -> com.android.tools.r8.internal.uc:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> c
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set classesWithRemovedExtensionFields -> d
@@ -27289,13 +27296,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.fd:
+com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker$1 -> com.android.tools.r8.internal.tc:
     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.qd:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker -> com.android.tools.r8.internal.Ec:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> c
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
@@ -27311,12 +27318,12 @@
     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):375:375 -> a
+    63:63:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):373:373 -> 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:78: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:217 -> a
-    79:79:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1030:1030 -> a
+    79:79:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1025:1025 -> a
     79:79: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
     80:96: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
     97:97:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
@@ -27331,76 +27338,83 @@
     126:126: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
     127:127:boolean lambda$rewriteDeadBuilderReferencesFromDynamicMethod$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Instruction):233:233 -> a
     128:129:boolean lambda$rewriteDeadBuilderReferencesFromDynamicMethod$4(com.android.tools.r8.ir.code.Instruction):244:245 -> a
-    130:137: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):271:278 -> a
-    138:142:void preprocessCallGraphBeforeCycleElimination(java.util.Map):282:286 -> a
-    143:143:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isDynamicMethodBridge(com.android.tools.r8.graph.DexEncodedMethod):163:163 -> a
-    143:143:void preprocessCallGraphBeforeCycleElimination(java.util.Map):286 -> a
-    144:148:void preprocessCallGraphBeforeCycleElimination(java.util.Map):287:291 -> a
-    149:154: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):303:308 -> a
-    155:161: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):307:313 -> a
-    162:163:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):347:348 -> a
-    164:164:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1030:1030 -> a
-    164:164:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):348 -> a
-    165:181:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):350:366 -> a
-    182:184:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):363:365 -> a
-    182:184:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):366 -> a
-    185:185:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    185:185:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):365 -> a
-    185:185:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):366 -> a
-    186:187:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):365:366 -> a
-    186:187:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):366 -> a
-    188:188:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.graph.DexField):359:359 -> a
-    188:188:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):366 -> a
-    188:188:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):366 -> a
-    189:193:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):370:374 -> a
-    194:194:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.ReferenceTypeElement.asMaybeNull():86:86 -> a
-    194:194:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):375 -> a
-    195:202:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):375:382 -> a
-    203:203:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    203:203:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):382 -> a
-    204:204:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):382:382 -> a
+    130:138: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
+    139:143:void preprocessCallGraphBeforeCycleElimination(java.util.Map):284:288 -> a
+    144:144:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isDynamicMethodBridge(com.android.tools.r8.graph.DexEncodedMethod):163:163 -> a
+    144:144:void preprocessCallGraphBeforeCycleElimination(java.util.Map):288 -> a
+    145:149:void preprocessCallGraphBeforeCycleElimination(java.util.Map):289:293 -> a
+    150:155: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
+    156:162: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
+    163:164:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):349:350 -> a
+    165:165:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1025:1025 -> a
+    165:165:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):350 -> a
+    166:182:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):352:368 -> a
+    183:185:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):363:365 -> a
+    183:185:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):368 -> a
+    186:186:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    186:186:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):365 -> a
+    186:186:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):368 -> a
+    187:188:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):365:366 -> a
+    187:188:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):368 -> a
+    189:189:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.graph.DexField):359:359 -> a
+    189:189:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):366 -> a
+    189:189:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):368 -> a
+    190:194:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):372:376 -> a
+    195:195:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.ReferenceTypeElement.asMaybeNull():86:86 -> a
+    195:195:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):377 -> a
+    196:203:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):377:384 -> a
+    204:204:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
+    204:204:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):384 -> a
+    205:205: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.od:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$1 -> com.android.tools.r8.internal.Cc:
     com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker this$0 -> c
     java.util.Set val$seen -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():128:128 -> <clinit>
     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:15: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:146 -> a
-    16:19: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
-    20:28: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):147:155 -> a
-    29:32: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
-    33:38: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
-    39:39: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.pd:
-    java.util.Set bypassClinitforInlining -> g
+    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):273:273 -> 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
+    22:30: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):147:155 -> a
+    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.Dc:
+    java.util.Set alwaysInline -> g
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
+    java.util.Set bypassClinitforInlining -> h
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set neverMergeClassVertically -> d
     java.util.Set neverMergeClassHorizontally -> e
-    java.util.Set alwaysInline -> f
+    java.util.Set neverMergeStaticClassHorizontally -> f
     com.android.tools.r8.utils.PredicateSet alwaysClassInline -> c
-    1:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.PredicateSet,java.util.Set,java.util.Set,java.util.Set,java.util.Set):404:411 -> <init>
-    1:1:void alwaysClassInlineGeneratedMessageLiteBuilders():430:430 -> a
-    2:3:boolean lambda$alwaysClassInlineGeneratedMessageLiteBuilders$0(com.android.tools.r8.graph.DexType):433:434 -> a
-    4:11:void bypassClinitforInliningNewBuilderMethods(com.android.tools.r8.graph.SubtypingInfo):438:445 -> a
-    12:12:boolean lambda$bypassClinitforInliningNewBuilderMethods$1(com.android.tools.r8.graph.DexEncodedMethod):443:443 -> a
-    1:1:void extend(com.android.tools.r8.graph.SubtypingInfo):415:415 -> b
-    2:2:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$RootSetExtension.alwaysInlineCreateBuilderFromGeneratedMessageLite():456:456 -> b
-    2:2:void extend(com.android.tools.r8.graph.SubtypingInfo):418 -> b
-    3:3:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$RootSetExtension.neverMergeMessageLite():470:470 -> b
-    3:3:void extend(com.android.tools.r8.graph.SubtypingInfo):419 -> b
-    4:4:void extend(com.android.tools.r8.graph.SubtypingInfo):422:422 -> b
-    5:5:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$RootSetExtension.alwaysInlineBuildPartialFromGeneratedMessageLiteExtendableBuilder():452:452 -> b
-    5:5:void extend(com.android.tools.r8.graph.SubtypingInfo):425 -> b
-    6:7:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$RootSetExtension.neverMergeGeneratedMessageLiteBuilder():463:464 -> b
-    6:7:void extend(com.android.tools.r8.graph.SubtypingInfo):426 -> b
-    8:9:void neverMergeClass(com.android.tools.r8.graph.DexType):474:475 -> b
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker -> com.android.tools.r8.internal.rd:
+    1:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.PredicateSet,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set):408:416 -> <init>
+    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):273:273 -> 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
+    1:1:void extend(com.android.tools.r8.graph.SubtypingInfo):420:420 -> b
+    2:2:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$RootSetExtension.alwaysInlineCreateBuilderFromGeneratedMessageLite():461:461 -> b
+    2:2:void extend(com.android.tools.r8.graph.SubtypingInfo):423 -> b
+    3:3:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$RootSetExtension.neverMergeMessageLite():475:475 -> b
+    3:3:void extend(com.android.tools.r8.graph.SubtypingInfo):424 -> b
+    4:4:void extend(com.android.tools.r8.graph.SubtypingInfo):427:427 -> b
+    5:5:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$RootSetExtension.alwaysInlineBuildPartialFromGeneratedMessageLiteExtendableBuilder():457:457 -> b
+    5:5:void extend(com.android.tools.r8.graph.SubtypingInfo):430 -> b
+    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.Fc:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder decoder -> c
     boolean $assertionsDisabled -> a
@@ -27484,7 +27498,7 @@
     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.Wx:
+com.android.tools.r8.ir.analysis.proto.ProtoEnqueuerUseRegistry -> com.android.tools.r8.internal.Ow:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> g
     com.android.tools.r8.shaking.EnqueuerUseRegistryFactory FACTORY -> f
     1:1:void <clinit>():24:24 -> <clinit>
@@ -27492,10 +27506,15 @@
     1:5:void registerConstClass(com.android.tools.r8.graph.DexType,java.util.ListIterator):50:54 -> a
     1:1:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory getFactory():37:37 -> c
     1:1:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):67:67 -> e
-    2:8:boolean com.android.tools.r8.ir.analysis.proto.ProtoEnqueuerUseRegistry.isStaticFieldReadForProtoSchemaDefinition(com.android.tools.r8.graph.DexField):76:82 -> e
-    2:8:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):68 -> e
-    9:12:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):69:72 -> e
-com.android.tools.r8.ir.analysis.proto.ProtoEnumSwitchMapRemover -> com.android.tools.r8.internal.Xx:
+    2:5:boolean com.android.tools.r8.ir.analysis.proto.ProtoEnqueuerUseRegistry.isStaticFieldReadForProtoSchemaDefinition(com.android.tools.r8.graph.DexField):76:79 -> e
+    2:5:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):68 -> e
+    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> e
+    6:6:boolean com.android.tools.r8.ir.analysis.proto.ProtoEnqueuerUseRegistry.isStaticFieldReadForProtoSchemaDefinition(com.android.tools.r8.graph.DexField):79 -> e
+    6:6:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):68 -> e
+    7:10:boolean com.android.tools.r8.ir.analysis.proto.ProtoEnqueuerUseRegistry.isStaticFieldReadForProtoSchemaDefinition(com.android.tools.r8.graph.DexField):79:82 -> e
+    7:10:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):68 -> e
+    11:14:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):69:72 -> e
+com.android.tools.r8.ir.analysis.proto.ProtoEnumSwitchMapRemover -> com.android.tools.r8.internal.Pw:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     java.util.Map staticFieldValuesMap -> c
     boolean $assertionsDisabled -> a
@@ -27513,7 +27532,7 @@
     19:19:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
     19:19:com.android.tools.r8.ir.analysis.value.SingleNumberValue getOrdinal(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):57 -> a
     20:29:com.android.tools.r8.ir.analysis.value.SingleNumberValue getOrdinal(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):57:66 -> a
-com.android.tools.r8.ir.analysis.proto.ProtoInliningReasonStrategy -> com.android.tools.r8.internal.cy:
+com.android.tools.r8.ir.analysis.proto.ProtoInliningReasonStrategy -> com.android.tools.r8.internal.Uw:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> c
     com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy parent -> b
     boolean $assertionsDisabled -> a
@@ -27551,38 +27570,39 @@
     37:37: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
     38:41: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
     38:41: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.ky:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences -> com.android.tools.r8.internal.cx:
     com.android.tools.r8.graph.DexType generatedMessageLiteExtendableMessageType -> l
     com.android.tools.r8.graph.DexType generatedMessageLiteBuilderType -> j
-    com.android.tools.r8.graph.DexType methodToInvokeType -> n
-    com.android.tools.r8.graph.DexString instanceFieldName -> v
-    com.android.tools.r8.graph.DexString dynamicMethodName -> x
-    com.android.tools.r8.graph.DexMethod newMessageInfoMethod -> F
-    com.android.tools.r8.graph.DexString newBuilderMethodName -> z
-    com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers methodToInvokeMembers -> t
-    com.android.tools.r8.graph.DexString findValueByNumberName -> A
-    com.android.tools.r8.graph.DexProto findLiteExtensionByNumberProto -> D
-    com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteBuilderMethods generatedMessageLiteBuilderMethods -> r
+    com.android.tools.r8.graph.DexType wireFormatFieldType -> p
+    com.android.tools.r8.graph.DexType messageLiteType -> n
+    com.android.tools.r8.graph.DexString defaultInstanceFieldName -> v
+    com.android.tools.r8.graph.DexMethod rawMessageInfoConstructor -> H
+    com.android.tools.r8.graph.DexString internalValueMapFieldName -> x
+    com.android.tools.r8.graph.DexMethod dynamicMethod -> F
+    com.android.tools.r8.graph.DexString findLiteExtensionByNumberName -> z
+    com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedExtensionMethods generatedExtensionMethods -> q
+    com.android.tools.r8.graph.DexString newBuilderMethodName -> A
+    com.android.tools.r8.graph.DexString protobufPackageDescriptorPrefix -> C
+    com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteExtendableBuilderMethods generatedMessageLiteExtendableBuilderMethods -> t
+    com.android.tools.r8.graph.DexProto dynamicMethodProto -> D
     com.android.tools.r8.graph.DexType enumLiteMapType -> c
-    com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteMethods generatedMessageLiteMethods -> q
     com.android.tools.r8.graph.DexType extensionRegistryLiteType -> g
     com.android.tools.r8.graph.DexType extendableMessageType -> e
     com.android.tools.r8.graph.DexType generatedMessageLiteExtendableBuilderType -> k
     com.android.tools.r8.graph.DexType generatedMessageLiteType -> i
-    com.android.tools.r8.graph.DexType wireFormatFieldType -> o
-    com.android.tools.r8.graph.DexString defaultInstanceFieldName -> u
-    com.android.tools.r8.graph.DexType messageLiteType -> m
-    com.android.tools.r8.graph.DexString internalValueMapFieldName -> w
-    com.android.tools.r8.graph.DexMethod rawMessageInfoConstructor -> G
-    com.android.tools.r8.graph.DexString findLiteExtensionByNumberName -> y
-    com.android.tools.r8.graph.DexMethod dynamicMethod -> E
+    com.android.tools.r8.graph.DexType methodToInvokeType -> o
+    com.android.tools.r8.graph.DexType rawMessageInfoType -> m
+    com.android.tools.r8.graph.DexString instanceFieldName -> w
+    com.android.tools.r8.graph.DexMethod newMessageInfoMethod -> G
+    com.android.tools.r8.graph.DexString dynamicMethodName -> y
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
-    com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedExtensionMethods generatedExtensionMethods -> p
-    com.android.tools.r8.graph.DexString protobufPackageDescriptorPrefix -> B
-    com.android.tools.r8.graph.DexProto dynamicMethodProto -> C
-    com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteExtendableBuilderMethods generatedMessageLiteExtendableBuilderMethods -> s
+    com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers methodToInvokeMembers -> u
+    com.android.tools.r8.graph.DexString findValueByNumberName -> B
+    com.android.tools.r8.graph.DexProto findLiteExtensionByNumberProto -> E
     com.android.tools.r8.graph.DexType enumVerifierType -> d
+    com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteBuilderMethods generatedMessageLiteBuilderMethods -> s
     com.android.tools.r8.graph.DexType enumLiteType -> b
+    com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteMethods generatedMessageLiteMethods -> r
     com.android.tools.r8.graph.DexType generatedExtensionType -> h
     com.android.tools.r8.graph.DexType extensionDescriptorType -> f
     1:55:void <init>(com.android.tools.r8.graph.DexItemFactory):62:116 -> <init>
@@ -27599,28 +27619,28 @@
     4:4:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isAbstractGeneratedMessageLiteBuilder(com.android.tools.r8.graph.DexProgramClass):141:141 -> c
     4:4:boolean isGeneratedMessageLiteBuilder(com.android.tools.r8.graph.DexProgramClass):183 -> c
     1:1:boolean isMessageInfoConstructionMethod(com.android.tools.r8.graph.DexMethod):187:187 -> d
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$1 -> com.android.tools.r8.internal.ky$a:
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedExtensionMethods -> com.android.tools.r8.internal.ky$b:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$1 -> com.android.tools.r8.internal.cx$a:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedExtensionMethods -> com.android.tools.r8.internal.cx$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):194:194 -> <init>
     2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):199:203 -> <init>
     7:19:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):201:213 -> <init>
     20:20:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):211:211 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteBuilderMethods -> com.android.tools.r8.internal.ky$c:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteBuilderMethods -> com.android.tools.r8.internal.cx$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):288:288 -> <init>
     2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):293:297 -> <init>
     7:14:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):295:302 -> <init>
     15:15:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):300:300 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteExtendableBuilderMethods -> com.android.tools.r8.internal.ky$d:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteExtendableBuilderMethods -> com.android.tools.r8.internal.cx$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):307:307 -> <init>
     2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):312:316 -> <init>
     7:14:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):314:321 -> <init>
     15:15:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):319:319 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteMethods -> com.android.tools.r8.internal.ky$e:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteMethods -> com.android.tools.r8.internal.cx$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
@@ -27634,7 +27654,7 @@
     32:39:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):255:262 -> <init>
     40:55:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):260:275 -> <init>
     56:56:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):273:273 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers -> com.android.tools.r8.internal.ky$f:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers -> com.android.tools.r8.internal.cx$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
@@ -27644,7 +27664,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):327:327 -> <init>
     2:19:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):337:354 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoShrinker -> com.android.tools.r8.internal.ly:
+com.android.tools.r8.ir.analysis.proto.ProtoShrinker -> com.android.tools.r8.internal.dx:
     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 -> j
@@ -27660,18 +27680,18 @@
     2:29:void <init>(com.android.tools.r8.graph.AppView):27:54 -> <init>
     1:1:java.util.Set getDeadProtoTypes():58:58 -> a
     2:4:boolean verifyDeadProtoTypesNotReferenced(com.android.tools.r8.dex.VirtualFile):68:70 -> a
-    5:5:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():781:781 -> a
+    5:5:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():838:838 -> a
     5:5:void setDeadProtoTypes(java.util.Set):63 -> a
     6:6:void setDeadProtoTypes(java.util.Set):64:64 -> a
-    7:7:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():782:782 -> a
+    7:7:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():839:839 -> a
     7:7:void setDeadProtoTypes(java.util.Set):63 -> a
-com.android.tools.r8.ir.analysis.proto.ProtoUtils -> com.android.tools.r8.internal.oy:
+com.android.tools.r8.ir.analysis.proto.ProtoUtils -> com.android.tools.r8.internal.fx:
     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.yy:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder -> com.android.tools.r8.internal.qx:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> b
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> c
     boolean $assertionsDisabled -> a
@@ -27699,7 +27719,7 @@
     162:162:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
     162:162:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):203 -> a
     163:165:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):204:206 -> a
-    166:167:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexClass.lookupUniqueInstanceFieldWithName(com.android.tools.r8.graph.DexString):446:447 -> a
+    166:167:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexClass.lookupUniqueInstanceFieldWithName(com.android.tools.r8.graph.DexString):437:438 -> a
     166:167:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):206 -> a
     168:172:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):208:212 -> a
     173:173:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> a
@@ -27726,7 +27746,8 @@
     4:19:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):311:326 -> b
     20:20:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):319:319 -> b
     21:21:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):308:308 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1 -> com.android.tools.r8.internal.xy:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1 -> com.android.tools.r8.internal.px:
+    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):261:263 -> <init>
     1:1:boolean hasNext():267:267 -> a
@@ -27738,7 +27759,7 @@
     9:9:int nextInt():293:293 -> b
     10:10:int nextInt():282:282 -> b
     11:11:int nextInt():273:273 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$2 -> com.android.tools.r8.internal.yy$a:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$2 -> com.android.tools.r8.internal.qx$a:
     com.android.tools.r8.ir.code.Value val$objectsValue -> c
     com.android.tools.r8.ir.code.InstructionIterator val$instructionIterator -> b
     int expectedNextIndex -> a
@@ -27753,10 +27774,10 @@
     16:16:java.lang.Object next():326 -> b
     17:17:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$2.next():348:348 -> b
     17:17:java.lang.Object next():326 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$InvalidRawMessageInfoException -> com.android.tools.r8.internal.yy$b:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$InvalidRawMessageInfoException -> com.android.tools.r8.internal.qx$b:
     1:1:void <init>():371:371 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1):371:371 -> <init>
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder -> com.android.tools.r8.internal.zy:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder -> com.android.tools.r8.internal.rx:
     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
@@ -27769,20 +27790,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.R8:
+com.android.tools.r8.ir.analysis.proto.schema.DeadProtoFieldObject -> com.android.tools.r8.internal.q8:
     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.bp:
+com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject -> com.android.tools.r8.internal.eo:
     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: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.Vx:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension -> com.android.tools.r8.internal.Nw:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> d
     java.util.Set dynamicMethodsWithTracedProtoObjects -> i
     com.android.tools.r8.graph.AppView appView -> b
@@ -27826,67 +27847,73 @@
     113:128:java.util.Map collectExtensionFields():247:262 -> a
     129:129:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
     129:129:java.util.Map collectExtensionFields():262 -> a
-    130:153:java.util.Map collectExtensionFields():263:286 -> a
-    154:154:java.util.Map collectExtensionFields():285:285 -> a
-    155:155:java.util.Map collectExtensionFields():284:284 -> a
-    156:156:java.util.Set lambda$collectExtensionFields$1(com.android.tools.r8.graph.DexProgramClass):279:279 -> a
-    157:165:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):298:306 -> a
-    166:166:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):42:42 -> a
-    166:166:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):306 -> a
-    167:184:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):308:325 -> a
-    185:185:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedExtensionMethods.isConstructor(com.android.tools.r8.graph.DexMethod):224:224 -> a
-    185:185:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):325 -> a
-    186:203:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):326:343 -> a
-    204:206:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):342:344 -> a
-    207:207:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):337:337 -> a
-    208:237:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):356:385 -> a
-    238:249:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):384:395 -> a
-    250:250:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType.isOneOf():0:0 -> a
-    250:250:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):395 -> a
-    251:260:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):396:405 -> a
-    261:261:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType.isOneOf():0:0 -> a
-    261:261:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):405 -> a
-    262:276:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):406:420 -> a
-    277:278:int com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.getHazzerBitFieldIndex(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):143:144 -> a
-    277:278:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):421 -> a
-    279:307:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):422:450 -> a
-    308:308:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):449:449 -> a
-    309:313:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):500:504 -> a
-    309:313:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):455 -> a
-    314:315:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):512:513 -> a
-    314:315:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):505 -> a
-    314:315:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):455 -> a
-    316:316:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoObject.isLiveProtoFieldObject():0:0 -> a
-    316:316:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):513 -> a
-    316:316:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):505 -> a
-    316:316:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):455 -> a
-    317:351:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):514:548 -> a
-    317:351:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):505 -> a
-    317:351:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):455 -> a
-    352:352:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoObject.isLiveProtoFieldObject():0:0 -> a
-    352:352:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):548 -> a
-    352:352:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):505 -> a
-    352:352:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):455 -> a
-    353:374:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):549:570 -> a
-    353:374:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):505 -> a
-    353:374:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):455 -> a
-    375:375:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):569:569 -> a
-    375:375:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):505 -> a
-    375:375:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):455 -> a
-    376:376:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):564:564 -> a
-    376:376:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):505 -> a
-    376:376:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):455 -> a
-    377:378:boolean lambda$markMapOrRequiredFieldsAsReachable$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):439:440 -> a
-    379:386:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):580:587 -> a
-    387:387:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType.isOneOf():0:0 -> a
-    387:387:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):588 -> a
-    388:400:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):588:600 -> a
-    401:407:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):611:617 -> a
-    408:434:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):616:642 -> a
-    435:457:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):651:673 -> a
+    130:139:java.util.Map collectExtensionFields():263:272 -> a
+    140:140:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    140:140:java.util.Map collectExtensionFields():272 -> a
+    141:155:java.util.Map collectExtensionFields():272:286 -> a
+    156:156:java.util.Map collectExtensionFields():285:285 -> a
+    157:157:java.util.Map collectExtensionFields():284:284 -> a
+    158:158:java.util.Set lambda$collectExtensionFields$1(com.android.tools.r8.graph.DexProgramClass):279:279 -> a
+    159:167:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):298:306 -> a
+    168:168:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):42:42 -> a
+    168:168:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):306 -> a
+    169:186:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):308:325 -> a
+    187:187:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedExtensionMethods.isConstructor(com.android.tools.r8.graph.DexMethod):224:224 -> a
+    187:187:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):325 -> a
+    188:205:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):326:343 -> a
+    206:208:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):342:344 -> a
+    209:209:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):337:337 -> a
+    210:239:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):356:385 -> a
+    240:251:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):384:395 -> a
+    252:252:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType.isOneOf():0:0 -> a
+    252:252:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):395 -> a
+    253:262:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):396:405 -> a
+    263:263:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType.isOneOf():0:0 -> a
+    263:263:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):405 -> a
+    264:278:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):406:420 -> a
+    279:280:int com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.getHazzerBitFieldIndex(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):143:144 -> a
+    279:280:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):421 -> a
+    281:309:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):422:450 -> a
+    310:310:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):449:449 -> a
+    311:315:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):500:504 -> a
+    311:315:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):455 -> a
+    316:317:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):512:513 -> a
+    316:317:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):505 -> a
+    316:317:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):455 -> a
+    318:318:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoObject.isLiveProtoFieldObject():0:0 -> a
+    318:318:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):513 -> a
+    318:318:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):505 -> a
+    318:318:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):455 -> a
+    319:353:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):514:548 -> a
+    319:353:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):505 -> a
+    319:353:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):455 -> a
+    354:354:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoObject.isLiveProtoFieldObject():0:0 -> a
+    354:354:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):548 -> a
+    354:354:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):505 -> a
+    354:354:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):455 -> a
+    355:376:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):549:570 -> a
+    355:376:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):505 -> a
+    355:376:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):455 -> a
+    377:377:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):569:569 -> a
+    377:377:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):505 -> a
+    377:377:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):455 -> a
+    378:378:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):564:564 -> a
+    378:378:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):505 -> a
+    378:378:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):455 -> a
+    379:380:boolean lambda$markMapOrRequiredFieldsAsReachable$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):439:440 -> a
+    381:388:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):580:587 -> a
+    389:389:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType.isOneOf():0:0 -> a
+    389:389:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):588 -> a
+    390:402:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):588:600 -> a
+    403:409:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):611:617 -> a
+    410:436:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):616:642 -> a
+    437:445:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):651:659 -> a
+    446:446:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    446:446:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):659 -> a
+    447:461:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):659:673 -> a
     1:25:void populateExtensionGraph(com.android.tools.r8.shaking.Enqueuer):215:239 -> b
     26:26:java.util.Set lambda$populateExtensionGraphWithExtensionFieldDefinition$2(com.android.tools.r8.graph.DexType):343:343 -> b
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo -> com.android.tools.r8.internal.Yx:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo -> com.android.tools.r8.internal.Qw:
     java.util.List objects -> e
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType type -> c
     java.util.OptionalInt auxData -> d
@@ -27943,11 +27970,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.Zx:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject -> com.android.tools.r8.internal.Rw:
     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.ay:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType -> com.android.tools.r8.internal.Sw:
     boolean needsIsInitializedCheck -> e
     boolean isMapFieldWithProto2EnumValue -> f
     boolean hasHasBit -> g
@@ -27975,7 +28002,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.by:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory -> com.android.tools.r8.internal.Tw:
     boolean $assertionsDisabled -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap fieldTypes -> b
     1:1:void <clinit>():10:10 -> <clinit>
@@ -27984,7 +28011,7 @@
     4:18:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType.fromFieldIdWithExtraBits(int):56:70 -> a
     4:18:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType createField(int):17 -> a
     19:20: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.ey:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo -> com.android.tools.r8.internal.Ww:
     java.util.LinkedList hasBitsObjects -> d
     java.util.LinkedList oneOfObjects -> e
     int flags -> b
@@ -28005,8 +28032,8 @@
     1:1:int numberOfHasBitsObjects():246:246 -> j
     1:1:int numberOfOneOfObjects():250:250 -> k
     1:9:java.lang.String toString():255:263 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$1 -> com.android.tools.r8.internal.dy:
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$Builder -> com.android.tools.r8.internal.ey$a:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$1 -> com.android.tools.r8.internal.Vw:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$Builder -> com.android.tools.r8.internal.Ww$a:
     java.util.LinkedList fields -> d
     java.util.LinkedList hasBitsObjects -> e
     java.util.LinkedList oneOfObjects -> f
@@ -28045,10 +28072,10 @@
     90:97:void removeUnusedSharedData():166:173 -> c
     98:98:void removeUnusedSharedData():172:172 -> c
     99:100:void removeUnusedSharedData():84:85 -> c
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$ProtoMessageInfoBuilderException -> com.android.tools.r8.internal.ey$b:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$ProtoMessageInfoBuilderException -> com.android.tools.r8.internal.Ww$b:
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$1):181:181 -> <init>
     2:2:void <init>():182:182 -> <init>
-com.android.tools.r8.ir.analysis.proto.schema.ProtoObject -> com.android.tools.r8.internal.fy:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObject -> com.android.tools.r8.internal.Xw:
     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
@@ -28057,18 +28084,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.gy:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromInvokeStatic -> com.android.tools.r8.internal.Yw:
     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: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.hy:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet -> com.android.tools.r8.internal.Zw:
     com.android.tools.r8.graph.DexField field -> a
     1:2:void <init>(com.android.tools.r8.graph.DexField):20:21 -> <init>
     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.iy:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfFieldType -> com.android.tools.r8.internal.ax:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>(int,boolean,boolean,boolean,boolean,boolean):20:20 -> <init>
@@ -28080,7 +28107,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.jy:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair -> com.android.tools.r8.internal.bx:
     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>
@@ -28088,38 +28115,21 @@
     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.my:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject -> com.android.tools.r8.internal.ex:
     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: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):1167:1168 -> 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):1162:1163 -> 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 -> com.android.tools.r8.internal.c6:
-    1:13:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):42:54 -> a
-    14:14:boolean com.android.tools.r8.ir.code.Instruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):606:606 -> a
-    14:14:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):55 -> a
-    15:15:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56:56 -> a
-    16:16:boolean com.android.tools.r8.ir.code.Instruction.isInvokeNewArray():0:0 -> a
-    16:16:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):62 -> a
-    17:17:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> a
-    17:17:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):63 -> a
-    18:18:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayFilledData():0:0 -> a
-    18:18:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):64 -> a
-    19:29:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):71:81 -> a
-    30:39:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):78:87 -> a
-    40:67:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):65:92 -> a
-    68:81:boolean com.android.tools.r8.ir.code.IRCode.controlFlowMayDependOnEnvironment(java.util.function.Consumer):301:314 -> a
-    68:81:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):92 -> a
-    82:95:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):93:106 -> a
-com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect -> com.android.tools.r8.internal.b6:
+com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect -> com.android.tools.r8.internal.N5:
     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
     1:3:void <clinit>():23:25 -> <clinit>
     1:1:void <init>(java.lang.String,int):22:22 -> <init>
-com.android.tools.r8.ir.analysis.type.ArrayTypeElement -> com.android.tools.r8.internal.z1:
+com.android.tools.r8.ir.analysis.type.ArrayTypeElement -> com.android.tools.r8.internal.y1:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.analysis.type.TypeElement memberTypeLattice -> g
     com.android.tools.r8.ir.analysis.type.NullabilityVariants variants -> h
@@ -28141,122 +28151,104 @@
     16:27:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeElement,com.android.tools.r8.graph.AppView):149:160 -> a
     28:38:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):167:177 -> a
     39:50:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):173:184 -> a
-    51:53:com.android.tools.r8.ir.analysis.type.ArrayTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.objectArrayType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):393:395 -> a
+    51:53:com.android.tools.r8.ir.analysis.type.ArrayTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.objectArrayType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):391:393 -> a
     51:53:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):187 -> a
-    54:56:com.android.tools.r8.ir.analysis.type.ArrayTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.objectArrayType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):394:396 -> a
+    54:56:com.android.tools.r8.ir.analysis.type.ArrayTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.objectArrayType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):392:394 -> a
     54:56:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):187 -> a
-    57:57:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.objectClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):389:389 -> a
+    57:57:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.objectClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):387:387 -> a
     57:57:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):185 -> a
     1:9:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.graph.DexItemFactory):38:46 -> b
     1:8:boolean equals(java.lang.Object):120:127 -> equals
     1:1:int hashCode():132:132 -> hashCode
     boolean isArrayType() -> r
     1:1:java.lang.String toString():112:112 -> toString
-com.android.tools.r8.ir.analysis.type.BooleanTypeElement -> com.android.tools.r8.internal.d3:
+com.android.tools.r8.ir.analysis.type.BooleanTypeElement -> com.android.tools.r8.internal.Q2:
     com.android.tools.r8.ir.analysis.type.BooleanTypeElement 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.BooleanTypeElement getInstance():11:11 -> I
     1:1:int hashCode():31:31 -> hashCode
-com.android.tools.r8.ir.analysis.type.BottomTypeElement -> com.android.tools.r8.internal.h3:
+com.android.tools.r8.ir.analysis.type.BottomTypeElement -> com.android.tools.r8.internal.U2:
     com.android.tools.r8.ir.analysis.type.BottomTypeElement 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 -> F
     1:1:com.android.tools.r8.ir.analysis.type.BottomTypeElement getInstance():15:15 -> H
     1:1:int hashCode():35:35 -> hashCode
-com.android.tools.r8.ir.analysis.type.ByteTypeElement -> com.android.tools.r8.internal.v3:
+com.android.tools.r8.ir.analysis.type.ByteTypeElement -> com.android.tools.r8.internal.i3:
     com.android.tools.r8.ir.analysis.type.ByteTypeElement 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.ByteTypeElement getInstance():11:11 -> I
     1:1:int hashCode():31:31 -> hashCode
-com.android.tools.r8.ir.analysis.type.CharTypeElement -> com.android.tools.r8.internal.K5:
+com.android.tools.r8.ir.analysis.type.CharTypeElement -> com.android.tools.r8.internal.w5:
     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 -> I
     1:1:int hashCode():31:31 -> hashCode
-com.android.tools.r8.ir.analysis.type.ClassTypeElement -> com.android.tools.r8.internal.X6:
+com.android.tools.r8.ir.analysis.type.ClassTypeElement -> com.android.tools.r8.internal.I6:
+    java.util.Set lazyInterfaces -> g
     com.android.tools.r8.graph.DexType type -> j
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.AppView appView -> h
-    com.android.tools.r8.ir.analysis.type.InterfaceCollection lazyInterfaces -> g
     com.android.tools.r8.ir.analysis.type.NullabilityVariants variants -> i
-    1:1:void <clinit>():29:29 -> <clinit>
-    1:7:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.NullabilityVariants,com.android.tools.r8.graph.AppView):63:69 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.ClassTypeElement.asMeetWithNotNull():126:126 -> J
-    1:1:com.android.tools.r8.ir.analysis.type.TypeElement asMeetWithNotNull():29 -> J
-    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement asMeetWithNotNull():126:126 -> L
-    1:1:com.android.tools.r8.graph.DexType getClassType():73:73 -> M
-    1:8:com.android.tools.r8.ir.analysis.type.InterfaceCollection getInterfaces():77:84 -> N
-    1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):29:29 -> a
-    2:3:com.android.tools.r8.ir.analysis.type.ClassTypeElement create(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.InterfaceCollection):41:42 -> a
-    4:4:com.android.tools.r8.ir.analysis.type.ClassTypeElement lambda$create$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.NullabilityVariants):44:44 -> a
-    5:5:com.android.tools.r8.ir.analysis.type.ClassTypeElement lambda$create$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.NullabilityVariants):54:54 -> a
-    6:7:com.android.tools.r8.ir.analysis.type.ClassTypeElement createVariant(com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.NullabilityVariants):89:90 -> a
-    8:10:boolean isBasedOnMissingClass(com.android.tools.r8.graph.AppView):109:111 -> a
-    11:11:boolean lambda$isBasedOnMissingClass$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,java.lang.Boolean):111:111 -> a
-    12:14:java.lang.String lambda$toString$3(com.android.tools.r8.utils.Pair):143:145 -> a
-    15:64:com.android.tools.r8.ir.analysis.type.TypeElement fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):160:209 -> a
-    65:74:void lambda$fixupClassTypeReferences$4(java.util.function.Function,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.Boolean):179:188 -> a
-    75:75:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    75:75:void lambda$fixupClassTypeReferences$4(java.util.function.Function,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.Boolean):188 -> a
-    76:80:void lambda$fixupClassTypeReferences$4(java.util.function.Function,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.Boolean):188:192 -> a
-    81:83:void lambda$fixupClassTypeReferences$5(java.util.function.Function,com.android.tools.r8.ir.analysis.type.InterfaceCollection$Builder,com.android.tools.r8.graph.DexType,java.lang.Boolean):205:207 -> a
-    84:93:com.android.tools.r8.ir.analysis.type.ClassTypeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.AppView):216:225 -> a
-    94:103:com.android.tools.r8.ir.analysis.type.ClassTypeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.AppView):220:229 -> a
-    104:116:com.android.tools.r8.ir.analysis.type.ClassTypeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.AppView):228:240 -> a
-    117:117:com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker.createUnmarked():280:280 -> a
-    117:117:com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker lambda$computeLeastUpperBoundOfInterfaces$8(com.android.tools.r8.graph.DexType):407 -> a
-    118:147:com.android.tools.r8.graph.DexType computeLeastUpperBoundOfClasses(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):341:370 -> a
-    148:152:com.android.tools.r8.ir.analysis.type.InterfaceCollection computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.InterfaceCollection):382:386 -> a
-    153:153:java.lang.Object com.android.tools.r8.utils.LRUCacheTable.get(java.lang.Object,java.lang.Object):55:55 -> a
-    153:153:com.android.tools.r8.ir.analysis.type.InterfaceCollection computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.InterfaceCollection):386 -> a
-    154:158:com.android.tools.r8.ir.analysis.type.InterfaceCollection computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.InterfaceCollection):386:390 -> a
-    159:159:java.lang.Object com.android.tools.r8.utils.LRUCacheTable.get(java.lang.Object,java.lang.Object):55:55 -> a
-    159:159:com.android.tools.r8.ir.analysis.type.InterfaceCollection computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.InterfaceCollection):390 -> a
-    160:218:com.android.tools.r8.ir.analysis.type.InterfaceCollection computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.InterfaceCollection):390:448 -> a
-    219:219:com.android.tools.r8.ir.analysis.type.InterfaceCollection computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.InterfaceCollection):383:383 -> a
-    220:220:void lambda$computeLeastUpperBoundOfInterfaces$6(java.util.Queue,com.android.tools.r8.graph.DexType,java.lang.Boolean):398:398 -> a
-    221:221:com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker.forLeft(boolean):272:272 -> a
-    221:221:void lambda$computeLeastUpperBoundOfInterfaces$6(java.util.Queue,com.android.tools.r8.graph.DexType,java.lang.Boolean):398 -> a
-    222:222:void lambda$computeLeastUpperBoundOfInterfaces$6(java.util.Queue,com.android.tools.r8.graph.DexType,java.lang.Boolean):398:398 -> a
-    223:224:void lambda$computeLeastUpperBoundOfInterfaces$9(java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker):423:424 -> a
+    1:1:void <clinit>():27:27 -> <clinit>
+    1:7:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,java.util.Set,com.android.tools.r8.ir.analysis.type.NullabilityVariants,com.android.tools.r8.graph.AppView):61:67 -> <init>
+    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.ClassTypeElement.asMeetWithNotNull():124:124 -> J
+    1:1:com.android.tools.r8.ir.analysis.type.TypeElement asMeetWithNotNull():27 -> J
+    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement asMeetWithNotNull():124:124 -> L
+    1:1:com.android.tools.r8.graph.DexType getClassType():71:71 -> M
+    1:8:java.util.Set getInterfaces():75:82 -> N
+    1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):27:27 -> a
+    2:3:com.android.tools.r8.ir.analysis.type.ClassTypeElement create(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,java.util.Set):39:40 -> a
+    4:4:com.android.tools.r8.ir.analysis.type.ClassTypeElement lambda$create$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,java.util.Set,com.android.tools.r8.ir.analysis.type.NullabilityVariants):42:42 -> a
+    5:5:com.android.tools.r8.ir.analysis.type.ClassTypeElement lambda$create$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.NullabilityVariants):52:52 -> a
+    6:7:com.android.tools.r8.ir.analysis.type.ClassTypeElement createVariant(com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.NullabilityVariants):87:88 -> a
+    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):273:273 -> 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
+    34:34:com.android.tools.r8.ir.analysis.type.TypeElement fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):177 -> a
+    35:55:com.android.tools.r8.ir.analysis.type.TypeElement fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):177:197 -> a
+    56:65:com.android.tools.r8.ir.analysis.type.ClassTypeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.AppView):204:213 -> a
+    66:75:com.android.tools.r8.ir.analysis.type.ClassTypeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.AppView):208:217 -> a
+    76:88:com.android.tools.r8.ir.analysis.type.ClassTypeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.AppView):216:228 -> a
+    89:118:com.android.tools.r8.graph.DexType computeLeastUpperBoundOfClasses(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):253:282 -> a
+    119:122:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):292:295 -> a
+    123:123:java.lang.Object com.android.tools.r8.utils.LRUCacheTable.get(java.lang.Object,java.lang.Object):55:55 -> a
+    123:123:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):295 -> a
+    124:128:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):295:299 -> a
+    129:129:java.lang.Object com.android.tools.r8.utils.LRUCacheTable.get(java.lang.Object,java.lang.Object):55:55 -> a
+    129:129:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):299 -> a
+    130:157:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):299:326 -> a
+    158:158:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    158:158:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):328 -> a
+    159:198:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):330:369 -> a
+    199:199:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):293:293 -> a
+    200:200:java.util.Set lambda$computeLeastUpperBoundOfInterfaces$3(com.android.tools.r8.graph.DexType):315:315 -> a
     com.android.tools.r8.ir.analysis.type.ClassTypeElement asClassType() -> b
-    1:2:com.android.tools.r8.ir.analysis.type.ClassTypeElement create(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):51:52 -> b
-    3:7:com.android.tools.r8.ir.analysis.type.ClassTypeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):100:104 -> b
-    8:8:void lambda$computeLeastUpperBoundOfInterfaces$7(java.util.Queue,com.android.tools.r8.graph.DexType,java.lang.Boolean):401:401 -> b
-    9:9:com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker.forRight(boolean):276:276 -> b
-    9:9:void lambda$computeLeastUpperBoundOfInterfaces$7(java.util.Queue,com.android.tools.r8.graph.DexType,java.lang.Boolean):401 -> b
-    10:10:void lambda$computeLeastUpperBoundOfInterfaces$7(java.util.Queue,com.android.tools.r8.graph.DexType,java.lang.Boolean):401:401 -> b
-    1:11:boolean equals(java.lang.Object):458:468 -> equals
-    1:1:int hashCode():154:154 -> hashCode
+    1:2:com.android.tools.r8.ir.analysis.type.ClassTypeElement create(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):49:50 -> b
+    3:7:com.android.tools.r8.ir.analysis.type.ClassTypeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):98:102 -> b
+    8:8:java.util.Set lambda$computeLeastUpperBoundOfInterfaces$4(com.android.tools.r8.graph.DexType):331:331 -> b
+    1:19:boolean equals(java.lang.Object):379:397 -> equals
+    1:1:int hashCode():148:148 -> hashCode
     boolean isClassType() -> s
-    1:16:java.lang.String toString():131:146 -> toString
-    17:26:java.lang.String toString():139:148 -> toString
-com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker -> com.android.tools.r8.internal.X6$a:
-    com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker RIGHT_KNOWN -> c
-    com.android.tools.r8.utils.OptionalBool right -> g
-    com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker LEFT_UNKNOWN -> b
-    com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker LEFT_KNOWN -> a
-    com.android.tools.r8.utils.OptionalBool left -> f
-    com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker RIGHT_UNKNOWN -> d
-    boolean $assertionsDisabled -> e
-    1:17:void <clinit>():252:268 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.utils.OptionalBool):283:286 -> <init>
-    1:1:boolean isMarkedOnBothSides():294:294 -> a
-    2:3:com.android.tools.r8.utils.OptionalBool knownIfAnyIsKnown(com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.utils.OptionalBool):298:299 -> a
-    4:4:boolean merge(com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker):308:308 -> a
-    5:5:boolean com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker.isMarked():290:290 -> a
-    5:5:boolean merge(com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker):308 -> a
-    6:17:boolean merge(com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker):308:319 -> a
-    1:2:boolean knownIfBothAreKnown():303:304 -> b
-com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceWithMarker -> com.android.tools.r8.internal.X6$b:
+    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.I6$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.I6$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):328:330 -> <init>
-com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater -> com.android.tools.r8.internal.t9:
+    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.Q8:
     com.android.tools.r8.graph.AppView appView -> b
     java.util.function.Function mapping -> c
     boolean $assertionsDisabled -> a
@@ -28285,73 +28277,37 @@
     41:41:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
     41:41:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):61 -> a
     42:49:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):61:68 -> a
-    50:50:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
+    50:50:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
     50:50:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):68 -> a
     51:56:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):68:73 -> a
-    57:57:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
+    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.za:
+com.android.tools.r8.ir.analysis.type.DoubleTypeElement -> com.android.tools.r8.internal.V9:
     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 -> I
     1:1:int hashCode():26:26 -> hashCode
-com.android.tools.r8.ir.analysis.type.FloatTypeElement -> com.android.tools.r8.internal.Lc:
+com.android.tools.r8.ir.analysis.type.FloatTypeElement -> com.android.tools.r8.internal.bc:
     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 -> I
     1:1:int hashCode():25:25 -> hashCode
-com.android.tools.r8.ir.analysis.type.IntTypeElement -> com.android.tools.r8.internal.Uh:
+com.android.tools.r8.ir.analysis.type.IntTypeElement -> com.android.tools.r8.internal.hh:
     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 -> I
     1:1:int hashCode():25:25 -> hashCode
-com.android.tools.r8.ir.analysis.type.InterfaceCollection -> com.android.tools.r8.internal.Vh:
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap interfaces -> c
-    com.android.tools.r8.ir.analysis.type.InterfaceCollection EMPTY -> a
-    boolean $assertionsDisabled -> b
-    1:47:void <clinit>():20:66 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap,com.android.tools.r8.ir.analysis.type.InterfaceCollection$1):20:20 -> <init>
-    2:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap):90:92 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.type.InterfaceCollection$Builder builder():77:77 -> a
-    2:2:void forEach(java.util.function.BiConsumer):121:121 -> a
-    3:4:boolean anyMatch(java.util.function.BiPredicate):125:126 -> a
-    5:5:void lambda$getInterfaceList$0(java.util.List,com.android.tools.r8.graph.DexType,java.lang.Boolean):135:135 -> a
-    6:6:com.android.tools.r8.utils.OptionalBool contains(com.android.tools.r8.graph.DexType):153:153 -> a
-    7:7:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanFunction.get(java.lang.Object):108:108 -> a
-    7:7:com.android.tools.r8.utils.OptionalBool contains(com.android.tools.r8.graph.DexType):153 -> a
-    8:10:com.android.tools.r8.utils.OptionalBool contains(com.android.tools.r8.graph.DexType):155:157 -> a
-    11:11:boolean com.android.tools.r8.utils.InternalOptions.canHaveZipFileWithMissingCloseableBug():1891:1891 -> a
-    11:11:boolean isKnownToImplement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):24 -> a
-    12:13:boolean isKnownToImplement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):25:26 -> a
-    1:1:com.android.tools.r8.ir.analysis.type.InterfaceCollection empty():69:69 -> b
-    2:2:boolean containsKnownInterface(com.android.tools.r8.graph.DexType):161:161 -> b
-    1:1:com.android.tools.r8.ir.analysis.type.InterfaceCollection singleton(com.android.tools.r8.graph.DexType):73:73 -> c
-    2:3:java.util.List getInterfaceList():134:135 -> c
-    1:5:com.android.tools.r8.graph.DexType getSingleKnownInterface():145:149 -> d
-    1:1:boolean isEmpty():96:96 -> e
-    1:5:boolean equals(java.lang.Object):108:112 -> equals
-    1:1:int size():100:100 -> f
-    1:1:int hashCode():117:117 -> hashCode
-com.android.tools.r8.ir.analysis.type.InterfaceCollection$1 -> com.android.tools.r8.internal.Vh$a:
-com.android.tools.r8.ir.analysis.type.InterfaceCollection$Builder -> com.android.tools.r8.internal.Vh$b:
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap interfaces -> a
-    1:1:void <init>(com.android.tools.r8.ir.analysis.type.InterfaceCollection$1):32:32 -> <init>
-    2:2:void <init>():35:35 -> <init>
-    3:3:void <init>():33:33 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.type.InterfaceCollection$Builder addInterface(com.android.tools.r8.graph.DexType,boolean):49:49 -> a
-    2:2:java.lang.Boolean lambda$addInterface$0(boolean,com.android.tools.r8.graph.DexType,java.lang.Boolean):53:53 -> a
-    3:6:com.android.tools.r8.ir.analysis.type.InterfaceCollection build():58:61 -> a
-com.android.tools.r8.ir.analysis.type.LongTypeElement -> com.android.tools.r8.internal.Dp:
+com.android.tools.r8.ir.analysis.type.LongTypeElement -> com.android.tools.r8.internal.Fo:
     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 -> I
     1:1:int hashCode():26:26 -> hashCode
-com.android.tools.r8.ir.analysis.type.Nullability -> com.android.tools.r8.internal.Ts:
+com.android.tools.r8.ir.analysis.type.Nullability -> com.android.tools.r8.internal.Nr:
     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
@@ -28372,7 +28328,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.Us:
+com.android.tools.r8.ir.analysis.type.NullabilityVariants -> com.android.tools.r8.internal.Or:
     boolean $assertionsDisabled -> a
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement definitelyNotNullVariant -> d
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement bottomVariant -> e
@@ -28384,7 +28340,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.Vv:
+com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement -> com.android.tools.r8.internal.Ou:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -28431,10 +28387,10 @@
     15:15:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.graph.DexItemFactory):57 -> b
     16:18:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.graph.DexItemFactory):58:60 -> b
     com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement asPrimitiveType() -> c
-com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement$1 -> com.android.tools.r8.internal.Uv:
+com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement$1 -> com.android.tools.r8.internal.Nu:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():113:113 -> <clinit>
-com.android.tools.r8.ir.analysis.type.ReferenceTypeElement -> com.android.tools.r8.internal.Az:
+com.android.tools.r8.ir.analysis.type.ReferenceTypeElement -> com.android.tools.r8.internal.my:
     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
@@ -28457,69 +28413,69 @@
     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.Az$a:
+com.android.tools.r8.ir.analysis.type.ReferenceTypeElement$NullElement -> com.android.tools.r8.internal.my$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.OB:
+com.android.tools.r8.ir.analysis.type.ShortTypeElement -> com.android.tools.r8.internal.AA:
     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 -> I
     1:1:int hashCode():31:31 -> hashCode
-com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement -> com.android.tools.r8.internal.fC:
+com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement -> com.android.tools.r8.internal.QA:
     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() -> D
     1:1:com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement getInstance():16:16 -> H
     1:1:int hashCode():36:36 -> hashCode
-com.android.tools.r8.ir.analysis.type.TopTypeElement -> com.android.tools.r8.internal.XE:
+com.android.tools.r8.ir.analysis.type.TopTypeElement -> com.android.tools.r8.internal.QD:
     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 -> F
     1:1:com.android.tools.r8.ir.analysis.type.TopTypeElement getInstance():15:15 -> H
     1:1:int hashCode():35:35 -> hashCode
-com.android.tools.r8.ir.analysis.type.TypeAnalysis -> com.android.tools.r8.internal.tF:
+com.android.tools.r8.ir.analysis.type.TypeAnalysis -> com.android.tools.r8.internal.IE:
     com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode mode -> d
     java.util.Deque worklist -> f
     com.android.tools.r8.graph.AppView appView -> e
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
     boolean mayHaveImpreciseTypes -> c
-    1:1:void <clinit>():22:22 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,boolean):44:44 -> <init>
-    2:14:void <init>(com.android.tools.r8.graph.AppView,boolean):34:46 -> <init>
-    1:2:void analyze():50:51 -> a
-    3:8:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.analyzeValue(com.android.tools.r8.ir.code.Value):122:127 -> a
-    3:8:void analyze():51 -> a
-    9:12:void narrowing(com.android.tools.r8.ir.code.IRCode):67:70 -> a
-    13:15:void narrowing(java.lang.Iterable):76:78 -> a
-    16:19:void analyzeValues(java.lang.Iterable,com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode):87:90 -> a
-    20:22:void enqueue(com.android.tools.r8.ir.code.Value):94:96 -> a
-    23:39:void analyzeBasicBlock(com.android.tools.r8.ir.code.BasicBlock):101:117 -> a
-    40:49:void updateTypeOfValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.type.TypeElement):131:140 -> a
+    1:1:void <clinit>():23:23 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,boolean):45:45 -> <init>
+    2:14:void <init>(com.android.tools.r8.graph.AppView,boolean):35:47 -> <init>
+    1:2:void analyze():51:52 -> a
+    3:8:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.analyzeValue(com.android.tools.r8.ir.code.Value):123:128 -> a
+    3:8:void analyze():52 -> a
+    9:12:void narrowing(com.android.tools.r8.ir.code.IRCode):68:71 -> a
+    13:15:void narrowing(java.lang.Iterable):77:79 -> a
+    16:19:void analyzeValues(java.lang.Iterable,com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode):88:91 -> a
+    20:22:void enqueue(com.android.tools.r8.ir.code.Value):95:97 -> a
+    23:39:void analyzeBasicBlock(com.android.tools.r8.ir.code.BasicBlock):102:118 -> a
+    40:49:void updateTypeOfValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.type.TypeElement):132:141 -> a
     50:50:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
-    50:50:void updateTypeOfValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.type.TypeElement):140 -> a
-    51:67:void updateTypeOfValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.type.TypeElement):144:160 -> a
-    68:68:com.android.tools.r8.graph.DexType getRefinedReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):166:166 -> a
-    69:69:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.type.TypeAnalysis.getRefinedReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value):171:171 -> a
-    69:69:com.android.tools.r8.graph.DexType getRefinedReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):166 -> a
-    70:80:com.android.tools.r8.graph.DexType toRefinedReceiverType(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):178:188 -> a
-    1:4:void widening(com.android.tools.r8.ir.code.IRCode):56:59 -> b
-    5:5:boolean verifyValuesUpToDate(java.lang.Iterable):82:82 -> b
-    1:1:void widening(java.lang.Iterable):63:63 -> c
-com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode -> com.android.tools.r8.internal.sF:
+    50:50:void updateTypeOfValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.type.TypeElement):141 -> a
+    51:67:void updateTypeOfValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.type.TypeElement):145:161 -> a
+    68:68:com.android.tools.r8.graph.DexType getRefinedReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):167:167 -> a
+    69:69:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.type.TypeAnalysis.getRefinedReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value):172:172 -> a
+    69:69:com.android.tools.r8.graph.DexType getRefinedReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):167 -> a
+    70:80:com.android.tools.r8.graph.DexType toRefinedReceiverType(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):179:189 -> a
+    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.HE:
     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>():25:29 -> <clinit>
-    1:1:void <init>(java.lang.String,int):24:24 -> <init>
-com.android.tools.r8.ir.analysis.type.TypeElement -> com.android.tools.r8.internal.AF:
+    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.PE:
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
     1:1:void <clinit>():16:16 -> <clinit>
@@ -28530,12 +28486,12 @@
     boolean isSinglePrimitive() -> D
     boolean isWidePrimitive() -> E
     com.android.tools.r8.ir.analysis.type.Nullability nullability() -> F
-    1:1:int requiredRegisters():384:384 -> G
+    1:1:int requiredRegisters():382:382 -> G
     2:2:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> G
-    2:2:int requiredRegisters():384 -> G
+    2:2:int requiredRegisters():382 -> G
     3:3:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isTop():0:0 -> G
-    3:3:int requiredRegisters():384 -> G
-    4:4:int requiredRegisters():384:384 -> G
+    3:3:int requiredRegisters():382 -> G
+    4:4:int requiredRegisters():382:382 -> G
     com.android.tools.r8.ir.analysis.type.ArrayTypeElement asArrayType() -> a
     com.android.tools.r8.ir.analysis.type.TypeElement fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView) -> a
     boolean isBasedOnMissingClass(com.android.tools.r8.graph.AppView) -> a
@@ -28556,42 +28512,38 @@
     33:33:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isNullType():0:0 -> a
     33:33:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):115 -> a
     34:36:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):116:118 -> a
-    37:37:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.objectClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):389:389 -> a
+    37:37:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.objectClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):387:387 -> a
     37:37:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):119 -> a
     38:46:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):122:130 -> a
     47:47:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):99:99 -> a
     48:50:com.android.tools.r8.ir.analysis.type.TypeElement join(java.lang.Iterable,com.android.tools.r8.graph.AppView):134:136 -> a
-    51:59:boolean equalUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement):216:224 -> a
-    60:60:boolean isStringType(com.android.tools.r8.graph.DexItemFactory):285:285 -> a
-    61:62:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isClassType(com.android.tools.r8.graph.DexType):280:281 -> a
-    61:62:boolean isStringType(com.android.tools.r8.graph.DexItemFactory):285 -> a
-    63:63:com.android.tools.r8.ir.analysis.type.ClassTypeElement classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):400:400 -> a
-    64:64:com.android.tools.r8.ir.analysis.type.TypeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):408:408 -> a
-    65:72:com.android.tools.r8.ir.analysis.type.TypeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,boolean):413:420 -> a
+    51:59:boolean equalUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement):214:222 -> a
+    60:60:boolean isStringType(com.android.tools.r8.graph.DexItemFactory):283:283 -> a
+    61:62:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isClassType(com.android.tools.r8.graph.DexType):278:279 -> a
+    61:62:boolean isStringType(com.android.tools.r8.graph.DexItemFactory):283 -> a
+    63:63:com.android.tools.r8.ir.analysis.type.ClassTypeElement classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):398:398 -> a
+    64:64:com.android.tools.r8.ir.analysis.type.TypeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):406:406 -> a
+    65:72:com.android.tools.r8.ir.analysis.type.TypeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,boolean):411:418 -> a
     com.android.tools.r8.ir.analysis.type.ClassTypeElement asClassType() -> b
-    1:1:boolean lessThanOrEqual(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):162:162 -> b
-    2:3:boolean com.android.tools.r8.ir.analysis.type.TypeElement.internalLessThan(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):167:168 -> b
-    2:3:boolean lessThanOrEqual(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):162 -> b
-    4:4:com.android.tools.r8.ir.analysis.type.ClassTypeElement objectClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):389:389 -> b
+    1:1:boolean lessThanOrEqual(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):166:166 -> b
+    2:2:com.android.tools.r8.ir.analysis.type.ClassTypeElement objectClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):387:387 -> b
     com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement asPrimitiveType() -> c
     1:1:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isTop():0:0 -> c
-    1:1:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):182 -> c
-    2:2:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):183:183 -> c
+    1:1:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):180 -> c
+    2:2:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):181:181 -> c
     3:3:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isTop():0:0 -> c
-    3:3:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):183 -> c
-    4:4:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):185:185 -> c
+    3:3:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):181 -> c
+    4:4:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):183:183 -> c
     5:5:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isTop():0:0 -> c
-    5:5:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):185 -> c
+    5:5:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):183 -> c
     6:6:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> c
-    6:6:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):188 -> c
+    6:6:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):186 -> c
     7:7:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> c
-    7:7:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):191 -> c
-    8:17:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):194:203 -> c
-    18:18:com.android.tools.r8.ir.analysis.type.ClassTypeElement stringClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):404:404 -> c
+    7:7:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):189 -> c
+    8:17:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):192:201 -> c
+    18:18:com.android.tools.r8.ir.analysis.type.ClassTypeElement stringClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):402:402 -> c
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement asReferenceType() -> d
-    1:1:boolean strictlyLessThan(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):150:150 -> d
-    2:3:boolean com.android.tools.r8.ir.analysis.type.TypeElement.internalLessThan(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):167:168 -> d
-    2:3:boolean strictlyLessThan(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):150 -> d
+    1:5:boolean strictlyLessThan(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):150:154 -> d
     1:1:com.android.tools.r8.ir.analysis.type.BooleanTypeElement getBoolean():27:27 -> e
     1:1:com.android.tools.r8.ir.analysis.type.BottomTypeElement getBottom():19:19 -> f
     1:1:com.android.tools.r8.ir.analysis.type.ByteTypeElement getByte():31:31 -> g
@@ -28607,33 +28559,33 @@
     1:1:com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeElement getWide():63:63 -> q
     boolean isArrayType() -> r
     boolean isClassType() -> s
-    1:1:boolean isDefinitelyNotNull():380:380 -> t
-    1:1:boolean isDefinitelyNull():376:376 -> u
+    1:1:boolean isDefinitelyNotNull():378:378 -> t
+    1:1:boolean isDefinitelyNull():374:374 -> u
     1:1:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBoolean():0:0 -> v
-    1:1:boolean isFineGrainedType():352 -> v
+    1:1:boolean isFineGrainedType():350 -> v
     2:2:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isByte():0:0 -> v
-    2:2:boolean isFineGrainedType():353 -> v
+    2:2:boolean isFineGrainedType():351 -> v
     3:3:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isShort():0:0 -> v
-    3:3:boolean isFineGrainedType():354 -> v
+    3:3:boolean isFineGrainedType():352 -> v
     4:4:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isChar():0:0 -> v
-    4:4:boolean isFineGrainedType():355 -> v
+    4:4:boolean isFineGrainedType():353 -> v
     boolean isInt() -> w
     boolean isNullType() -> x
     1:1:boolean isNullable():76:76 -> y
-    1:2:boolean isPreciseType():341:342 -> z
+    1:2:boolean isPreciseType():339:340 -> z
     3:3:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isNullType():0:0 -> z
-    3:3:boolean isPreciseType():343 -> z
+    3:3:boolean isPreciseType():341 -> z
     4:4:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> z
-    4:4:boolean isPreciseType():344 -> z
+    4:4:boolean isPreciseType():342 -> z
     5:5:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isFloat():0:0 -> z
-    5:5:boolean isPreciseType():345 -> z
+    5:5:boolean isPreciseType():343 -> z
     6:6:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isLong():0:0 -> z
-    6:6:boolean isPreciseType():346 -> z
+    6:6:boolean isPreciseType():344 -> z
     7:7:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDouble():0:0 -> z
-    7:7:boolean isPreciseType():347 -> z
+    7:7:boolean isPreciseType():345 -> z
     8:8:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> z
-    8:8:boolean isPreciseType():348 -> z
-com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeElement -> com.android.tools.r8.internal.jH:
+    8:8:boolean isPreciseType():346 -> z
+com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeElement -> com.android.tools.r8.internal.BG:
     com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeElement INSTANCE -> d
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():12:12 -> <init>
@@ -28641,20 +28593,20 @@
     int requiredRegisters() -> G
     1:1:com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeElement getInstance():16:16 -> H
     1:1:int hashCode():41:41 -> hashCode
-com.android.tools.r8.ir.analysis.value.AbstractValue -> com.android.tools.r8.internal.P0:
+com.android.tools.r8.ir.analysis.value.AbstractValue -> com.android.tools.r8.internal.O0:
     1:1:void <init>():11:11 -> <init>
     1:1:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isBottom():0:0 -> a
-    1:1:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue):108 -> a
-    2:5:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue):108:111 -> a
+    1:1:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue):100 -> a
+    2:5:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue):100:103 -> a
     6:6:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isBottom():0:0 -> a
-    6:6:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue):111 -> a
-    7:7:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue):114:114 -> a
+    6:6:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue):103 -> a
+    7:7:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue):106:106 -> a
     8:8:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isNull():32:32 -> a
-    8:8:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue):117 -> a
-    9:9:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue):118:118 -> a
+    8:8:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue):109 -> a
+    9:9:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue):110:110 -> a
     10:10:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isNull():32:32 -> a
-    10:10:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue):120 -> a
-    11:13:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue):121:123 -> a
+    10:10:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue):112 -> a
+    11:13:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue):113:115 -> a
     com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> b
     boolean isSingleValue() -> c
     com.android.tools.r8.ir.analysis.value.SingleValue asSingleValue() -> e
@@ -28670,17 +28622,16 @@
     boolean isSingleFieldValue() -> o
     boolean isSingleStringValue() -> p
     boolean isTrue() -> q
-com.android.tools.r8.ir.analysis.value.AbstractValueFactory -> com.android.tools.r8.internal.Q0:
+com.android.tools.r8.ir.analysis.value.AbstractValueFactory -> com.android.tools.r8.internal.P0:
     java.util.concurrent.ConcurrentHashMap singleStringValues -> c
     java.util.concurrent.ConcurrentHashMap singleNumberValues -> b
     java.util.concurrent.ConcurrentHashMap singleConstClassValues -> a
-    1:6:void <init>():14:19 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.value.SingleConstClassValue createSingleConstClassValue(com.android.tools.r8.graph.DexType):23:23 -> a
-    2:4:com.android.tools.r8.ir.analysis.value.SingleFieldValue createSingleFieldValue(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.value.ObjectState):27:29 -> a
-    5:5:com.android.tools.r8.ir.analysis.value.SingleNumberValue createSingleNumberValue(long):33:33 -> a
-    6:6:com.android.tools.r8.ir.analysis.value.SingleStringValue createSingleStringValue(com.android.tools.r8.graph.DexString):41:41 -> a
-    7:7:com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue createSingleDexItemBasedStringValue(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):46:46 -> a
-com.android.tools.r8.ir.analysis.value.BottomValue -> com.android.tools.r8.internal.j3:
+    1:6:void <init>():12:17 -> <init>
+    1:1:com.android.tools.r8.ir.analysis.value.SingleConstClassValue createSingleConstClassValue(com.android.tools.r8.graph.DexType):21:21 -> a
+    2:4:com.android.tools.r8.ir.analysis.value.SingleFieldValue createSingleFieldValue(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.value.ObjectState):25:27 -> a
+    5:5:com.android.tools.r8.ir.analysis.value.SingleNumberValue createSingleNumberValue(long):31:31 -> a
+    6:6:com.android.tools.r8.ir.analysis.value.SingleStringValue createSingleStringValue(com.android.tools.r8.graph.DexString):39:39 -> a
+com.android.tools.r8.ir.analysis.value.BottomValue -> com.android.tools.r8.internal.W2:
     com.android.tools.r8.ir.analysis.value.BottomValue INSTANCE -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
@@ -28688,45 +28639,42 @@
     1:1:int hashCode():43:43 -> hashCode
     boolean isNonTrivial() -> l
     1:1:com.android.tools.r8.ir.analysis.value.BottomValue getInstance():18:18 -> r
-com.android.tools.r8.ir.analysis.value.EmptyObjectState -> com.android.tools.r8.internal.Oa:
+com.android.tools.r8.ir.analysis.value.EmptyObjectState -> com.android.tools.r8.internal.ja:
     com.android.tools.r8.ir.analysis.value.EmptyObjectState INSTANCE -> a
-    1:1:void <clinit>():16:16 -> <clinit>
-    1:1:void <init>():18:18 -> <init>
-    void forEachAbstractFieldValue(java.util.function.BiConsumer) -> a
+    1:1:void <clinit>():14:14 -> <clinit>
+    1:1:void <init>():16:16 -> <init>
     com.android.tools.r8.ir.analysis.value.ObjectState rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> a
-    1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractFieldValue(com.android.tools.r8.graph.DexEncodedField):31:31 -> a
+    1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractFieldValue(com.android.tools.r8.graph.DexEncodedField):24:24 -> a
     boolean isEmpty() -> b
-    1:1:com.android.tools.r8.ir.analysis.value.EmptyObjectState getInstance():21:21 -> c
-    1:1:int hashCode():51:51 -> hashCode
-com.android.tools.r8.ir.analysis.value.EnumValuesObjectState -> com.android.tools.r8.internal.Ab:
+    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.Ua:
     com.android.tools.r8.ir.analysis.value.ObjectState[] state -> b
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():16:16 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.ir.analysis.value.ObjectState[]):20:23 -> <init>
+    1:1:void <clinit>():14:14 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.ir.analysis.value.ObjectState[]):18:21 -> <init>
     com.android.tools.r8.ir.analysis.value.EnumValuesObjectState asEnumValuesObjectState() -> a
-    void forEachAbstractFieldValue(java.util.function.BiConsumer) -> a
-    1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractFieldValue(com.android.tools.r8.graph.DexEncodedField):31:31 -> a
-    2:5:com.android.tools.r8.ir.analysis.value.ObjectState getObjectStateForOrdinal(int):35:38 -> a
-    6:6:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():23:23 -> a
-    6:6:com.android.tools.r8.ir.analysis.value.ObjectState getObjectStateForOrdinal(int):36 -> a
-    7:11:com.android.tools.r8.ir.analysis.value.ObjectState rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):63:67 -> a
+    1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractFieldValue(com.android.tools.r8.graph.DexEncodedField):26:26 -> a
+    2:5:com.android.tools.r8.ir.analysis.value.ObjectState getObjectStateForOrdinal(int):30:33 -> a
+    6:6:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():22:22 -> a
+    6:6:com.android.tools.r8.ir.analysis.value.ObjectState getObjectStateForOrdinal(int):31 -> a
+    7:11:com.android.tools.r8.ir.analysis.value.ObjectState rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):58:62 -> a
     boolean isEmpty() -> b
-    1:1:int getEnumValuesSize():42:42 -> c
-    1:9:boolean equals(java.lang.Object):72:80 -> equals
-    1:1:int hashCode():89:89 -> hashCode
-com.android.tools.r8.ir.analysis.value.NonEmptyObjectState -> com.android.tools.r8.internal.Gs:
+    1:1:int getEnumValuesSize():37:37 -> c
+    1:9:boolean equals(java.lang.Object):67:75 -> equals
+    1:1:int hashCode():84:84 -> hashCode
+com.android.tools.r8.ir.analysis.value.NonEmptyObjectState -> com.android.tools.r8.internal.Ar:
     java.util.Map state -> b
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():16:16 -> <clinit>
-    1:4:void <init>(java.util.Map):21:24 -> <init>
-    1:1:void forEachAbstractFieldValue(java.util.function.BiConsumer):29:29 -> a
-    2:2:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractFieldValue(com.android.tools.r8.graph.DexEncodedField):34:34 -> a
-    3:7:com.android.tools.r8.ir.analysis.value.ObjectState rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):44:48 -> a
-    8:8:void lambda$rewrittenWithLens$0(java.util.Map,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.value.AbstractValue):47:47 -> a
+    1:1:void <clinit>():15:15 -> <clinit>
+    1:4:void <init>(java.util.Map):20:23 -> <init>
+    1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractFieldValue(com.android.tools.r8.graph.DexEncodedField):28:28 -> a
+    2:6:com.android.tools.r8.ir.analysis.value.ObjectState rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):38:42 -> a
+    7:7:void lambda$rewrittenWithLens$0(java.util.Map,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.value.AbstractValue):41:41 -> a
     boolean isEmpty() -> b
-    1:11:boolean equals(java.lang.Object):53:63 -> equals
-    1:1:int hashCode():72:72 -> hashCode
-com.android.tools.r8.ir.analysis.value.NullOrAbstractValue -> com.android.tools.r8.internal.Rs:
+    1:11:boolean equals(java.lang.Object):47:57 -> equals
+    1:1:int hashCode():66:66 -> hashCode
+com.android.tools.r8.ir.analysis.value.NullOrAbstractValue -> com.android.tools.r8.internal.Lr:
     com.android.tools.r8.ir.analysis.value.AbstractValue value -> a
     1:2:void <init>(com.android.tools.r8.ir.analysis.value.AbstractValue):15:16 -> <init>
     1:1:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isBottom():0:0 -> b
@@ -28745,24 +28693,23 @@
     boolean isNonTrivial() -> l
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getNonNullValue():42:42 -> r
     1:1:java.lang.String toString():66:66 -> toString
-com.android.tools.r8.ir.analysis.value.ObjectState -> com.android.tools.r8.internal.iu:
-    1:1:void <init>():16:16 -> <init>
+com.android.tools.r8.ir.analysis.value.ObjectState -> com.android.tools.r8.internal.ft:
+    1:1:void <init>():15:15 -> <init>
     com.android.tools.r8.ir.analysis.value.EnumValuesObjectState asEnumValuesObjectState() -> a
-    void forEachAbstractFieldValue(java.util.function.BiConsumer) -> 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.hu:
+com.android.tools.r8.ir.analysis.value.ObjectState$Builder -> com.android.tools.r8.internal.et:
     java.util.Map state -> b
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():49:49 -> <clinit>
-    1:3:void <init>():49:51 -> <init>
-    1:3:void recordFieldHasValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.value.AbstractValue):54:56 -> a
-    4:4:com.android.tools.r8.ir.analysis.value.ObjectState build():61:61 -> a
-    5:5:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():23:23 -> a
-    5:5:com.android.tools.r8.ir.analysis.value.ObjectState build():61 -> a
-    6:6:com.android.tools.r8.ir.analysis.value.ObjectState build():61:61 -> a
-com.android.tools.r8.ir.analysis.value.SingleConstClassValue -> com.android.tools.r8.internal.ZB:
+    1:1:void <clinit>():46:46 -> <clinit>
+    1:3:void <init>():46:48 -> <init>
+    1:3:void recordFieldHasValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.value.AbstractValue):51:53 -> a
+    4:4:com.android.tools.r8.ir.analysis.value.ObjectState build():58:58 -> a
+    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.LA:
     com.android.tools.r8.graph.DexType type -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():26:26 -> <clinit>
@@ -28770,54 +28717,36 @@
     1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):26:26 -> a
     2:7: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):69:74 -> a
     8:12: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):72:76 -> a
-    13:13: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):400:400 -> a
+    13:13: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):398:398 -> a
     13:13: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):76 -> a
     14:16: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):76:78 -> a
     17:17:boolean com.android.tools.r8.ir.code.ConstClass.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):135:135 -> a
     17:17:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):590 -> a
     17:17: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
     18:18: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
-    19:23:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):85:89 -> a
+    19:21:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):85:87 -> a
+    22:22:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    22:22:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):87 -> a
+    23:23:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):89:89 -> a
     24:24: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
     24:24:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):90 -> a
     25:27:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):90:92 -> a
     28:30:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):98:100 -> a
-    31:31:boolean com.android.tools.r8.graph.DexClass.isPublic():630:630 -> a
-    31:31:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):101 -> a
-    32:34:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):101:103 -> a
-    35:35:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):109:109 -> a
+    31:31:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    31:31:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):100 -> a
+    32:32:boolean com.android.tools.r8.graph.DexClass.isPublic():612:612 -> a
+    32:32:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):101 -> a
+    33:35:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):101:103 -> a
+    36:36:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):109:109 -> a
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):26:26 -> b
     com.android.tools.r8.ir.analysis.value.SingleConstClassValue asSingleConstClassValue() -> g
     1:1:int hashCode():56:56 -> hashCode
     1:1:com.android.tools.r8.graph.DexType getType():46:46 -> r
     1:1:java.lang.String toString():61:61 -> toString
-com.android.tools.r8.ir.analysis.value.SingleConstValue -> com.android.tools.r8.internal.aC:
+com.android.tools.r8.ir.analysis.value.SingleConstValue -> com.android.tools.r8.internal.MA:
     1:1:void <init>():7:7 -> <init>
     boolean isSingleConstValue() -> n
-com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue -> com.android.tools.r8.internal.cC:
-    com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> c
-    boolean $assertionsDisabled -> a
-    com.android.tools.r8.graph.DexReference item -> b
-    1:1:void <clinit>():27:27 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):33:35 -> <init>
-    boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView) -> a
-    boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> a
-    1:6: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):72:77 -> a
-    7:17: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):75:85 -> a
-    18:19:com.android.tools.r8.ir.analysis.value.SingleValue com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue.rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):104:105 -> a
-    18:19:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):27 -> a
-    20:20:com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue com.android.tools.r8.ir.analysis.value.AbstractValueFactory.createSingleDexItemBasedStringValue(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):46:46 -> a
-    20:20:com.android.tools.r8.ir.analysis.value.SingleValue com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue.rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):105 -> a
-    20:20:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):27 -> a
-    1:2:com.android.tools.r8.ir.analysis.value.SingleValue com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue.rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):104:105 -> b
-    1:2:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):27 -> b
-    3:3:com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue com.android.tools.r8.ir.analysis.value.AbstractValueFactory.createSingleDexItemBasedStringValue(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):46:46 -> b
-    3:3:com.android.tools.r8.ir.analysis.value.SingleValue com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue.rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):105 -> b
-    3:3:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):27 -> b
-    1:5:boolean equals(java.lang.Object):50:54 -> equals
-    1:1:int hashCode():59:59 -> hashCode
-    1:1:java.lang.String toString():64:64 -> toString
-com.android.tools.r8.ir.analysis.value.SingleFieldValue -> com.android.tools.r8.internal.dC:
+com.android.tools.r8.ir.analysis.value.SingleFieldValue -> com.android.tools.r8.internal.OA:
     com.android.tools.r8.graph.DexField field -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():28:28 -> <clinit>
@@ -28825,9 +28754,15 @@
     1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):28:28 -> a
     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:18:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):90:100 -> a
-    19:19:boolean com.android.tools.r8.graph.DexClass.isPublic():630:630 -> a
-    19:19:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):103 -> a
+    8:10:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):90:92 -> a
+    11:11:boolean com.android.tools.r8.graph.DexEncodedField.isPublic():215:215 -> 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):273:273 -> 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():612:612 -> 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
     1:9:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):108:116 -> c
@@ -28836,7 +28771,7 @@
     boolean isSingleFieldValue() -> o
     1:1:com.android.tools.r8.graph.DexField getField():37:37 -> r
     com.android.tools.r8.ir.analysis.value.ObjectState getState() -> s
-com.android.tools.r8.ir.analysis.value.SingleNumberValue -> com.android.tools.r8.internal.eC:
+com.android.tools.r8.ir.analysis.value.SingleNumberValue -> com.android.tools.r8.internal.PA:
     long value -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():20:20 -> <clinit>
@@ -28850,14 +28785,15 @@
     1:1:int hashCode():86:86 -> hashCode
     com.android.tools.r8.ir.analysis.value.SingleNumberValue asSingleNumberValue() -> i
     1:1:boolean isFalse():36:36 -> k
-    1:1:boolean com.android.tools.r8.ir.analysis.value.SingleNumberValue.isFalse():36:36 -> m
-    1:1:boolean isSingleBoolean():31 -> m
+    1:1:boolean isSingleBoolean():31:31 -> m
+    2:2:boolean com.android.tools.r8.ir.analysis.value.SingleNumberValue.isTrue():41:41 -> m
+    2:2:boolean isSingleBoolean():31 -> m
     1:1:boolean isTrue():41:41 -> q
     1:2:boolean getBooleanValue():55:56 -> r
     1:1:int getIntValue():68:68 -> s
     1:1:long getValue():76:76 -> t
     1:1:java.lang.String toString():91:91 -> toString
-com.android.tools.r8.ir.analysis.value.SingleStatefulFieldValue -> com.android.tools.r8.internal.gC:
+com.android.tools.r8.ir.analysis.value.SingleStatefulFieldValue -> com.android.tools.r8.internal.RA:
     boolean $assertionsDisabled -> c
     com.android.tools.r8.ir.analysis.value.ObjectState state -> d
     1:1:void <clinit>():10:10 -> <clinit>
@@ -28866,14 +28802,14 @@
     1:1:int hashCode():42:42 -> hashCode
     1:1:com.android.tools.r8.ir.analysis.value.ObjectState getState():23:23 -> s
     1:1:java.lang.String toString():28:28 -> toString
-com.android.tools.r8.ir.analysis.value.SingleStatelessFieldValue -> com.android.tools.r8.internal.hC:
+com.android.tools.r8.ir.analysis.value.SingleStatelessFieldValue -> com.android.tools.r8.internal.SA:
     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():23:23 -> s
+    1:1:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():22:22 -> s
     1:1:com.android.tools.r8.ir.analysis.value.ObjectState getState():18 -> s
     1:1:java.lang.String toString():23:23 -> toString
-com.android.tools.r8.ir.analysis.value.SingleStringValue -> com.android.tools.r8.internal.iC:
+com.android.tools.r8.ir.analysis.value.SingleStringValue -> com.android.tools.r8.internal.TA:
     com.android.tools.r8.graph.DexString string -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():25:25 -> <clinit>
@@ -28890,7 +28826,7 @@
     1:1:com.android.tools.r8.graph.DexString getDexString():45:45 -> r
     com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> s
     1:1:java.lang.String toString():60:60 -> toString
-com.android.tools.r8.ir.analysis.value.SingleValue -> com.android.tools.r8.internal.kC:
+com.android.tools.r8.ir.analysis.value.SingleValue -> com.android.tools.r8.internal.VA:
     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
@@ -28898,7 +28834,7 @@
     boolean isSingleValue() -> c
     com.android.tools.r8.ir.analysis.value.SingleValue asSingleValue() -> e
     boolean isNonTrivial() -> l
-com.android.tools.r8.ir.analysis.value.UnknownValue -> com.android.tools.r8.internal.XF:
+com.android.tools.r8.ir.analysis.value.UnknownValue -> com.android.tools.r8.internal.nF:
     com.android.tools.r8.ir.analysis.value.UnknownValue INSTANCE -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
@@ -28906,10 +28842,10 @@
     1:1:int hashCode():43:43 -> hashCode
     boolean isNonTrivial() -> l
     1:1:com.android.tools.r8.ir.analysis.value.UnknownValue getInstance():18:18 -> r
-com.android.tools.r8.ir.code.Add -> com.android.tools.r8.internal.T0:
+com.android.tools.r8.ir.code.Add -> com.android.tools.r8.internal.S0:
     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>
-    boolean isAdd() -> W0
-    int opcode() -> Y1
+    boolean isAdd() -> V0
+    int opcode() -> X1
     double foldDouble(double,double) -> a
     float foldFloat(float,float) -> a
     int foldIntegers(int,int) -> a
@@ -28921,22 +28857,22 @@
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):92:92 -> b
     1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):42:42 -> c
     2:2:com.android.tools.r8.code.Instruction CreateFloat2Addr(int,int):72:72 -> c
+    boolean isCommutative() -> c2
     1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):62:62 -> d
     2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):87:87 -> d
-    boolean isCommutative() -> d2
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):67:67 -> e
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):82:82 -> e
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):47:47 -> f
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():127:127 -> h2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():127:127 -> g2
     com.android.tools.r8.ir.code.Add asAdd() -> i
-com.android.tools.r8.ir.code.AliasedValueConfiguration -> com.android.tools.r8.internal.U0:
+com.android.tools.r8.ir.code.AliasedValueConfiguration -> com.android.tools.r8.internal.T0:
     com.android.tools.r8.ir.code.Value getAliasForOutValue(com.android.tools.r8.ir.code.Instruction) -> a
     boolean isIntroducingAnAlias(com.android.tools.r8.ir.code.Instruction) -> b
-com.android.tools.r8.ir.code.AlwaysMaterializingDefinition -> com.android.tools.r8.internal.W0:
+com.android.tools.r8.ir.code.AlwaysMaterializingDefinition -> com.android.tools.r8.internal.V0:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):19:19 -> <init>
-    1:1:int maxInValueRegister():57:57 -> W1
-    int maxOutValueRegister() -> X1
-    int opcode() -> Y1
+    1:1:int maxInValueRegister():57:57 -> V1
+    int maxOutValueRegister() -> W1
+    int opcode() -> X1
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):29:29 -> a
     2:2:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):35:35 -> a
     3:5:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):40:42 -> a
@@ -28944,12 +28880,12 @@
     7:7:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):47:47 -> a
     8:8:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):67:67 -> a
     boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction) -> b
-com.android.tools.r8.ir.code.AlwaysMaterializingNop -> com.android.tools.r8.internal.X0:
+com.android.tools.r8.ir.code.AlwaysMaterializingNop -> com.android.tools.r8.internal.W0:
     1:1:void <init>():20:20 -> <init>
     boolean hasInvariantOutType() -> N0
-    1:1:int maxInValueRegister():55:55 -> W1
-    1:1:int maxOutValueRegister():60:60 -> X1
-    int opcode() -> Y1
+    1:1:int maxInValueRegister():55:55 -> V1
+    1:1:int maxOutValueRegister():60:60 -> W1
+    int opcode() -> X1
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):30:30 -> a
     2:2:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):35:35 -> a
@@ -28958,14 +28894,14 @@
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):66:66 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):50:50 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-com.android.tools.r8.ir.code.AlwaysMaterializingUser -> com.android.tools.r8.internal.Y0:
+com.android.tools.r8.ir.code.AlwaysMaterializingUser -> com.android.tools.r8.internal.X0:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value):19:19 -> <init>
     boolean hasInvariantOutType() -> N0
-    1:2:int maxInValueRegister():55:56 -> W1
-    1:1:int maxOutValueRegister():61:61 -> X1
-    int opcode() -> Y1
+    1:2:int maxInValueRegister():55:56 -> V1
+    1:1:int maxOutValueRegister():61:61 -> W1
+    int opcode() -> X1
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):29:29 -> a
     2:2:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):35:35 -> a
     3:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):40:40 -> a
@@ -28976,9 +28912,9 @@
     7:7:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):72:72 -> a
     boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction) -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-com.android.tools.r8.ir.code.And -> com.android.tools.r8.internal.a1:
+com.android.tools.r8.ir.code.And -> com.android.tools.r8.internal.Z0:
     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):19:19 -> <init>
-    int opcode() -> Y1
+    int opcode() -> X1
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):29:29 -> a
@@ -28992,21 +28928,21 @@
     5:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):79:79 -> b
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):64:64 -> c
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):69:69 -> c
+    boolean isCommutative() -> c2
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):54:54 -> d
-    boolean isCommutative() -> d2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():94:94 -> h2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():94:94 -> g2
     com.android.tools.r8.ir.code.And asAnd() -> j
-com.android.tools.r8.ir.code.Argument -> com.android.tools.r8.internal.m1:
+com.android.tools.r8.ir.code.Argument -> com.android.tools.r8.internal.l1:
     boolean knownToBeBoolean -> j
     int index -> i
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():24:24 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,int,boolean):30:32 -> <init>
     boolean hasInvariantOutType() -> N0
-    1:1:int maxInValueRegister():75:75 -> W1
-    int maxOutValueRegister() -> X1
-    boolean isArgument() -> Y0
-    int opcode() -> Y1
+    1:1:int maxInValueRegister():75:75 -> V1
+    int maxOutValueRegister() -> W1
+    boolean isArgument() -> X0
+    int opcode() -> X1
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):62:62 -> a
     2:2:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):70:70 -> a
@@ -29019,17 +28955,17 @@
     8:8:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):127:127 -> a
     9:9:boolean outTypeKnownToBeBoolean(java.util.Set):137:137 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):91:91 -> b
-    1:1:int getIndex():36:36 -> c2
-    2:7:boolean com.android.tools.r8.ir.code.Argument.verifyIndex():42:47 -> c2
-    2:7:int getIndex():36 -> c2
-    8:9:int getIndex():36:37 -> c2
+    1:1:int getIndex():36:36 -> b2
+    2:7:boolean com.android.tools.r8.ir.code.Argument.verifyIndex():42:47 -> b2
+    2:7:int getIndex():36 -> b2
+    8:9:int getIndex():36:37 -> b2
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     com.android.tools.r8.ir.code.Argument asArgument() -> k
-com.android.tools.r8.ir.code.ArithmeticBinop -> com.android.tools.r8.internal.q1:
+com.android.tools.r8.ir.code.ArithmeticBinop -> com.android.tools.r8.internal.p1:
     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>
-    boolean isArithmeticBinop() -> Z0
+    boolean isArithmeticBinop() -> Y0
     com.android.tools.r8.code.Instruction CreateDouble(int,int,int) -> a
     1:25:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:89 -> a
     26:26:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):86:86 -> a
@@ -29064,29 +29000,29 @@
     com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int) -> e
     com.android.tools.r8.code.Instruction CreateLong2Addr(int,int) -> e
     com.android.tools.r8.code.Instruction CreateLong(int,int,int) -> f
-    com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode() -> h2
+    com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode() -> g2
     com.android.tools.r8.ir.code.ArithmeticBinop asArithmeticBinop() -> l
-com.android.tools.r8.ir.code.ArithmeticBinop$1 -> com.android.tools.r8.internal.p1:
+com.android.tools.r8.ir.code.ArithmeticBinop$1 -> com.android.tools.r8.internal.o1:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():75:75 -> <clinit>
-com.android.tools.r8.ir.code.ArrayAccess -> com.android.tools.r8.internal.r1:
+com.android.tools.r8.ir.code.ArrayAccess -> com.android.tools.r8.internal.q1:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,java.util.List):16:16 -> <init>
+    boolean isArrayAccess() -> Z0
     com.android.tools.r8.ir.code.ArrayAccess withMemberType(com.android.tools.r8.ir.code.MemberType) -> a
-    boolean isArrayAccess() -> a1
-    1:1:com.android.tools.r8.ir.code.Value array():20:20 -> c2
-    1:1:com.android.tools.r8.ir.code.Value index():24:24 -> d2
+    1:1:com.android.tools.r8.ir.code.Value array():20:20 -> b2
+    1:1:com.android.tools.r8.ir.code.Value index():24:24 -> c2
     com.android.tools.r8.ir.code.ArrayAccess asArrayAccess() -> m
-com.android.tools.r8.ir.code.ArrayGet -> com.android.tools.r8.internal.v1:
+com.android.tools.r8.ir.code.ArrayGet -> com.android.tools.r8.internal.u1:
     com.android.tools.r8.ir.code.MemberType type -> i
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():34:34 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):39:40 -> <init>
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():252:252 -> G0
     boolean hasInvariantOutType() -> N0
-    boolean instructionTypeCanThrow() -> V0
-    int maxInValueRegister() -> W1
-    int maxOutValueRegister() -> X1
-    int opcode() -> Y1
+    boolean instructionTypeCanThrow() -> U0
+    int maxInValueRegister() -> V1
+    int maxOutValueRegister() -> W1
+    int opcode() -> X1
     boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator) -> a
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):50:50 -> a
     2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.ArrayGet.dest():54:54 -> a
@@ -29152,21 +29088,21 @@
     203:203:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):263 -> a
     204:204:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):263:263 -> a
     205:205:com.android.tools.r8.ir.code.ArrayAccess withMemberType(com.android.tools.r8.ir.code.MemberType):273:273 -> a
+    boolean isArrayGet() -> a1
+    boolean throwsOnNullInput() -> a2
     1:1:com.android.tools.r8.ir.code.MemberType getMemberType():59:59 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):124:124 -> b
     3:3:void lambda$constrainType$0(com.android.tools.r8.ir.code.MemberType):263:263 -> b
-    boolean isArrayGet() -> b1
-    boolean throwsOnNullInput() -> b2
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     com.android.tools.r8.ir.code.ArrayGet asArrayGet() -> n
-com.android.tools.r8.ir.code.ArrayLength -> com.android.tools.r8.internal.w1:
+com.android.tools.r8.ir.code.ArrayLength -> com.android.tools.r8.internal.v1:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):22:22 -> <init>
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():144:144 -> G0
     boolean hasInvariantOutType() -> N0
-    boolean instructionTypeCanThrow() -> V0
-    int maxInValueRegister() -> W1
-    int maxOutValueRegister() -> X1
-    int opcode() -> Y1
+    boolean instructionTypeCanThrow() -> U0
+    int maxInValueRegister() -> V1
+    int maxOutValueRegister() -> W1
+    int opcode() -> X1
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):32:32 -> a
     2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.ArrayLength.dest():36:36 -> a
     2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55 -> a
@@ -29181,29 +29117,29 @@
     19:19:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):119:119 -> a
     20:20:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):124:124 -> a
     21:21:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):134:134 -> a
+    boolean throwsOnNullInput() -> a2
     1:1:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):77:77 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):102:102 -> b
     3:3:boolean com.android.tools.r8.ir.code.Instruction.isArrayLength():0:0 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):102 -> b
-    boolean throwsOnNullInput() -> b2
-    1:1:com.android.tools.r8.ir.code.Value array():40:40 -> c2
+    1:1:com.android.tools.r8.ir.code.Value array():40:40 -> b2
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     com.android.tools.r8.ir.code.ArrayLength asArrayLength() -> o
-com.android.tools.r8.ir.code.ArrayPut -> com.android.tools.r8.internal.y1:
+com.android.tools.r8.ir.code.ArrayPut -> com.android.tools.r8.internal.x1:
     com.android.tools.r8.ir.code.MemberType type -> i
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():29:29 -> <clinit>
     1:5:void <init>(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):37:41 -> <init>
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():249:249 -> G0
     boolean hasInvariantOutType() -> N0
-    1:1:boolean instructionInstanceCanThrow():124:124 -> T0
-    2:2:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> T0
-    2:2:boolean instructionInstanceCanThrow():124 -> T0
-    3:6:boolean instructionInstanceCanThrow():125:128 -> T0
-    boolean instructionTypeCanThrow() -> V0
-    int maxInValueRegister() -> W1
-    1:1:int maxOutValueRegister():113:113 -> X1
-    int opcode() -> Y1
+    1:1:boolean instructionInstanceCanThrow():124:124 -> S0
+    2:2:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> S0
+    2:2:boolean instructionInstanceCanThrow():124 -> S0
+    3:6:boolean instructionInstanceCanThrow():125:128 -> S0
+    boolean instructionTypeCanThrow() -> U0
+    int maxInValueRegister() -> V1
+    1:1:int maxOutValueRegister():113:113 -> W1
+    int opcode() -> X1
     boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator) -> a
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):51:51 -> a
     2:38:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:101 -> a
@@ -29227,15 +29163,15 @@
     134:134:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):239:239 -> a
     135:135:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):254:254 -> a
     136:136:com.android.tools.r8.ir.code.ArrayAccess withMemberType(com.android.tools.r8.ir.code.MemberType):264:264 -> a
+    boolean throwsOnNullInput() -> a2
     1:1:com.android.tools.r8.ir.code.MemberType getMemberType():60:60 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):203:203 -> b
     3:3:void lambda$constrainType$0(com.android.tools.r8.ir.code.MemberType):254:254 -> b
-    boolean throwsOnNullInput() -> b2
-    boolean isArrayPut() -> c1
+    boolean isArrayPut() -> b1
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-    1:1:com.android.tools.r8.ir.code.Value value():55:55 -> e2
+    1:1:com.android.tools.r8.ir.code.Value value():55:55 -> d2
     com.android.tools.r8.ir.code.ArrayPut asArrayPut() -> p
-com.android.tools.r8.ir.code.Assume -> com.android.tools.r8.internal.M1:
+com.android.tools.r8.ir.code.Assume -> com.android.tools.r8.internal.K1:
     com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption dynamicTypeAssumption -> i
     boolean $assertionsDisabled -> h
     com.android.tools.r8.ir.code.Instruction origin -> k
@@ -29244,9 +29180,9 @@
     1:10:void <init>(com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption,com.android.tools.r8.ir.code.Assume$NonNullAssumption,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):38:47 -> <init>
     java.lang.String getInstructionName() -> F0
     boolean hasInvariantOutType() -> N0
-    1:1:int maxInValueRegister():184:184 -> W1
-    1:1:int maxOutValueRegister():189:189 -> X1
-    int opcode() -> Y1
+    1:1:int maxInValueRegister():184:184 -> V1
+    1:1:int maxOutValueRegister():189:189 -> W1
+    int opcode() -> X1
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):85:85 -> a
     2:2:boolean outTypeKnownToBeBoolean(java.util.Set):106:106 -> a
     3:20:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):138:155 -> a
@@ -29265,16 +29201,16 @@
     4:4:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> b
     4:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):199 -> b
     5:7:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):202:204 -> b
-    1:1:com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption getDynamicTypeAssumption():89:89 -> c2
+    1:1:com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption getDynamicTypeAssumption():89:89 -> b2
+    1:1:boolean hasDynamicTypeAssumption():125:125 -> c2
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-    1:1:boolean hasDynamicTypeAssumption():125:125 -> d2
-    1:1:boolean hasNonNullAssumption():133:133 -> e2
-    1:1:com.android.tools.r8.ir.code.Instruction origin():101:101 -> f2
-    1:1:com.android.tools.r8.ir.code.Value src():97:97 -> g2
-    1:1:void unsetDynamicTypeAssumption():129:129 -> h2
+    1:1:boolean hasNonNullAssumption():133:133 -> d2
+    1:1:com.android.tools.r8.ir.code.Instruction origin():101:101 -> e2
+    1:1:com.android.tools.r8.ir.code.Value src():97:97 -> f2
+    1:1:void unsetDynamicTypeAssumption():129:129 -> g2
     com.android.tools.r8.ir.code.Assume asAssume() -> q
     1:15:java.lang.String toString():267:281 -> toString
-com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption -> com.android.tools.r8.internal.M1$a:
+com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption -> com.android.tools.r8.internal.K1$a:
     com.android.tools.r8.ir.analysis.type.ClassTypeElement dynamicLowerBoundType -> c
     com.android.tools.r8.ir.analysis.type.TypeElement dynamicUpperBoundType -> b
     boolean $assertionsDisabled -> a
@@ -29287,14 +29223,14 @@
     2:2:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType():296:296 -> b
     1:5:boolean equals(java.lang.Object):313:317 -> equals
     1:1:int hashCode():323:323 -> hashCode
-com.android.tools.r8.ir.code.Assume$NonNullAssumption -> com.android.tools.r8.internal.M1$b:
+com.android.tools.r8.ir.code.Assume$NonNullAssumption -> com.android.tools.r8.internal.K1$b:
     com.android.tools.r8.ir.code.Assume$NonNullAssumption instance -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():327:329 -> <clinit>
     1:1:void <init>():331:331 -> <init>
     1:1:com.android.tools.r8.ir.code.Assume$NonNullAssumption get():334:334 -> a
     2:2:boolean verifyCorrectnessOfValues(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):338:338 -> a
-com.android.tools.r8.ir.code.AssumeAndCheckCastAliasedValueConfiguration -> com.android.tools.r8.internal.N1:
+com.android.tools.r8.ir.code.AssumeAndCheckCastAliasedValueConfiguration -> com.android.tools.r8.internal.L1:
     com.android.tools.r8.ir.code.AssumeAndCheckCastAliasedValueConfiguration INSTANCE -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():9:11 -> <clinit>
@@ -29314,7 +29250,7 @@
     2:2:boolean isIntroducingAnAlias(com.android.tools.r8.ir.code.Instruction):22 -> b
     3:3:boolean com.android.tools.r8.ir.code.Instruction.isCheckCast():0:0 -> b
     3:3:boolean isIntroducingAnAlias(com.android.tools.r8.ir.code.Instruction):22 -> b
-com.android.tools.r8.ir.code.BasicBlock -> com.android.tools.r8.internal.d2:
+com.android.tools.r8.ir.code.BasicBlock -> com.android.tools.r8.internal.Y1:
     int unfilledPredecessorsCount -> n
     int color -> o
     int estimatedPredecessorsCount -> m
@@ -29370,13 +29306,13 @@
     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):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):126:127 -> a
+    60:61:boolean com.android.tools.r8.utils.ListUtils.verifyListIsOrdered(java.util.List):88:89 -> 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):127 -> a
+    62:63:boolean com.android.tools.r8.utils.ListUtils.verifyListIsOrdered(java.util.List):89 -> 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):127:127 -> a
+    64:64:boolean com.android.tools.r8.utils.ListUtils.verifyListIsOrdered(java.util.List):89:89 -> 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
@@ -29436,7 +29372,7 @@
     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():1159:1159 -> a
+    334:334:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1154:1154 -> 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
@@ -29458,7 +29394,7 @@
     384: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:402:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1776:1793 -> a
     385:402: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
-    403:403:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1159:1159 -> a
+    403:403:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1154:1154 -> a
     403:403:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1794 -> a
     403: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:410:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1794:1800 -> a
@@ -29478,9 +29414,14 @@
     424:424:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
     424:424:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):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:462:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1790:1827 -> a
-    425: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
+    425:459:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1790:1824 -> a
+    425:459: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
+    460:460:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):143:143 -> a
+    460:460:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1826 -> a
+    460: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.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1827:1827 -> 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:535: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
@@ -29589,25 +29530,26 @@
     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.d2$a:
+com.android.tools.r8.ir.code.BasicBlock$1 -> com.android.tools.r8.internal.Y1$a:
     com.android.tools.r8.ir.code.Instruction next -> b
     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):635:638 -> <init>
-    1:3:com.android.tools.r8.ir.code.Instruction advance():641:643 -> f
+    1:3:com.android.tools.r8.ir.code.Instruction advance():641:643 -> e
     1:1:boolean hasNext():652:652 -> hasNext
     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.d2$b:
-com.android.tools.r8.ir.code.BasicBlock$EdgeType -> com.android.tools.r8.internal.d2$c:
+com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener -> com.android.tools.r8.internal.Y1$b:
+com.android.tools.r8.ir.code.BasicBlock$EdgeType -> com.android.tools.r8.internal.Y1$c:
     com.android.tools.r8.ir.code.BasicBlock$EdgeType NORMAL -> b
     com.android.tools.r8.ir.code.BasicBlock$EdgeType EXCEPTIONAL -> c
     com.android.tools.r8.ir.code.BasicBlock$EdgeType NON_EDGE -> a
     1:3:void <clinit>():115:117 -> <clinit>
     1:1:void <init>(java.lang.String,int):114:114 -> <init>
-com.android.tools.r8.ir.code.BasicBlock$PhiEquivalence -> com.android.tools.r8.internal.d2$d:
+com.android.tools.r8.ir.code.BasicBlock$PhiEquivalence -> com.android.tools.r8.internal.Y1$d:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():1946:1946 -> <clinit>
     1:1:void <init>():1946:1946 -> <init>
@@ -29618,13 +29560,13 @@
     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.d2$e:
+com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo -> com.android.tools.r8.internal.Y1$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: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.f2:
+com.android.tools.r8.ir.code.BasicBlockInstructionIterator -> com.android.tools.r8.internal.a2:
     java.util.ListIterator instructionIterator -> a
     1:2:void <init>(com.android.tools.r8.ir.code.BasicBlock):13:14 -> <init>
     3:4:void <init>(com.android.tools.r8.ir.code.BasicBlock,int):17:18 -> <init>
@@ -29635,7 +29577,7 @@
     1:1:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlockInstructionIterator.next():43:43 -> next
     1:1:java.lang.Object next():9 -> next
     1:1:com.android.tools.r8.ir.code.Instruction previous():33:33 -> previous
-com.android.tools.r8.ir.code.BasicBlockInstructionListIterator -> com.android.tools.r8.internal.g2:
+com.android.tools.r8.ir.code.BasicBlockInstructionListIterator -> com.android.tools.r8.internal.b2:
     java.util.ListIterator listIterator -> c
     com.android.tools.r8.ir.code.Instruction current -> d
     boolean $assertionsDisabled -> a
@@ -29655,137 +29597,140 @@
     13:13:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):224:224 -> a
     14:14:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():102:102 -> a
     14:14:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):227 -> a
-    15:34:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):227:246 -> a
-    35:35:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):225:225 -> a
-    36:36: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):269:269 -> a
-    37:38: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):1150:1151 -> a
-    37:38: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):1145 -> a
-    37:38: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):269 -> a
-    39:39: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):272:272 -> a
-    40:43: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):271:274 -> a
-    44:52:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):280:288 -> a
-    53:53:boolean com.android.tools.r8.graph.DexMethod.isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):266:266 -> a
+    15:33:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):227:245 -> a
+    34:34:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):225:225 -> a
+    35:35: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):268:268 -> a
+    36:37: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):1145:1146 -> a
+    36:37: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):1140 -> a
+    36:37: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):268 -> a
+    38:38: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):271:271 -> a
+    39:42: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):270:273 -> a
+    43:51:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):279:287 -> a
+    52:52:boolean com.android.tools.r8.graph.DexMethod.isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):261:261 -> a
+    52:52:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):288 -> a
+    53:53:boolean com.android.tools.r8.graph.DexMethod.mustBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):265:265 -> a
     53:53:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):289 -> a
-    54:54:boolean com.android.tools.r8.graph.DexMethod.mustBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):270:270 -> a
-    54:54:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):290 -> a
-    55:73:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):294:312 -> a
-    74:74:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
-    74:74:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):314 -> a
-    75:96:boolean replaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):321:342 -> a
-    97:97:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
-    97:97:boolean replaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):342 -> a
-    98:102: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):350:354 -> a
-    103:103: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):400:400 -> a
-    103:103: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):354 -> a
-    104:105: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):355:356 -> a
-    106:106:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
-    106:106: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):357 -> a
-    107:107: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):351:351 -> a
-    108:112:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):362:366 -> a
-    113:113:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> a
-    113:113:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):366 -> a
-    114:117:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):366:369 -> a
-    118:118:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
-    118:118:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):370 -> a
-    119:119:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):363:363 -> a
-    120:128:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):388:396 -> a
-    129:129:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
-    129:129:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):397 -> a
-    130:131:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):400:401 -> a
-    132:132:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):389:389 -> a
-    133:161:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):413:441 -> a
-    162:162:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):440:440 -> a
-    163:172:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):439:448 -> a
-    173:173:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():72:72 -> a
-    173:173:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):449 -> a
-    174:188:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):451:465 -> a
-    189:189:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):414:414 -> a
-    190:210:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):475:495 -> a
-    211:211:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasNext():67:67 -> a
-    211:211:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):500 -> a
-    212:218:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):500:506 -> a
-    219:219:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):505:505 -> a
-    220:279:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):504:563 -> a
-    280:280:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):476:476 -> a
-    281:290: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):547:556 -> a
-    291:292:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):571:572 -> a
-    293:293:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasNext():67:67 -> a
-    293:293:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):575 -> a
-    294:297:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):575:578 -> a
-    298:298:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1559:1559 -> a
-    298:298:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):578 -> a
-    299:299:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):582:582 -> a
-    300:300:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1159:1159 -> a
-    300:300:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):582 -> a
-    301:304:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):582:585 -> a
-    305:306:void com.android.tools.r8.ir.code.Goto.<init>(com.android.tools.r8.ir.code.BasicBlock):21:22 -> a
-    305:306:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):585 -> a
-    307:325:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):586:604 -> a
-    326:333:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):613:620 -> a
-    334:337:com.android.tools.r8.ir.code.BasicBlock splitCopyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):628:631 -> a
-    338:370: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):657:689 -> a
-    371:376:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):727:732 -> a
-    377:384: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):743:750 -> a
-    385:387: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):749:751 -> a
-    388:390:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.canThrow(com.android.tools.r8.ir.code.IRCode):637:639 -> a
-    388:390: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):753 -> a
-    391:407: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):757:773 -> a
-    408:408:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():102:102 -> a
-    408:408: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):774 -> a
-    409:416: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):774:781 -> a
-    417:417:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():102:102 -> a
-    417:417: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):784 -> a
-    418:454: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):784:820 -> a
-    455:455:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():102:102 -> a
-    455:455: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):824 -> a
-    456:460: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):824:828 -> a
-    461:461:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():102:102 -> a
-    461:461: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):829 -> a
-    462:469: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):829:836 -> a
-    470:470:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    470:470: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):836 -> a
-    471:490: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):836:855 -> a
-    491:491:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    491:491: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):855 -> a
-    492:492: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):858:858 -> a
-    493:493:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    493:493: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):857 -> a
-    494:527: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):856:889 -> a
-    528:528:com.android.tools.r8.ir.code.BasicBlockIterator com.android.tools.r8.ir.code.IRCode.listIterator(int):1048:1048 -> a
-    528:528: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):889 -> a
-    529:535: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):892:898 -> a
-    536:536:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1159:1159 -> a
-    536:536: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):899 -> a
-    537:542: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):899:904 -> a
-    543:559: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):704:720 -> a
-    543:559: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):905 -> a
-    560:565: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):912:917 -> a
-    566:566:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    566:566: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):917 -> a
-    567:577: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):917:927 -> a
-    578:582: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):926:930 -> a
-    583:589:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):936:942 -> a
-    590:590:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1159:1159 -> a
-    590:590:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):943 -> a
-    591:616:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):943:968 -> a
-    617:617:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    617:617:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):968 -> a
-    618:635:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):968:985 -> a
-    636:636:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createNumberConstant(long,com.android.tools.r8.ir.analysis.type.TypeElement):1117:1117 -> a
-    636:636: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):252 -> a
-    637:640: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):254:257 -> a
-    641:641:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1559:1559 -> a
-    641:641: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):257 -> a
-    642:647: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):259:264 -> a
+    54:72:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):293:311 -> a
+    73:73:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
+    73:73:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):313 -> a
+    74:89:boolean replaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):320:335 -> a
+    90:90:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    90:90:boolean replaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):338 -> a
+    91:94:boolean replaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):338:341 -> a
+    95:95:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
+    95:95:boolean replaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):341 -> a
+    96:100: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):349:353 -> a
+    101:101: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):398:398 -> a
+    101:101: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):353 -> a
+    102:103: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):354:355 -> a
+    104:104:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
+    104:104: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):356 -> a
+    105:105: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):350:350 -> a
+    106:110:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):361:365 -> a
+    111:111:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> a
+    111:111:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):365 -> a
+    112:115:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):365:368 -> a
+    116:116:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
+    116:116:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):369 -> a
+    117:117:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):362:362 -> a
+    118:126:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):387:395 -> a
+    127:127:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
+    127:127:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):396 -> a
+    128:129:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):399:400 -> a
+    130:130:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):388:388 -> a
+    131:151:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):411:431 -> a
+    152:152:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasNext():67:67 -> a
+    152:152:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):436 -> a
+    153:159:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):436:442 -> a
+    160:160:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):441:441 -> a
+    161:184:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):440:463 -> a
+    185:185:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasInsertionPosition():99:99 -> a
+    185:185:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):464 -> a
+    186:220:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):465:499 -> a
+    221:221:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):412:412 -> a
+    222:231: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):483:492 -> a
+    232:233:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):507:508 -> a
+    234:234:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasNext():67:67 -> a
+    234:234:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):511 -> a
+    235:238:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):511:514 -> a
+    239:239:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1559:1559 -> a
+    239:239:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):514 -> a
+    240:240:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):518:518 -> a
+    241:241:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1154:1154 -> a
+    241:241:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):518 -> a
+    242:245:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):518:521 -> a
+    246:247:void com.android.tools.r8.ir.code.Goto.<init>(com.android.tools.r8.ir.code.BasicBlock):21:22 -> a
+    246:247:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):521 -> a
+    248:266:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):522:540 -> a
+    267:274:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):549:556 -> a
+    275:278:com.android.tools.r8.ir.code.BasicBlock splitCopyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):564:567 -> a
+    279:311: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):592:624 -> a
+    312:317:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):662:667 -> a
+    318: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):678:685 -> a
+    326:328: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):684:686 -> a
+    329:331:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.canThrow(com.android.tools.r8.ir.code.IRCode):572:574 -> a
+    329:331: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):688 -> a
+    332:348: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:708 -> a
+    349:349:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():102:102 -> a
+    349:349: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):709 -> a
+    350: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):709:716 -> a
+    358:358:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():102:102 -> a
+    358:358: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):719 -> a
+    359:395: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):719:755 -> a
+    396:396:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():102:102 -> a
+    396:396: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):759 -> a
+    397:401: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):759:763 -> a
+    402:402:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():102:102 -> a
+    402:402: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):764 -> a
+    403:410: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):764:771 -> a
+    411:411:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
+    411:411: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):771 -> a
+    412:431: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):771:790 -> a
+    432:432:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
+    432:432: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):790 -> a
+    433:433: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):793:793 -> a
+    434:434:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
+    434:434: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):792 -> a
+    435:468: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):791:824 -> a
+    469:469:com.android.tools.r8.ir.code.BasicBlockIterator com.android.tools.r8.ir.code.IRCode.listIterator(int):1043:1043 -> a
+    469:469: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):824 -> a
+    470:476: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):827:833 -> a
+    477:477:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1154:1154 -> a
+    477:477: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):834 -> a
+    478:483: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):834:839 -> a
+    484:500: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):639:655 -> a
+    484:500: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):840 -> a
+    501:506: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):847:852 -> a
+    507:507:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
+    507:507: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):852 -> a
+    508:518: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):852:862 -> a
+    519:523: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):861:865 -> a
+    524:530:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):871:877 -> a
+    531:531:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1154:1154 -> a
+    531:531:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):878 -> a
+    532:553:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):878:899 -> a
+    554:554:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):143:143 -> a
+    554:554:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):902 -> a
+    555:555:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):903:903 -> a
+    556:556:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
+    556:556:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):903 -> a
+    557:574:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):903:920 -> a
+    575:575:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createNumberConstant(long,com.android.tools.r8.ir.analysis.type.TypeElement):1112:1112 -> a
+    575:575: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):251 -> a
+    576:576:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasInsertionPosition():99:99 -> a
+    576:576: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):253 -> a
+    577:578: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):255:256 -> a
+    579:579:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1559:1559 -> a
+    579:579: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):256 -> a
+    580:585: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):258:263 -> a
     1:1:void add(java.lang.Object):38:38 -> add
-    1:6:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):376:381 -> b
-    7:8: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):1150:1151 -> b
-    7:8:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):381 -> b
+    1:6:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):375:380 -> b
+    7:8: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):1145:1146 -> b
+    7:8:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):380 -> b
     9:9:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> b
-    9:9:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):382 -> b
-    10:10:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):377:377 -> b
+    9:9:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):381 -> b
+    10:10:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):376:376 -> b
     1:7:void add(com.android.tools.r8.ir.code.Instruction):122:128 -> c
-    1:1:boolean hasInsertionPosition():99:99 -> f
     1:1:boolean hasNext():67:67 -> hasNext
     1:1:boolean hasPrevious():83:83 -> hasPrevious
     1:1:void unsetInsertionPosition():109:109 -> i
@@ -29812,7 +29757,7 @@
     1:1:void set(java.lang.Object):38:38 -> set
     2:5:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.set(com.android.tools.r8.ir.code.Instruction):161:164 -> set
     2:5:void set(java.lang.Object):38 -> set
-com.android.tools.r8.ir.code.BasicBlockIterator -> com.android.tools.r8.internal.i2:
+com.android.tools.r8.ir.code.BasicBlockIterator -> com.android.tools.r8.internal.d2:
     java.util.ListIterator listIterator -> b
     com.android.tools.r8.ir.code.IRCode code -> a
     com.android.tools.r8.ir.code.BasicBlock current -> c
@@ -29821,7 +29766,7 @@
     1:1:void add(java.lang.Object):10:10 -> add
     2:2:void com.android.tools.r8.ir.code.BasicBlockIterator.add(com.android.tools.r8.ir.code.BasicBlock):68:68 -> add
     2:2:void add(java.lang.Object):10 -> add
-    1:1:com.android.tools.r8.ir.code.BasicBlock next():41:41 -> f
+    1:1:com.android.tools.r8.ir.code.BasicBlock next():41:41 -> e
     1:1:boolean hasNext():36:36 -> hasNext
     1:1:boolean hasPrevious():52:52 -> hasPrevious
     1:1:java.lang.Object next():10:10 -> next
@@ -29834,18 +29779,18 @@
     1:1:void set(java.lang.Object):10:10 -> set
     2:2:void com.android.tools.r8.ir.code.BasicBlockIterator.set(com.android.tools.r8.ir.code.BasicBlock):73:73 -> set
     2:2:void set(java.lang.Object):10 -> set
-com.android.tools.r8.ir.code.Binop -> com.android.tools.r8.internal.B2:
+com.android.tools.r8.ir.code.Binop -> com.android.tools.r8.internal.w2:
     com.android.tools.r8.ir.code.NumericType type -> h
     1:8: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:31 -> <init>
     boolean hasInvariantOutType() -> N0
-    1:1:int maxInValueRegister():90:90 -> W1
-    1:1:int maxOutValueRegister():95:95 -> X1
+    1:1:int maxInValueRegister():90:90 -> V1
+    1:1:int maxOutValueRegister():95:95 -> W1
     double foldDouble(double,double) -> a
     float foldFloat(float,float) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
     1:8:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):51:58 -> a
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.canHaveMul2AddrBug():1693:1693 -> a
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.canHaveMul2AddrBug():1819:1819 -> a
     9:9:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):58 -> a
     10:10:boolean com.android.tools.r8.ir.code.Instruction.isMul():0:0 -> a
     10:10:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):58 -> a
@@ -29854,18 +29799,18 @@
     12:12:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):127 -> a
     13:14:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):132:133 -> a
     15:15:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):138:138 -> a
-    1:1:com.android.tools.r8.ir.code.NumericType getNumericType():36:36 -> c2
+    1:1:com.android.tools.r8.ir.code.NumericType getNumericType():36:36 -> b2
+    boolean isCommutative() -> c2
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-    boolean isCommutative() -> d2
-    1:1:com.android.tools.r8.ir.code.Value leftValue():40:40 -> e2
-    1:2:int maxInOutValueRegisterSize():82:83 -> f2
+    1:1:com.android.tools.r8.ir.code.Value leftValue():40:40 -> d2
+    1:2:int maxInOutValueRegisterSize():82:83 -> e2
+    boolean isBinop() -> f1
+    1:1:com.android.tools.r8.ir.code.Value rightValue():44:44 -> f2
     1:3:boolean com.android.tools.r8.ir.code.Binop.fitsInLit16Instruction(com.android.tools.r8.ir.code.Value):68:70 -> g
     1:3:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):64 -> g
-    boolean isBinop() -> g1
-    1:1:com.android.tools.r8.ir.code.Value rightValue():44:44 -> g2
     1:3:boolean fitsInLit8Instruction(com.android.tools.r8.ir.code.Value):74:76 -> h
     com.android.tools.r8.ir.code.Binop asBinop() -> r
-com.android.tools.r8.ir.code.CanonicalPositions -> com.android.tools.r8.internal.C3:
+com.android.tools.r8.ir.code.CanonicalPositions -> com.android.tools.r8.internal.p3:
     java.util.Map canonicalPositions -> c
     com.android.tools.r8.ir.code.Position callerPosition -> b
     boolean $assertionsDisabled -> a
@@ -29885,7 +29830,7 @@
     22:22:com.android.tools.r8.ir.code.Position getExceptionalExitPosition(boolean,java.util.function.Supplier,com.android.tools.r8.graph.DexMethod):93 -> a
     23:32:com.android.tools.r8.ir.code.Position getExceptionalExitPosition(boolean,java.util.function.Supplier,com.android.tools.r8.graph.DexMethod):94:103 -> a
     1:1:com.android.tools.r8.ir.code.Position getCanonical(com.android.tools.r8.ir.code.Position):50:50 -> b
-com.android.tools.r8.ir.code.CatchHandlers -> com.android.tools.r8.internal.E3:
+com.android.tools.r8.ir.code.CatchHandlers -> com.android.tools.r8.internal.r3:
     java.util.List targets -> e
     java.util.List guards -> d
     java.util.Set uniqueTargets -> f
@@ -29915,28 +29860,28 @@
     1:1:boolean isEmpty():51:51 -> isEmpty
     1:1:java.util.Iterator iterator():107:107 -> iterator
     1:2:int size():55:56 -> size
-com.android.tools.r8.ir.code.CatchHandlers$1 -> com.android.tools.r8.internal.E3$a:
+com.android.tools.r8.ir.code.CatchHandlers$1 -> com.android.tools.r8.internal.r3$a:
     com.android.tools.r8.ir.code.CatchHandlers this$0 -> b
     int nextIndex -> a
     1:3:void <init>(com.android.tools.r8.ir.code.CatchHandlers):107:109 -> <init>
     1:1:boolean hasNext():113:113 -> hasNext
     1:4:com.android.tools.r8.ir.code.CatchHandlers$CatchHandler com.android.tools.r8.ir.code.CatchHandlers$1.next():118:121 -> next
     1:4:java.lang.Object next():107 -> next
-com.android.tools.r8.ir.code.CatchHandlers$CatchHandler -> com.android.tools.r8.internal.E3$b:
+com.android.tools.r8.ir.code.CatchHandlers$CatchHandler -> com.android.tools.r8.internal.r3$b:
     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.O5:
+com.android.tools.r8.ir.code.CheckCast -> com.android.tools.r8.internal.A5:
     com.android.tools.r8.graph.DexType type -> j
     int $r8$clinit -> i
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():28:28 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):37:38 -> <init>
     boolean hasInvariantOutType() -> N0
-    boolean instructionTypeCanThrow() -> V0
-    int maxInValueRegister() -> W1
-    int maxOutValueRegister() -> X1
-    int opcode() -> Y1
+    boolean instructionTypeCanThrow() -> U0
+    int maxInValueRegister() -> V1
+    int maxOutValueRegister() -> W1
+    int opcode() -> X1
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):52:52 -> a
     2:15:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68:81 -> a
     16:16:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):105:105 -> a
@@ -29953,15 +29898,18 @@
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isCheckCast():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):89 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):89:89 -> b
-    4:27:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):110:133 -> b
+    4:12:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):110:118 -> b
+    13:13:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> b
+    13:13:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):119 -> b
+    14:26:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):121:133 -> b
+    1:1:com.android.tools.r8.graph.DexType getType():56:56 -> b2
     1:1:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():102:102 -> c
     1:1:com.android.tools.r8.ir.code.Value object():60 -> c
     2:2:com.android.tools.r8.ir.code.Value object():60:60 -> c
-    1:1:com.android.tools.r8.graph.DexType getType():56:56 -> c2
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     com.android.tools.r8.ir.code.CheckCast asCheckCast() -> s
     1:1:java.lang.String toString():158:158 -> toString
-com.android.tools.r8.ir.code.CheckCast$Builder -> com.android.tools.r8.internal.O5$a:
+com.android.tools.r8.ir.code.CheckCast$Builder -> com.android.tools.r8.internal.A5$a:
     com.android.tools.r8.ir.code.Value object -> d
     com.android.tools.r8.graph.DexType castType -> c
     1:1:void <init>():238:238 -> <init>
@@ -29971,14 +29919,14 @@
     2:2:com.android.tools.r8.ir.code.CheckCast build():255:255 -> b
     3:4:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.Instruction$BuilderBase.amend(com.android.tools.r8.ir.code.Instruction):1565:1566 -> b
     3:4:com.android.tools.r8.ir.code.CheckCast build():255 -> b
-com.android.tools.r8.ir.code.Cmp -> com.android.tools.r8.internal.r7:
+com.android.tools.r8.ir.code.Cmp -> com.android.tools.r8.internal.c7:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.ir.code.Cmp$Bias bias -> j
     1:1:void <clinit>():26:26 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):35:36 -> <init>
-    int maxInValueRegister() -> W1
-    int maxOutValueRegister() -> X1
-    int opcode() -> Y1
+    int maxInValueRegister() -> V1
+    int maxOutValueRegister() -> W1
+    int opcode() -> X1
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):46:46 -> a
     2:29:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:84 -> a
     30:35:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:76 -> a
@@ -30018,17 +29966,17 @@
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isCmp():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):136 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):136:136 -> b
-    boolean isCommutative() -> d2
+    boolean isCommutative() -> c2
     com.android.tools.r8.ir.code.Cmp asCmp() -> t
     1:17:java.lang.String toString():104:120 -> toString
     18:19:java.lang.String toString():113:114 -> toString
     20:42:java.lang.String toString():109:131 -> toString
-com.android.tools.r8.ir.code.Cmp$1 -> com.android.tools.r8.internal.q7:
+com.android.tools.r8.ir.code.Cmp$1 -> com.android.tools.r8.internal.b7:
     int[] $SwitchMap$com$android$tools$r8$ir$code$Cmp$Bias -> b
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():90:90 -> <clinit>
     2:2:void <clinit>():60:60 -> <clinit>
-com.android.tools.r8.ir.code.Cmp$Bias -> com.android.tools.r8.internal.r7$a:
+com.android.tools.r8.ir.code.Cmp$Bias -> com.android.tools.r8.internal.c7$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
@@ -30037,17 +29985,17 @@
     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.i8:
+com.android.tools.r8.ir.code.ConstClass -> com.android.tools.r8.internal.K7:
     com.android.tools.r8.graph.DexType clazz -> k
     boolean $assertionsDisabled -> i
     int $r8$clinit -> j
     1:1:void <clinit>():26:26 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):31:32 -> <init>
-    boolean instructionInstanceCanThrow() -> T0
-    boolean instructionTypeCanThrow() -> V0
-    1:1:int maxInValueRegister():72:72 -> W1
-    int maxOutValueRegister() -> X1
-    int opcode() -> Y1
+    boolean instructionInstanceCanThrow() -> S0
+    boolean instructionTypeCanThrow() -> U0
+    1:1:int maxInValueRegister():72:72 -> V1
+    int maxOutValueRegister() -> W1
+    int opcode() -> X1
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):42:42 -> a
     2:3:com.android.tools.r8.ir.code.ConstClass copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstClass):52:53 -> a
     4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.code.ConstClass.getValue():61:61 -> a
@@ -30063,22 +30011,25 @@
     13:13:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):135:135 -> a
     14:14: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
     15:15:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):166:166 -> a
-    16:16: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):400:400 -> a
+    16:16: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):398:398 -> a
     16:16:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):166 -> a
     17:17:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):171:171 -> a
     18:18:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):176:176 -> a
     19:19:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):181:181 -> a
     1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.code.ConstClass.getValue():61:61 -> b
     1:1:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):103 -> b
-    2:25:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):103:126 -> b
+    2:17:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):103:118 -> b
+    18:18:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> b
+    18:18:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):120 -> b
+    19:23:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):122:126 -> b
+    24:24:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):145:145 -> b
+    25:25:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> b
+    25:25:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):145 -> b
     26:26:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):145:145 -> b
-    27:27:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> b
-    27:27:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):145 -> b
-    28:28:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):145:145 -> b
-    1:1:com.android.tools.r8.graph.DexType getValue():61:61 -> c2
+    1:1:com.android.tools.r8.graph.DexType getValue():61:61 -> b2
     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.j8:
+com.android.tools.r8.ir.code.ConstInstruction -> com.android.tools.r8.internal.L7:
     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
@@ -30087,18 +30038,18 @@
     2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstInstruction():106:106 -> a
     2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):54 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-    boolean isConstInstruction() -> i1
+    boolean isConstInstruction() -> h1
     com.android.tools.r8.ir.code.ConstInstruction asConstInstruction() -> v
-com.android.tools.r8.ir.code.ConstMethodHandle -> com.android.tools.r8.internal.l8:
+com.android.tools.r8.ir.code.ConstMethodHandle -> com.android.tools.r8.internal.N7:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexMethodHandle methodHandle -> j
     1:1:void <clinit>():21:21 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethodHandle):26:27 -> <init>
-    boolean isOutConstant() -> N1
-    boolean instructionTypeCanThrow() -> V0
-    1:1:int maxInValueRegister():76:76 -> W1
-    int maxOutValueRegister() -> X1
-    int opcode() -> Y1
+    boolean isOutConstant() -> M1
+    boolean instructionTypeCanThrow() -> U0
+    1:1:int maxInValueRegister():76:76 -> V1
+    int maxOutValueRegister() -> W1
+    int opcode() -> X1
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):37:37 -> a
     2:2:com.android.tools.r8.ir.code.ConstMethodHandle copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodHandle):47:47 -> a
     3:3:com.android.tools.r8.graph.DexMethodHandle com.android.tools.r8.ir.code.ConstMethodHandle.getValue():55:55 -> a
@@ -30119,19 +30070,19 @@
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isConstMethodHandle():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):71 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):71:71 -> b
-    1:1:com.android.tools.r8.graph.DexMethodHandle getValue():55:55 -> c2
+    1:1:com.android.tools.r8.graph.DexMethodHandle getValue():55:55 -> b2
     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.m8:
+com.android.tools.r8.ir.code.ConstMethodType -> com.android.tools.r8.internal.O7:
     com.android.tools.r8.graph.DexProto methodType -> j
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():21:21 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProto):26:27 -> <init>
-    boolean isOutConstant() -> N1
-    boolean instructionTypeCanThrow() -> V0
-    1:1:int maxInValueRegister():76:76 -> W1
-    int maxOutValueRegister() -> X1
-    int opcode() -> Y1
+    boolean isOutConstant() -> M1
+    boolean instructionTypeCanThrow() -> U0
+    1:1:int maxInValueRegister():76:76 -> V1
+    int maxOutValueRegister() -> W1
+    int opcode() -> X1
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):37:37 -> a
     2:2:com.android.tools.r8.ir.code.ConstMethodType copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodType):47:47 -> a
     3:3:com.android.tools.r8.graph.DexProto com.android.tools.r8.ir.code.ConstMethodType.getValue():55:55 -> a
@@ -30152,20 +30103,20 @@
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isConstMethodType():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):71 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):71:71 -> b
-    1:1:com.android.tools.r8.graph.DexProto getValue():55:55 -> c2
+    1:1:com.android.tools.r8.graph.DexProto getValue():55:55 -> b2
     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.n8:
+com.android.tools.r8.ir.code.ConstNumber -> com.android.tools.r8.internal.P7:
     long value -> k
     boolean $assertionsDisabled -> i
     int $r8$clinit -> j
     1:1:void <clinit>():36:36 -> <clinit>
     1:6:void <init>(com.android.tools.r8.ir.code.Value,long):41:46 -> <init>
-    boolean isOutConstant() -> N1
-    boolean instructionTypeCanBeCanonicalized() -> U0
-    1:1:int maxInValueRegister():249:249 -> W1
-    int maxOutValueRegister() -> X1
-    int opcode() -> Y1
+    boolean isOutConstant() -> M1
+    boolean instructionTypeCanBeCanonicalized() -> T0
+    1:1:int maxInValueRegister():249:249 -> V1
+    int maxOutValueRegister() -> W1
+    int opcode() -> X1
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):63:63 -> a
     2:4:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstNumber):67:69 -> a
     5:6:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstNumber):73:74 -> a
@@ -30209,40 +30160,40 @@
     106:106:boolean outTypeKnownToBeBoolean(java.util.Set):338:338 -> a
     107:107:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):344:344 -> a
     1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):272:276 -> b
-    1:1:com.android.tools.r8.ir.code.Value dest():78:78 -> c2
-    1:2:double getDoubleValue():102:103 -> d2
-    1:2:float getFloatValue():97:98 -> e2
-    1:3:int getIntValue():86:86 -> f2
-    5:5:int getIntValue():88:88 -> f2
-    1:2:long getLongValue():92:93 -> g2
-    1:1:long getRawValue():107:107 -> h2
-    1:1:boolean is16Bit():288:288 -> i2
-    boolean isConstNumber() -> j1
-    1:1:boolean is8Bit():280:280 -> j2
-    1:1:boolean isIntegerOne():119:119 -> k2
-    1:1:boolean isIntegerZero():115:115 -> l2
-    1:1:boolean isZero():111:111 -> m2
-    1:1:boolean negativeIs16Bit():292:292 -> n2
-    1:1:boolean negativeIs8Bit():284:284 -> o2
+    1:1:com.android.tools.r8.ir.code.Value dest():78:78 -> b2
+    1:2:double getDoubleValue():102:103 -> c2
+    1:2:float getFloatValue():97:98 -> d2
+    1:3:int getIntValue():86:86 -> e2
+    5:5:int getIntValue():88:88 -> e2
+    1:2:long getLongValue():92:93 -> f2
+    1:1:long getRawValue():107:107 -> g2
+    1:1:boolean is16Bit():288:288 -> h2
+    boolean isConstNumber() -> i1
+    1:1:boolean is8Bit():280:280 -> i2
+    1:1:boolean isIntegerOne():119:119 -> j2
+    1:1:boolean isIntegerZero():115:115 -> k2
+    1:1:boolean isZero():111:111 -> l2
+    1:1:boolean negativeIs16Bit():292:292 -> m2
+    1:1:boolean negativeIs8Bit():284:284 -> n2
     1:4:java.lang.String toString():260:263 -> toString
     com.android.tools.r8.ir.code.ConstNumber asConstNumber() -> y
-com.android.tools.r8.ir.code.ConstNumber$1 -> com.android.tools.r8.internal.n8$a:
+com.android.tools.r8.ir.code.ConstNumber$1 -> com.android.tools.r8.internal.P7$a:
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:void <clinit>():188:188 -> <clinit>
-com.android.tools.r8.ir.code.ConstString -> com.android.tools.r8.internal.p8:
+com.android.tools.r8.ir.code.ConstString -> com.android.tools.r8.internal.R7:
     boolean $assertionsDisabled -> i
     int $r8$clinit -> j
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfo -> l
     com.android.tools.r8.graph.DexString value -> k
     1:1:void <clinit>():27:27 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):33:35 -> <init>
-    boolean isOutConstant() -> N1
-    1:11:boolean instructionInstanceCanThrow():121:131 -> T0
-    boolean instructionTypeCanBeCanonicalized() -> U0
-    1:1:boolean instructionTypeCanThrow():101:101 -> V0
-    1:1:int maxInValueRegister():85:85 -> W1
-    int maxOutValueRegister() -> X1
-    int opcode() -> Y1
+    boolean isOutConstant() -> M1
+    1:11:boolean instructionInstanceCanThrow():121:131 -> S0
+    boolean instructionTypeCanBeCanonicalized() -> T0
+    1:1:boolean instructionTypeCanThrow():101:101 -> U0
+    1:1:int maxInValueRegister():85:85 -> V1
+    int maxOutValueRegister() -> W1
+    int opcode() -> X1
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):45:45 -> a
     2:3:com.android.tools.r8.ir.code.ConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstString):55:56 -> a
     4:4:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.code.ConstString.getValue():64:64 -> a
@@ -30263,10 +30214,10 @@
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):80 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):80:80 -> b
-    1:1:com.android.tools.r8.graph.DexString getValue():64:64 -> c2
+    1:1:com.android.tools.r8.graph.DexString getValue():64:64 -> b2
     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.t8:
+com.android.tools.r8.ir.code.ConstantValueUtils -> com.android.tools.r8.internal.V7:
     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
@@ -30287,12 +30238,12 @@
     37:37:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
     37:37:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):55 -> a
     38:38: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.U8:
+com.android.tools.r8.ir.code.DebugLocalRead -> com.android.tools.r8.internal.t8:
     1:1:void <init>():20:20 -> <init>
     boolean hasInvariantOutType() -> N0
-    1:1:int maxInValueRegister():60:60 -> W1
-    1:1:int maxOutValueRegister():65:65 -> X1
-    int opcode() -> Y1
+    1:1:int maxInValueRegister():60:60 -> V1
+    1:1:int maxOutValueRegister():65:65 -> W1
+    int opcode() -> X1
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):30:30 -> a
     2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):45:45 -> a
@@ -30305,16 +30256,16 @@
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalRead():0:0 -> b
     2:2: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.V8:
+com.android.tools.r8.ir.code.DebugLocalUninitialized -> com.android.tools.r8.internal.u8:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):21:21 -> <init>
-    boolean isAllowedAfterThrowingInstruction() -> X0
+    boolean isAllowedAfterThrowingInstruction() -> W0
     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.W8:
+com.android.tools.r8.ir.code.DebugLocalWrite -> com.android.tools.r8.internal.v8:
     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>
-    boolean isOutConstant() -> N1
-    boolean isAllowedAfterThrowingInstruction() -> X0
+    boolean isOutConstant() -> M1
+    boolean isAllowedAfterThrowingInstruction() -> W0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36:36 -> a
     2:2:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):61:61 -> a
     3:3:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):66:66 -> a
@@ -30323,7 +30274,7 @@
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):56:56 -> b
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalWrite():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):56 -> b
-com.android.tools.r8.ir.code.DebugLocalsChange -> com.android.tools.r8.internal.X8:
+com.android.tools.r8.ir.code.DebugLocalsChange -> com.android.tools.r8.internal.w8:
     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
@@ -30331,10 +30282,10 @@
     1:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):27:30 -> <init>
     com.android.tools.r8.ir.code.DebugLocalsChange asDebugLocalsChange() -> A
     boolean hasInvariantOutType() -> N0
-    1:1:int maxInValueRegister():78:78 -> W1
-    boolean isAllowedAfterThrowingInstruction() -> X0
-    1:1:int maxOutValueRegister():83:83 -> X1
-    int opcode() -> Y1
+    1:1:int maxInValueRegister():78:78 -> V1
+    boolean isAllowedAfterThrowingInstruction() -> W0
+    1:1:int maxOutValueRegister():83:83 -> W1
+    int opcode() -> X1
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):40:40 -> a
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap com.android.tools.r8.ir.code.DebugLocalsChange.getEnding():44:44 -> a
     2:2:boolean apply(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):109 -> a
@@ -30353,20 +30304,20 @@
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalsChange():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):68 -> b
     3:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):71:73 -> b
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getEnding():44:44 -> c2
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getEnding():44:44 -> b2
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getStarting():48:48 -> c2
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getStarting():48:48 -> d2
     1:6:java.lang.String toString():93:98 -> toString
-com.android.tools.r8.ir.code.DebugPosition -> com.android.tools.r8.internal.Y8:
+com.android.tools.r8.ir.code.DebugPosition -> com.android.tools.r8.internal.x8:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>():20:20 -> <init>
     com.android.tools.r8.ir.code.DebugPosition asDebugPosition() -> B
     boolean hasInvariantOutType() -> N0
-    1:1:int maxInValueRegister():56:56 -> W1
-    boolean isAllowedAfterThrowingInstruction() -> X0
-    1:1:int maxOutValueRegister():61:61 -> X1
-    int opcode() -> Y1
+    1:1:int maxInValueRegister():56:56 -> V1
+    boolean isAllowedAfterThrowingInstruction() -> W0
+    1:1:int maxOutValueRegister():61:61 -> W1
+    int opcode() -> X1
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):30:30 -> a
     2:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):45:46 -> a
@@ -30379,7 +30330,7 @@
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isDebugPosition():0:0 -> b
     2:2: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.Z8:
+com.android.tools.r8.ir.code.DefaultAliasedValueConfiguration -> com.android.tools.r8.internal.y8:
     com.android.tools.r8.ir.code.DefaultAliasedValueConfiguration INSTANCE -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():7:9 -> <clinit>
@@ -30392,7 +30343,7 @@
     1:1:boolean isIntroducingAnAlias(com.android.tools.r8.ir.code.Instruction):20:20 -> b
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> b
     2:2:boolean isIntroducingAnAlias(com.android.tools.r8.ir.code.Instruction):20 -> b
-com.android.tools.r8.ir.code.DefaultInstructionVisitor -> com.android.tools.r8.internal.h9:
+com.android.tools.r8.ir.code.DefaultInstructionVisitor -> com.android.tools.r8.internal.F8:
     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
@@ -30408,49 +30359,48 @@
     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.fa:
+com.android.tools.r8.ir.code.DexItemBasedConstString -> com.android.tools.r8.internal.C9:
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> l
     boolean $assertionsDisabled -> i
     int $r8$clinit -> j
     com.android.tools.r8.graph.DexReference item -> k
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfo -> m
-    1:1:void <clinit>():26:26 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):37:40 -> <init>
+    1:1:void <clinit>():24:24 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):35:38 -> <init>
     com.android.tools.r8.ir.code.DexItemBasedConstString asDexItemBasedConstString() -> C
-    boolean isOutConstant() -> N1
-    boolean instructionInstanceCanThrow() -> T0
-    boolean instructionTypeCanBeCanonicalized() -> U0
-    1:1:boolean instructionTypeCanThrow():121:121 -> V0
-    1:1:int maxInValueRegister():105:105 -> W1
-    int maxOutValueRegister() -> X1
-    int opcode() -> Y1
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):50:50 -> a
-    2:3:com.android.tools.r8.ir.code.DexItemBasedConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DexItemBasedConstString):60:61 -> a
-    4:4:com.android.tools.r8.graph.DexReference com.android.tools.r8.ir.code.DexItemBasedConstString.getItem():66:66 -> a
-    4:4:com.android.tools.r8.ir.code.DexItemBasedConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DexItemBasedConstString):62 -> a
-    5:5:com.android.tools.r8.ir.code.DexItemBasedConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DexItemBasedConstString):62:62 -> a
-    6:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):90:91 -> a
-    8:8:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):139:139 -> a
-    9:9:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):144:144 -> a
-    10:10:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):149:149 -> a
-    11:11:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):154:154 -> a
-    12:12:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):159:159 -> a
-    13:13: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
+    boolean isOutConstant() -> M1
+    boolean instructionInstanceCanThrow() -> S0
+    boolean instructionTypeCanBeCanonicalized() -> T0
+    1:1:boolean instructionTypeCanThrow():119:119 -> U0
+    1:1:int maxInValueRegister():103:103 -> V1
+    int maxOutValueRegister() -> W1
+    int opcode() -> X1
+    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):48:48 -> a
+    2:3:com.android.tools.r8.ir.code.DexItemBasedConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DexItemBasedConstString):58:59 -> a
+    4:4:com.android.tools.r8.graph.DexReference com.android.tools.r8.ir.code.DexItemBasedConstString.getItem():64:64 -> a
+    4:4:com.android.tools.r8.ir.code.DexItemBasedConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DexItemBasedConstString):60 -> a
+    5:5:com.android.tools.r8.ir.code.DexItemBasedConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DexItemBasedConstString):60:60 -> a
+    6:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):88:89 -> a
+    8:8:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):137:137 -> a
+    9:9:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):142:142 -> a
+    10:10:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):147:147 -> a
+    11:11:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):152:152 -> a
+    12:12:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):157:157 -> a
+    13:13: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
     14:14: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):94:94 -> a
-    14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):165 -> a
-    15:16:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):177:178 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):98:98 -> b
+    14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):163 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):96:96 -> b
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> b
-    2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):98 -> b
-    3:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):99:100 -> b
-    1:1:com.android.tools.r8.graph.DexReference getItem():66:66 -> c2
-    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():70:70 -> d2
-    1:1:java.lang.String toString():116:116 -> toString
-com.android.tools.r8.ir.code.Div -> com.android.tools.r8.internal.sa:
+    2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):96 -> b
+    3:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):97:98 -> b
+    1:1:com.android.tools.r8.graph.DexReference getItem():64:64 -> b2
+    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():68:68 -> c2
+    1:1:java.lang.String toString():114:114 -> toString
+com.android.tools.r8.ir.code.Div -> com.android.tools.r8.internal.P9:
     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 -> V0
-    int opcode() -> Y1
+    1:1:boolean instructionTypeCanThrow():134:134 -> U0
+    int opcode() -> X1
     double foldDouble(double,double) -> a
     float foldFloat(float,float) -> a
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):34:34 -> a
@@ -30469,14 +30419,14 @@
     5:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):104:104 -> b
     1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):54:54 -> c
     2:2:com.android.tools.r8.code.Instruction CreateFloat2Addr(int,int):84:84 -> c
+    boolean isCommutative() -> c2
     1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):74:74 -> d
     2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):99:99 -> d
-    boolean isCommutative() -> d2
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):79:79 -> e
     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 -> h2
-com.android.tools.r8.ir.code.DominatorTree -> com.android.tools.r8.internal.ua:
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> g2
+com.android.tools.r8.ir.code.DominatorTree -> com.android.tools.r8.internal.R9:
     com.android.tools.r8.ir.code.BasicBlock[] doms -> c
     com.android.tools.r8.ir.code.BasicBlock[] sorted -> b
     boolean obsolete -> f
@@ -30508,34 +30458,36 @@
     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.ta:
-    com.android.tools.r8.ir.code.DominatorTree this$0 -> c
+com.android.tools.r8.ir.code.DominatorTree$1 -> com.android.tools.r8.internal.Q9:
+    com.android.tools.r8.ir.code.DominatorTree this$0 -> d
     boolean $assertionsDisabled -> a
+    com.android.tools.r8.ir.code.BasicBlock val$dominated -> c
     com.android.tools.r8.ir.code.BasicBlock current -> b
     1:1:void <clinit>():196:196 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.DominatorTree,com.android.tools.r8.ir.code.BasicBlock):196:197 -> <init>
     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.ua$a:
+com.android.tools.r8.ir.code.DominatorTree$Assumption -> com.android.tools.r8.internal.R9$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.va:
-    com.android.tools.r8.ir.code.DominatorTree$Inclusive NO -> a
-    1:1:void <clinit>():25:25 -> <clinit>
+com.android.tools.r8.ir.code.DominatorTree$Inclusive -> com.android.tools.r8.internal.S9:
+    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.Ba:
+com.android.tools.r8.ir.code.Dup -> com.android.tools.r8.internal.X9:
     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>
     2:3:void <init>(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.Value):25:26 -> <init>
     com.android.tools.r8.ir.code.Dup asDup() -> E
     boolean hasInvariantOutType() -> N0
-    int maxInValueRegister() -> W1
-    1:1:int maxOutValueRegister():92:92 -> X1
-    int opcode() -> Y1
+    int maxInValueRegister() -> V1
+    1:1:int maxOutValueRegister():92:92 -> W1
+    int opcode() -> X1
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36:36 -> a
     2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68:68 -> a
@@ -30546,24 +30498,24 @@
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):82:82 -> b
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isDup():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):82 -> b
+    1:1:com.android.tools.r8.ir.code.StackValue[] com.android.tools.r8.ir.code.Dup.getStackValues():51:51 -> b2
+    1:1:com.android.tools.r8.ir.code.StackValue outBottom():55 -> b2
+    2:2:com.android.tools.r8.ir.code.StackValue outBottom():55:55 -> b2
     1:1:com.android.tools.r8.ir.code.StackValue[] com.android.tools.r8.ir.code.Dup.getStackValues():51:51 -> c2
-    1:1:com.android.tools.r8.ir.code.StackValue outBottom():55 -> c2
-    2:2:com.android.tools.r8.ir.code.StackValue outBottom():55:55 -> c2
+    1:1:com.android.tools.r8.ir.code.StackValue outTop():59 -> c2
+    2:2:com.android.tools.r8.ir.code.StackValue outTop():59:59 -> c2
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-    1:1:com.android.tools.r8.ir.code.StackValue[] com.android.tools.r8.ir.code.Dup.getStackValues():51:51 -> d2
-    1:1:com.android.tools.r8.ir.code.StackValue outTop():59 -> d2
-    2:2:com.android.tools.r8.ir.code.StackValue outTop():59:59 -> d2
+    1:1:com.android.tools.r8.ir.code.StackValue src():63:63 -> d2
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):41:46 -> e
-    1:1:com.android.tools.r8.ir.code.StackValue src():63:63 -> e2
-com.android.tools.r8.ir.code.Dup2 -> com.android.tools.r8.internal.Aa:
+com.android.tools.r8.ir.code.Dup2 -> com.android.tools.r8.internal.W9:
     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>
     2:7:void <init>(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):35:40 -> <init>
     boolean hasInvariantOutType() -> N0
-    int maxInValueRegister() -> W1
-    1:1:int maxOutValueRegister():106:106 -> X1
-    int opcode() -> Y1
+    int maxInValueRegister() -> V1
+    1:1:int maxOutValueRegister():106:106 -> W1
+    int opcode() -> X1
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):50:50 -> a
     2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):86:86 -> a
@@ -30576,7 +30528,7 @@
     2:2: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.fc:
+com.android.tools.r8.ir.code.FieldInstruction -> com.android.tools.r8.internal.yb:
     com.android.tools.r8.graph.DexField field -> i
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():26:26 -> <clinit>
@@ -30584,38 +30536,44 @@
     2:4:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,java.util.List):35:37 -> <init>
     com.android.tools.r8.ir.code.FieldInstruction asFieldInstruction() -> F
     boolean hasInvariantOutType() -> N0
-    1:1:boolean internalInstructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption,com.android.tools.r8.graph.FieldResolutionResult$SuccessfulFieldResolutionResult):82:82 -> a
-    2:2:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():209:209 -> a
-    2:2:boolean internalInstructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption,com.android.tools.r8.graph.FieldResolutionResult$SuccessfulFieldResolutionResult):84 -> a
-    3:9:boolean internalInstructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption,com.android.tools.r8.graph.FieldResolutionResult$SuccessfulFieldResolutionResult):84:90 -> a
-    10:10:com.android.tools.r8.graph.DexClassAndMember com.android.tools.r8.graph.FieldResolutionResult$SuccessfulFieldResolutionResult.getResolutionPair():54:54 -> a
-    10:10: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
-    10:10: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 -> a
-    10:10:boolean internalInstructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption,com.android.tools.r8.graph.FieldResolutionResult$SuccessfulFieldResolutionResult):90 -> a
-    11:11: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:43 -> a
-    11:11: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 -> a
-    11:11:boolean internalInstructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption,com.android.tools.r8.graph.FieldResolutionResult$SuccessfulFieldResolutionResult):90 -> a
-    12:12: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
-    12:12: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 -> a
-    12:12:boolean internalInstructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption,com.android.tools.r8.graph.FieldResolutionResult$SuccessfulFieldResolutionResult):90 -> a
-    13:13:boolean internalInstructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption,com.android.tools.r8.graph.FieldResolutionResult$SuccessfulFieldResolutionResult):91:91 -> a
-    14:14:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
-    14:14:boolean internalInstructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption,com.android.tools.r8.graph.FieldResolutionResult$SuccessfulFieldResolutionResult):97 -> a
-    15:39:boolean internalInstructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption,com.android.tools.r8.graph.FieldResolutionResult$SuccessfulFieldResolutionResult):97:121 -> a
-    40:77:boolean isStoringObjectWithFinalizer(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedField):169:206 -> a
-    78:83:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):212:217 -> a
+    1:23:boolean isStoringObjectWithFinalizer(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedField):159:181 -> a
+    24:24:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    24:24:boolean isStoringObjectWithFinalizer(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedField):181 -> a
+    25:36:boolean isStoringObjectWithFinalizer(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedField):185:196 -> a
+    37:38:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):202:203 -> a
+    39:39:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.code.FieldInstruction.getField():47:47 -> a
+    39:39:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):203 -> a
+    40:44:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):203:207 -> a
     1:1:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):62:62 -> b
-    2:2:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):71:71 -> b
-    3:3: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):232:232 -> b
-    3:3:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):71 -> b
-    4:4:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):71:71 -> b
-    5:5:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):67:67 -> b
-    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> c2
-    1:1:com.android.tools.r8.ir.code.FieldMemberType getType():43:43 -> d2
-    com.android.tools.r8.ir.code.Value value() -> e2
-    1:24:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):136:159 -> f
-    boolean isFieldInstruction() -> q1
-com.android.tools.r8.ir.code.FieldMemberType -> com.android.tools.r8.internal.gc:
+    2:2:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):68:68 -> b
+    3:3: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):237:237 -> b
+    3:3:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):68 -> b
+    4:8:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):68:72 -> b
+    9:9:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():199:199 -> b
+    9:9:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):74 -> b
+    10:16:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):74:80 -> b
+    17:18: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
+    17:18: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
+    17:18:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):80 -> b
+    19:19: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
+    19:19: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
+    19:19:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):80 -> b
+    20:20:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):81:81 -> b
+    21:21:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> b
+    21:21:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):87 -> b
+    22:46:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):87:111 -> b
+    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> b2
+    1:1:com.android.tools.r8.ir.code.FieldMemberType getType():43:43 -> c2
+    com.android.tools.r8.ir.code.Value value() -> d2
+    1:6:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):126:131 -> f
+    7:7:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.code.FieldInstruction.getField():47:47 -> f
+    7:7:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):132 -> f
+    8:11:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):134:137 -> f
+    12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> f
+    12:12:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):137 -> f
+    13:23:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):139:149 -> f
+    boolean isFieldInstruction() -> p1
+com.android.tools.r8.ir.code.FieldMemberType -> com.android.tools.r8.internal.zb:
     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
@@ -30644,7 +30602,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.Ac:
+com.android.tools.r8.ir.code.FixedRegisterValue -> com.android.tools.r8.internal.Tb:
     boolean $assertionsDisabled -> q
     int register -> r
     1:1:void <clinit>():12:12 -> <clinit>
@@ -30668,25 +30626,25 @@
     22:23:com.android.tools.r8.ir.code.ValueType outType():43:44 -> e0
     1:1:int getRegister():50:50 -> k0
     1:1:java.lang.String toString():75:75 -> toString
-com.android.tools.r8.ir.code.Goto -> com.android.tools.r8.internal.xd:
+com.android.tools.r8.ir.code.Goto -> com.android.tools.r8.internal.Lc:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():17:17 -> <init>
     com.android.tools.r8.ir.code.Goto asGoto() -> G
-    1:1:int maxInValueRegister():59:59 -> W1
-    boolean isAllowedAfterThrowingInstruction() -> X0
-    1:1:int maxOutValueRegister():65:65 -> X1
-    int opcode() -> Y1
+    1:1:int maxInValueRegister():59:59 -> V1
+    boolean isAllowedAfterThrowingInstruction() -> W0
+    1:1:int maxOutValueRegister():65:65 -> W1
+    int opcode() -> X1
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):32:32 -> a
     2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54:54 -> a
     3:4:void print(com.android.tools.r8.utils.CfgPrinter):79:80 -> a
     5:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):117:117 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):85:85 -> b
-    1:4:com.android.tools.r8.ir.code.BasicBlock getTarget():36:39 -> d2
-    boolean isGoto() -> s1
+    1:4:com.android.tools.r8.ir.code.BasicBlock getTarget():36:39 -> c2
+    boolean isGoto() -> r1
     1:4:java.lang.String toString():71:74 -> toString
-com.android.tools.r8.ir.code.IRCode -> com.android.tools.r8.internal.fe:
+com.android.tools.r8.ir.code.IRCode -> com.android.tools.r8.internal.sd:
     boolean allThrowingInstructionsHavePositions -> i
     int nextInstructionNumber -> h
     int usedMarkingColors -> f
@@ -30702,119 +30660,118 @@
     1:1:void <clinit>():59:59 -> <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):135:135 -> <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):114:147 -> <init>
-    1:13:java.util.Set removeUnreachableBlocks():1327:1339 -> A
-    1:1:int reserveMarkingColor():1229:1229 -> B
-    2:2:boolean com.android.tools.r8.ir.code.IRCode.anyMarkingColorAvailable():1243:1243 -> B
-    2:2:int reserveMarkingColor():1229 -> B
-    3:10:int reserveMarkingColor():1229:1236 -> B
-    11:12:boolean com.android.tools.r8.ir.code.IRCode.verifyNoBlocksMarked(int):499:500 -> B
-    11:12:int reserveMarkingColor():1237 -> B
-    1:11:void splitCriticalEdges():368:378 -> C
-    12:12:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> C
-    12:12:void splitCriticalEdges():378 -> C
-    13:17:void splitCriticalEdges():378:382 -> C
-    18:18:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1159:1159 -> C
-    18:18:void splitCriticalEdges():390 -> C
-    19:19:void splitCriticalEdges():390:390 -> C
-    20:29:void splitCriticalEdges():389:398 -> C
-    1:1:java.util.stream.Stream streamInstructions():1018:1018 -> D
-    1:24:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.ir.code.IRCode.depthFirstSorting():524:547 -> E
-    1:24:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():517 -> E
-    25:25:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():518:518 -> E
-    26:28: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):553:555 -> E
-    26:28:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():519 -> E
-    29:29:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> E
-    29:29: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):555 -> E
-    29:29:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():519 -> E
-    30:34: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):556:560 -> E
-    30:34:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():519 -> E
-    35:35:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> E
-    35:35: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 -> E
-    35:35:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():519 -> E
-    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):561:564 -> E
-    36:39:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():519 -> E
-    1:14:void traceBlocks():429:442 -> F
-    15:15:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1159:1159 -> F
-    15:15:void traceBlocks():447 -> F
-    16:16:void traceBlocks():447:447 -> F
-    17:29:void traceBlocks():446:458 -> F
-    30:30:boolean com.android.tools.r8.ir.code.IRCode.noColorsInUse():1272:1272 -> F
-    30:30:void traceBlocks():458 -> F
-    31:31:void traceBlocks():458:458 -> F
-    1:12:boolean verifyNoImpreciseOrBottomTypes():944:955 -> G
-    1:7:boolean verifyNoNullabilityBottomTypes():959:965 -> H
-    1:12:boolean verifyNoValueWithOnlyAssumeInstructionAsUsers():969:980 -> I
-    1:14:boolean verifySplitCriticalEdges():402:415 -> J
+    1:1:boolean removeAllDeadAndTrivialPhis():1196:1196 -> A
+    1:13:java.util.Set removeUnreachableBlocks():1322:1334 -> B
+    1:1:int reserveMarkingColor():1224:1224 -> C
+    2:2:boolean com.android.tools.r8.ir.code.IRCode.anyMarkingColorAvailable():1238:1238 -> C
+    2:2:int reserveMarkingColor():1224 -> C
+    3:10:int reserveMarkingColor():1224:1231 -> C
+    11:12:boolean com.android.tools.r8.ir.code.IRCode.verifyNoBlocksMarked(int):499:500 -> C
+    11:12:int reserveMarkingColor():1232 -> C
+    1:11:void splitCriticalEdges():368:378 -> D
+    12:12:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> D
+    12:12:void splitCriticalEdges():378 -> D
+    13:17:void splitCriticalEdges():378:382 -> D
+    18:18:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1154:1154 -> D
+    18:18:void splitCriticalEdges():390 -> D
+    19:19:void splitCriticalEdges():390:390 -> D
+    20:29:void splitCriticalEdges():389:398 -> D
+    1:1:java.util.stream.Stream streamInstructions():1013:1013 -> E
+    1:24:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.ir.code.IRCode.depthFirstSorting():524:547 -> F
+    1:24:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():517 -> F
+    25:25:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():518:518 -> F
+    26:28: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):553:555 -> F
+    26:28:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():519 -> F
+    29:29:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> F
+    29:29: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):555 -> F
+    29:29:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():519 -> F
+    30:34: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):556:560 -> F
+    30:34:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():519 -> F
+    35:35:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> F
+    35:35: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 -> F
+    35:35:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():519 -> F
+    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):561:564 -> F
+    36:39:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():519 -> F
+    1:14:void traceBlocks():429:442 -> G
+    15:15:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1154:1154 -> G
+    15:15:void traceBlocks():447 -> G
+    16:16:void traceBlocks():447:447 -> G
+    17:29:void traceBlocks():446:458 -> G
+    30:30:boolean com.android.tools.r8.ir.code.IRCode.noColorsInUse():1267:1267 -> G
+    30:30:void traceBlocks():458 -> G
+    31:31:void traceBlocks():458:458 -> G
+    1:12:boolean verifyNoImpreciseOrBottomTypes():939:950 -> H
+    1:7:boolean verifyNoNullabilityBottomTypes():954:960 -> I
+    1:12:boolean verifyNoValueWithOnlyAssumeInstructionAsUsers():964:975 -> J
+    1:14:boolean verifySplitCriticalEdges():402:415 -> K
     1:1:boolean lambda$prepareBlocksForCatchHandlers$0(com.android.tools.r8.ir.code.BasicBlock):364:364 -> a
     2:6:void com.android.tools.r8.ir.code.IRCode.ensureBlockNumbering():462:466 -> a
     2:6:void print(com.android.tools.r8.utils.CfgPrinter):568 -> a
     7:8:void print(com.android.tools.r8.utils.CfgPrinter):569:570 -> a
-    9:19:boolean hasNoVerticallyMergedClasses(com.android.tools.r8.graph.AppView):591:601 -> a
-    20:20:boolean hasNoVerticallyMergedClasses(com.android.tools.r8.graph.AppView):599:599 -> a
-    21:21:boolean lambda$hasNoVerticallyMergedClasses$1(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,com.android.tools.r8.graph.DexType,java.lang.Boolean):603:603 -> a
-    22:22:boolean lambda$verifyTypes$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper,com.android.tools.r8.ir.code.BasicBlock):630:630 -> a
-    23:23:java.util.Collection lambda$consistentPredecessorSuccessors$3(java.util.Collection):758:758 -> a
-    24:24:java.util.Collection lambda$consistentPredecessorSuccessors$4(java.util.function.Function,com.android.tools.r8.ir.code.BasicBlock):762:762 -> a
-    25:26:void lambda$consistentBlockNumbering$8(java.lang.Integer,java.lang.Long):802:803 -> a
-    27:31:boolean lambda$verifyNoImpreciseOrBottomTypes$9(com.android.tools.r8.ir.code.Value):946:950 -> a
-    32:32:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
-    32:32:boolean lambda$verifyNoImpreciseOrBottomTypes$9(com.android.tools.r8.ir.code.Value):950 -> a
-    33:35:boolean lambda$verifyNoImpreciseOrBottomTypes$9(com.android.tools.r8.ir.code.Value):950:952 -> a
-    36:36:boolean lambda$verifyNoImpreciseOrBottomTypes$9(com.android.tools.r8.ir.code.Value):951:951 -> a
-    37:37:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$11(com.android.tools.r8.ir.code.Instruction):972:972 -> a
-    38:38:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
-    38:38:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$11(com.android.tools.r8.ir.code.Instruction):972 -> a
-    39:42:boolean lambda$wrapSSAVerifierWithStackValueHandling$14(java.util.function.Predicate,com.android.tools.r8.ir.code.Value):987:990 -> a
-    43:43:java.lang.Iterable blocks(java.util.function.Predicate):1010:1010 -> a
-    44:57:java.util.List com.android.tools.r8.ir.code.IRCode.collectArguments(boolean):1083:1096 -> a
-    44:57:java.util.List collectArguments():1079 -> a
-    58:58:java.util.List com.android.tools.r8.ir.code.IRCode.collectArguments(boolean):1094:1094 -> a
-    58:58:java.util.List collectArguments():1079 -> a
-    59:59:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):1113:1113 -> a
-    60:60:com.android.tools.r8.ir.code.ConstNumber createNumberConstant(long,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):1121:1121 -> a
-    61:61:com.android.tools.r8.ir.code.ConstNumber createIntConstant(int,com.android.tools.r8.graph.DebugLocalInfo):1137:1137 -> a
-    62:62:void setAllThrowingInstructionsHavePositions(boolean):1184:1184 -> a
-    63:69:boolean removeAllDeadAndTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):1214:1220 -> a
-    70:70:boolean isMarkingColorInUse(int):1259:1259 -> a
-    71:71:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1369:1369 -> a
-    72:72:boolean com.android.tools.r8.ir.code.IRCode.isMarkingColorInUse(int):1259:1259 -> a
-    72:72:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1369 -> a
-    73:84:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1369:1380 -> a
-    85:106:com.android.tools.r8.ir.code.Position findFirstNonNonePosition(com.android.tools.r8.ir.code.Position):1391:1412 -> a
+    9:18:boolean hasNoVerticallyMergedClasses(com.android.tools.r8.graph.AppView):591:600 -> a
+    19:19:boolean lambda$verifyTypes$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper,com.android.tools.r8.ir.code.BasicBlock):626:626 -> a
+    20:20:java.util.Collection lambda$consistentPredecessorSuccessors$2(java.util.Collection):753:753 -> a
+    21:21:java.util.Collection lambda$consistentPredecessorSuccessors$3(java.util.function.Function,com.android.tools.r8.ir.code.BasicBlock):757:757 -> a
+    22:23:void lambda$consistentBlockNumbering$7(java.lang.Integer,java.lang.Long):797:798 -> a
+    24:28:boolean lambda$verifyNoImpreciseOrBottomTypes$8(com.android.tools.r8.ir.code.Value):941:945 -> a
+    29:29:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
+    29:29:boolean lambda$verifyNoImpreciseOrBottomTypes$8(com.android.tools.r8.ir.code.Value):945 -> a
+    30:32:boolean lambda$verifyNoImpreciseOrBottomTypes$8(com.android.tools.r8.ir.code.Value):945:947 -> a
+    33:33:boolean lambda$verifyNoImpreciseOrBottomTypes$8(com.android.tools.r8.ir.code.Value):946:946 -> a
+    34:34:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$10(com.android.tools.r8.ir.code.Instruction):967:967 -> a
+    35:35:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
+    35:35:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$10(com.android.tools.r8.ir.code.Instruction):967 -> a
+    36:39:boolean lambda$wrapSSAVerifierWithStackValueHandling$13(java.util.function.Predicate,com.android.tools.r8.ir.code.Value):982:985 -> a
+    40:40:java.lang.Iterable blocks(java.util.function.Predicate):1005:1005 -> a
+    41:54:java.util.List com.android.tools.r8.ir.code.IRCode.collectArguments(boolean):1078:1091 -> a
+    41:54:java.util.List collectArguments():1074 -> a
+    55:55:java.util.List com.android.tools.r8.ir.code.IRCode.collectArguments(boolean):1089:1089 -> a
+    55:55:java.util.List collectArguments():1074 -> a
+    56:56:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):1108:1108 -> a
+    57:57:com.android.tools.r8.ir.code.ConstNumber createNumberConstant(long,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):1116:1116 -> a
+    58:58:com.android.tools.r8.ir.code.ConstNumber createIntConstant(int,com.android.tools.r8.graph.DebugLocalInfo):1132:1132 -> a
+    59:59:void setAllThrowingInstructionsHavePositions(boolean):1179:1179 -> a
+    60:66:boolean removeAllDeadAndTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):1209:1215 -> a
+    67:67:boolean isMarkingColorInUse(int):1254:1254 -> a
+    68:68:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1364:1364 -> a
+    69:69:boolean com.android.tools.r8.ir.code.IRCode.isMarkingColorInUse(int):1254:1254 -> a
+    69:69:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1364 -> a
+    70:81:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1364:1375 -> a
+    82:103:com.android.tools.r8.ir.code.Position findFirstNonNonePosition(com.android.tools.r8.ir.code.Position):1386:1407 -> a
     1:1:void removeBlocks(java.util.Collection):506:506 -> b
-    2:4:boolean verifyTypes(com.android.tools.r8.graph.AppView):625:627 -> b
-    5:7:boolean com.android.tools.r8.ir.code.IRCode.validAssumeInstructions(com.android.tools.r8.graph.AppView):635:637 -> b
-    5:7:boolean verifyTypes(com.android.tools.r8.graph.AppView):627 -> b
+    2:4:boolean verifyTypes(com.android.tools.r8.graph.AppView):621:623 -> b
+    5:7:boolean com.android.tools.r8.ir.code.IRCode.validAssumeInstructions(com.android.tools.r8.graph.AppView):631:633 -> b
+    5:7:boolean verifyTypes(com.android.tools.r8.graph.AppView):623 -> b
     8:8:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> b
-    8:8:boolean com.android.tools.r8.ir.code.IRCode.validAssumeInstructions(com.android.tools.r8.graph.AppView):637 -> b
-    8:8:boolean verifyTypes(com.android.tools.r8.graph.AppView):627 -> b
-    9:9:boolean com.android.tools.r8.ir.code.IRCode.validAssumeInstructions(com.android.tools.r8.graph.AppView):638:638 -> b
-    9:9:boolean verifyTypes(com.android.tools.r8.graph.AppView):627 -> b
-    10:12:boolean verifyTypes(com.android.tools.r8.graph.AppView):628:630 -> b
-    13:13:java.util.Collection lambda$consistentPredecessorSuccessors$5(java.util.function.Function,com.android.tools.r8.ir.code.BasicBlock):765:765 -> b
-    14:16:boolean lambda$verifyNoNullabilityBottomTypes$10(com.android.tools.r8.ir.code.Value):961:961 -> b
-    17:17:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$12(com.android.tools.r8.ir.code.Instruction):975:975 -> b
+    8:8:boolean com.android.tools.r8.ir.code.IRCode.validAssumeInstructions(com.android.tools.r8.graph.AppView):633 -> b
+    8:8:boolean verifyTypes(com.android.tools.r8.graph.AppView):623 -> b
+    9:9:boolean com.android.tools.r8.ir.code.IRCode.validAssumeInstructions(com.android.tools.r8.graph.AppView):634:634 -> b
+    9:9:boolean verifyTypes(com.android.tools.r8.graph.AppView):623 -> b
+    10:12:boolean verifyTypes(com.android.tools.r8.graph.AppView):624:626 -> b
+    13:13:java.util.Collection lambda$consistentPredecessorSuccessors$4(java.util.function.Function,com.android.tools.r8.ir.code.BasicBlock):760:760 -> b
+    14:16:boolean lambda$verifyNoNullabilityBottomTypes$9(com.android.tools.r8.ir.code.Value):956:956 -> b
+    17:17:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$11(com.android.tools.r8.ir.code.Instruction):970:970 -> b
     18:18:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> b
-    18:18:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$12(com.android.tools.r8.ir.code.Instruction):975 -> b
-    19:19:java.lang.Iterable instructions(java.util.function.Predicate):1022:1022 -> b
-    20:20:com.android.tools.r8.ir.code.BasicBlockIterator listIterator(int):1048:1048 -> b
-    21:22:boolean computeAllThrowingInstructionsHavePositions():1188:1189 -> b
+    18:18:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$11(com.android.tools.r8.ir.code.Instruction):970 -> b
+    19:19:java.lang.Iterable instructions(java.util.function.Predicate):1017:1017 -> b
+    20:20:com.android.tools.r8.ir.code.BasicBlockIterator listIterator(int):1043:1043 -> b
+    21:22:boolean computeAllThrowingInstructionsHavePositions():1183:1184 -> b
     23:23:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> b
-    23:23:boolean computeAllThrowingInstructionsHavePositions():1190 -> b
+    23:23:boolean computeAllThrowingInstructionsHavePositions():1185 -> b
     24:24:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> b
-    24:24:boolean computeAllThrowingInstructionsHavePositions():1191 -> b
-    25:26:boolean computeAllThrowingInstructionsHavePositions():1192:1193 -> b
-    27:27:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1344:1344 -> b
-    28:28:void com.android.tools.r8.ir.code.IRCode.markTransitiveSuccessors(java.util.Deque,int):1348:1348 -> b
-    28:28:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1344 -> b
-    29:29:boolean com.android.tools.r8.ir.code.IRCode.isMarkingColorInUse(int):1259:1259 -> b
-    29:29:void com.android.tools.r8.ir.code.IRCode.markTransitiveSuccessors(java.util.Deque,int):1348 -> b
-    29:29:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1344 -> b
-    30:31:boolean com.android.tools.r8.ir.code.IRCode.anyBlocksMarkedWithColor(int):1263:1264 -> b
-    30:31:void com.android.tools.r8.ir.code.IRCode.markTransitiveSuccessors(java.util.Deque,int):1348 -> b
-    30:31:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1344 -> b
-    32:41:void com.android.tools.r8.ir.code.IRCode.markTransitiveSuccessors(java.util.Deque,int):1348:1357 -> b
-    32:41:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1344 -> b
+    24:24:boolean computeAllThrowingInstructionsHavePositions():1186 -> b
+    25:26:boolean computeAllThrowingInstructionsHavePositions():1187:1188 -> b
+    27:27:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1339:1339 -> b
+    28:28:void com.android.tools.r8.ir.code.IRCode.markTransitiveSuccessors(java.util.Deque,int):1343:1343 -> b
+    28:28:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1339 -> b
+    29:29:boolean com.android.tools.r8.ir.code.IRCode.isMarkingColorInUse(int):1254:1254 -> b
+    29:29:void com.android.tools.r8.ir.code.IRCode.markTransitiveSuccessors(java.util.Deque,int):1343 -> b
+    29:29:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1339 -> b
+    30:31:boolean com.android.tools.r8.ir.code.IRCode.anyBlocksMarkedWithColor(int):1258:1259 -> b
+    30:31:void com.android.tools.r8.ir.code.IRCode.markTransitiveSuccessors(java.util.Deque,int):1343 -> b
+    30:31:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1339 -> b
+    32:41:void com.android.tools.r8.ir.code.IRCode.markTransitiveSuccessors(java.util.Deque,int):1343:1352 -> b
+    32:41:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1339 -> b
     1:53:java.util.Map computeLiveAtEntrySets():171:223 -> c
     54:74:java.util.Map computeLiveAtEntrySets():222:242 -> c
     75:75:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():102:102 -> c
@@ -30823,233 +30780,238 @@
     116:116:boolean com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets.isEmpty():92:92 -> c
     116:116:java.util.Map computeLiveAtEntrySets():285 -> c
     117:119:java.util.Map computeLiveAtEntrySets():285:287 -> c
-    120:120:java.util.Collection lambda$consistentPredecessorSuccessors$6(java.util.function.Function,com.android.tools.r8.ir.code.BasicBlock):776:776 -> c
-    121:127:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$13(com.android.tools.r8.ir.code.Value):971:971 -> c
-    133:133:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$13(com.android.tools.r8.ir.code.Value):977:977 -> c
-    134:134:java.util.Iterator lambda$blocks$15(java.util.function.Predicate):1010:1010 -> c
-    135:135:void returnMarkingColor(int):1253:1253 -> c
-    136:136:boolean com.android.tools.r8.ir.code.IRCode.isMarkingColorInUse(int):1259:1259 -> c
-    136:136:void returnMarkingColor(int):1253 -> c
-    137:137:void returnMarkingColor(int):1253:1253 -> c
+    120:120:java.util.Collection lambda$consistentPredecessorSuccessors$5(java.util.function.Function,com.android.tools.r8.ir.code.BasicBlock):771:771 -> c
+    121:127:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$12(com.android.tools.r8.ir.code.Value):966:966 -> c
+    133:133:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$12(com.android.tools.r8.ir.code.Value):972:972 -> c
+    134:134:java.util.Iterator lambda$blocks$14(java.util.function.Predicate):1005:1005 -> c
+    135:135:void returnMarkingColor(int):1248:1248 -> c
+    136:136:boolean com.android.tools.r8.ir.code.IRCode.isMarkingColorInUse(int):1254:1254 -> c
+    136:136:void returnMarkingColor(int):1248 -> c
+    137:137:void returnMarkingColor(int):1248:1248 -> c
     138:139:void com.android.tools.r8.ir.code.IRCode.clearMarks(int):483:484 -> c
-    138:139:void returnMarkingColor(int):1254 -> c
-    140:140:void returnMarkingColor(int):1255:1255 -> c
-    1:1:java.util.Collection lambda$consistentPredecessorSuccessors$7(java.util.function.Function,com.android.tools.r8.ir.code.BasicBlock):783:783 -> d
-    2:2:java.util.Iterator lambda$instructions$16(java.util.function.Predicate):1022:1022 -> d
-    3:9:java.util.List computeNormalExitBlocks():1034:1040 -> d
-    1:3:boolean consistentBlockNumbering():798:800 -> e
-    4:11:boolean verifySSATypeLattice(java.util.function.Predicate):996:1003 -> e
-    1:33:boolean consistentPredecessorSuccessors():752:784 -> f
-    34:34:java.util.function.Predicate wrapSSAVerifierWithStackValueHandling(java.util.function.Predicate):984:984 -> f
+    138:139:void returnMarkingColor(int):1249 -> c
+    140:140:void returnMarkingColor(int):1250:1250 -> c
+    1:1:java.util.Collection lambda$consistentPredecessorSuccessors$6(java.util.function.Function,com.android.tools.r8.ir.code.BasicBlock):778:778 -> d
+    2:2:java.util.Iterator lambda$instructions$15(java.util.function.Predicate):1017:1017 -> d
+    3:9:java.util.List computeNormalExitBlocks():1029:1035 -> d
+    1:3:boolean consistentBlockNumbering():793:795 -> e
+    4:11:boolean verifySSATypeLattice(java.util.function.Predicate):991:998 -> e
+    1:33:boolean consistentPredecessorSuccessors():747:779 -> f
+    34:34:java.util.function.Predicate wrapSSAVerifierWithStackValueHandling(java.util.function.Predicate):979:979 -> f
     1:1:com.android.tools.r8.graph.ProgramMethod context():155:155 -> g
-    1:1:com.android.tools.r8.ir.code.ConstNumber createConstNull():1172:1172 -> 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):1117:1117 -> h
-    2:2:com.android.tools.r8.ir.code.ConstNumber createConstNull():1172 -> h
-    1:1:boolean doAllThrowingInstructionsHavePositions():1180:1180 -> i
+    1:1:com.android.tools.r8.ir.code.ConstNumber createConstNull():1167:1167 -> 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):1112:1112 -> h
+    2:2:com.android.tools.r8.ir.code.ConstNumber createConstNull():1167 -> h
+    1:1:boolean doAllThrowingInstructionsHavePositions():1175:1175 -> i
     1:1:com.android.tools.r8.ir.code.BasicBlock entryBlock():164:164 -> j
-    1:1:int getCurrentBlockNumber():1163:1163 -> k
-    1:1:int getNextInstructionNumber():1070:1070 -> l
-    1:7:com.android.tools.r8.ir.code.Value getThis():1101:1107 -> m
-    1:9:java.util.Set getUnreachableBlocks():1314:1322 -> n
-    1:1:com.android.tools.r8.ir.code.InstructionIterator instructionIterator():1026:1026 -> o
-    1:1:java.lang.Iterable instructions():1014:1014 -> p
-    1:1:boolean isConsistentGraph():612:612 -> q
-    2:2:boolean com.android.tools.r8.ir.code.IRCode.noColorsInUse():1272:1272 -> q
-    2:2:boolean isConsistentGraph():612 -> q
-    3:5:boolean isConsistentGraph():612:614 -> q
-    6:7:boolean com.android.tools.r8.ir.code.IRCode.consistentCatchHandlers():791:792 -> q
-    6:7:boolean isConsistentGraph():615 -> q
-    8:8:boolean isConsistentGraph():616:616 -> q
-    9:12:boolean com.android.tools.r8.ir.code.IRCode.consistentBlockInstructions():810:813 -> q
-    9:12:boolean isConsistentGraph():616 -> q
-    13:17:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean):66:70 -> q
-    13:17:boolean com.android.tools.r8.ir.code.IRCode.consistentBlockInstructions():811 -> q
-    13:17:boolean isConsistentGraph():616 -> q
-    18:18:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalRead():0:0 -> q
-    18:18:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean):70 -> q
-    18:18:boolean com.android.tools.r8.ir.code.IRCode.consistentBlockInstructions():811 -> q
-    18:18:boolean isConsistentGraph():616 -> q
-    19:20:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean):70:71 -> q
-    19:20:boolean com.android.tools.r8.ir.code.IRCode.consistentBlockInstructions():811 -> q
-    19:20:boolean isConsistentGraph():616 -> q
-    21:21:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> q
-    21:21:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean):71 -> q
-    21:21:boolean com.android.tools.r8.ir.code.IRCode.consistentBlockInstructions():811 -> q
-    21:21:boolean isConsistentGraph():616 -> q
-    22:25:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean):72:75 -> q
-    22:25:boolean com.android.tools.r8.ir.code.IRCode.consistentBlockInstructions():811 -> q
-    22:25:boolean isConsistentGraph():616 -> q
-    26:30:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean):74:78 -> q
-    26:30:boolean com.android.tools.r8.ir.code.IRCode.consistentBlockInstructions():811 -> q
-    26:30:boolean isConsistentGraph():616 -> q
-    31:31:boolean isConsistentGraph():617:617 -> q
-    32:34:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():820:822 -> q
-    32:34:boolean isConsistentGraph():617 -> q
-    35:35:boolean com.android.tools.r8.ir.code.Instruction.isAnd():0:0 -> q
-    35:35:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():824 -> q
-    35:35:boolean isConsistentGraph():617 -> q
-    36:36:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():825:825 -> q
-    36:36:boolean isConsistentGraph():617 -> q
-    37:37:boolean com.android.tools.r8.ir.code.Instruction.isCheckCast():0:0 -> q
-    37:37:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():827 -> q
-    37:37:boolean isConsistentGraph():617 -> q
-    38:41:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():828:831 -> q
-    38:41:boolean isConsistentGraph():617 -> q
-    42:42:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> q
-    42:42:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():833 -> q
-    42:42:boolean isConsistentGraph():617 -> q
-    43:43:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():834:834 -> q
-    43:43:boolean isConsistentGraph():617 -> q
-    44:44:boolean com.android.tools.r8.ir.code.Instruction.isDebugPosition():0:0 -> q
-    44:44:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():836 -> q
-    44:44:boolean isConsistentGraph():617 -> q
-    45:45:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():837:837 -> q
-    45:45:boolean isConsistentGraph():617 -> q
-    46:46:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> q
-    46:46:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():839 -> q
-    46:46:boolean isConsistentGraph():617 -> q
-    47:47:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():840:840 -> q
-    47:47:boolean isConsistentGraph():617 -> q
-    48:48:boolean com.android.tools.r8.ir.code.Instruction.isDiv():0:0 -> q
-    48:48:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():842 -> q
-    48:48:boolean isConsistentGraph():617 -> q
-    49:49:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():843:843 -> q
-    49:49:boolean isConsistentGraph():617 -> q
-    50:50:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> q
-    50:50:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():845 -> q
-    50:50:boolean isConsistentGraph():617 -> q
-    51:54:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():846:849 -> q
-    51:54:boolean isConsistentGraph():617 -> q
-    55:55:boolean com.android.tools.r8.ir.code.Instruction.isInstanceOf():0:0 -> q
-    55:55:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():851 -> q
-    55:55:boolean isConsistentGraph():617 -> q
-    56:62:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():852:858 -> q
-    56:62:boolean isConsistentGraph():617 -> q
-    63:63:boolean com.android.tools.r8.ir.code.Instruction.isInvokeInterface():0:0 -> q
-    63:63:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():860 -> q
-    63:63:boolean isConsistentGraph():617 -> q
-    64:64:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():861:861 -> q
-    64:64:boolean isConsistentGraph():617 -> q
-    65:65:boolean com.android.tools.r8.ir.code.Instruction.isInvokePolymorphic():0:0 -> q
-    65:65:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():863 -> q
-    65:65:boolean isConsistentGraph():617 -> q
-    66:69:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():864:867 -> q
-    66:69:boolean isConsistentGraph():617 -> q
-    70:70:boolean com.android.tools.r8.ir.code.Instruction.isInvokeSuper():0:0 -> q
-    70:70:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():869 -> q
-    70:70:boolean isConsistentGraph():617 -> q
-    71:74:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():870:873 -> q
-    71:74:boolean isConsistentGraph():617 -> q
-    75:75:boolean com.android.tools.r8.ir.code.Instruction.isOr():0:0 -> q
-    75:75:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():875 -> q
-    75:75:boolean isConsistentGraph():617 -> q
-    76:76:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():876:876 -> q
-    76:76:boolean isConsistentGraph():617 -> q
-    77:77:boolean com.android.tools.r8.ir.code.Instruction.isMonitor():0:0 -> q
-    77:77:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():878 -> q
-    77:77:boolean isConsistentGraph():617 -> q
-    78:78:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():879:879 -> q
-    78:78:boolean isConsistentGraph():617 -> q
-    79:79:boolean com.android.tools.r8.ir.code.Instruction.isMul():0:0 -> q
-    79:79:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():881 -> q
-    79:79:boolean isConsistentGraph():617 -> q
-    80:83:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():882:885 -> q
-    80:83:boolean isConsistentGraph():617 -> q
-    84:84:boolean com.android.tools.r8.ir.code.Instruction.isRem():0:0 -> q
-    84:84:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():887 -> q
-    84:84:boolean isConsistentGraph():617 -> q
-    85:85:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():888:888 -> q
-    85:85:boolean isConsistentGraph():617 -> q
-    86:86:boolean com.android.tools.r8.ir.code.Instruction.isShl():0:0 -> q
-    86:86:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():890 -> q
-    86:86:boolean isConsistentGraph():617 -> q
-    87:87:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():891:891 -> q
-    87:87:boolean isConsistentGraph():617 -> q
-    88:88:boolean com.android.tools.r8.ir.code.Instruction.isShr():0:0 -> q
-    88:88:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():893 -> q
-    88:88:boolean isConsistentGraph():617 -> q
-    89:89:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():894:894 -> q
-    89:89:boolean isConsistentGraph():617 -> q
-    90:90:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> q
-    90:90:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():896 -> q
-    90:90:boolean isConsistentGraph():617 -> q
-    91:97:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():897:903 -> q
-    91:97:boolean isConsistentGraph():617 -> q
-    98:98:boolean com.android.tools.r8.ir.code.Instruction.isSub():0:0 -> q
-    98:98:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():905 -> q
-    98:98:boolean isConsistentGraph():617 -> q
-    99:99:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():906:906 -> q
-    99:99:boolean isConsistentGraph():617 -> q
-    100:100:boolean com.android.tools.r8.ir.code.Instruction.isUshr():0:0 -> q
-    100:100:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():908 -> q
-    100:100:boolean isConsistentGraph():617 -> q
-    101:101:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():909:909 -> q
-    101:101:boolean isConsistentGraph():617 -> q
-    102:102:boolean com.android.tools.r8.ir.code.Instruction.isXor():0:0 -> q
-    102:102:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():911 -> q
-    102:102:boolean isConsistentGraph():617 -> q
-    103:103:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():912:912 -> q
-    103:103:boolean isConsistentGraph():617 -> q
-    104:104:boolean isConsistentGraph():618:618 -> q
-    1:2:boolean isConsistentSSA():575:576 -> r
-    1:1:boolean isConsistentSSABeforeTypesAreCorrect():581:581 -> s
-    2:23:boolean com.android.tools.r8.ir.code.IRCode.consistentDefUseChains():675:696 -> s
-    2:23:boolean isConsistentSSABeforeTypesAreCorrect():582 -> s
-    24:24:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():102:102 -> s
-    24:24:boolean com.android.tools.r8.ir.code.IRCode.consistentDefUseChains():698 -> s
-    24:24:boolean isConsistentSSABeforeTypesAreCorrect():582 -> s
-    25:37:boolean com.android.tools.r8.ir.code.IRCode.consistentDefUseChains():698:710 -> s
-    25:37:boolean isConsistentSSABeforeTypesAreCorrect():582 -> s
-    38:38:boolean com.android.tools.r8.ir.code.IRCode.verifyValue(com.android.tools.r8.ir.code.Value):718:718 -> s
-    38:38:boolean com.android.tools.r8.ir.code.IRCode.consistentDefUseChains():710 -> s
-    38:38:boolean isConsistentSSABeforeTypesAreCorrect():582 -> s
-    39:39:boolean com.android.tools.r8.ir.code.IRCode.verifyPhi(com.android.tools.r8.ir.code.Phi):723:723 -> s
-    39:39:boolean com.android.tools.r8.ir.code.IRCode.verifyValue(com.android.tools.r8.ir.code.Value):718 -> s
-    39:39:boolean com.android.tools.r8.ir.code.IRCode.consistentDefUseChains():710 -> s
-    39:39:boolean isConsistentSSABeforeTypesAreCorrect():582 -> s
-    40:43:boolean com.android.tools.r8.ir.code.IRCode.verifyDefinition(com.android.tools.r8.ir.code.Value):728:731 -> s
-    40:43:boolean com.android.tools.r8.ir.code.IRCode.verifyValue(com.android.tools.r8.ir.code.Value):718 -> s
-    40:43:boolean com.android.tools.r8.ir.code.IRCode.consistentDefUseChains():710 -> s
-    40:43:boolean isConsistentSSABeforeTypesAreCorrect():582 -> s
-    44:44:boolean com.android.tools.r8.ir.code.IRCode.verifyDefinition(com.android.tools.r8.ir.code.Value):729:729 -> s
-    44:44:boolean com.android.tools.r8.ir.code.IRCode.verifyValue(com.android.tools.r8.ir.code.Value):718 -> s
-    44:44:boolean com.android.tools.r8.ir.code.IRCode.consistentDefUseChains():710 -> s
-    44:44:boolean isConsistentSSABeforeTypesAreCorrect():582 -> s
-    45:46:boolean com.android.tools.r8.ir.code.IRCode.consistentValueUses(com.android.tools.r8.ir.code.Value):736:737 -> s
-    45:46:boolean com.android.tools.r8.ir.code.IRCode.consistentDefUseChains():711 -> s
-    45:46:boolean isConsistentSSABeforeTypesAreCorrect():582 -> s
-    47:47:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():102:102 -> s
-    47:47:boolean com.android.tools.r8.ir.code.IRCode.consistentValueUses(com.android.tools.r8.ir.code.Value):737 -> s
-    47:47:boolean com.android.tools.r8.ir.code.IRCode.consistentDefUseChains():711 -> s
-    47:47:boolean isConsistentSSABeforeTypesAreCorrect():582 -> s
-    48:56:boolean com.android.tools.r8.ir.code.IRCode.consistentValueUses(com.android.tools.r8.ir.code.Value):737:745 -> s
-    48:56:boolean com.android.tools.r8.ir.code.IRCode.consistentDefUseChains():711 -> s
-    48:56:boolean isConsistentSSABeforeTypesAreCorrect():582 -> s
-    57:57:boolean isConsistentSSABeforeTypesAreCorrect():583:583 -> s
-    58:74:boolean com.android.tools.r8.ir.code.IRCode.validThrowingInstructions():920:936 -> s
-    58:74:boolean isConsistentSSABeforeTypesAreCorrect():583 -> s
-    75:75:boolean isConsistentSSABeforeTypesAreCorrect():584:584 -> s
-    76:87:boolean com.android.tools.r8.ir.code.IRCode.noCriticalEdges():646:657 -> s
-    76:87:boolean isConsistentSSABeforeTypesAreCorrect():584 -> s
-    88:89:boolean isConsistentSSABeforeTypesAreCorrect():584:585 -> s
-    1:1:com.android.tools.r8.ir.code.BasicBlockIterator listIterator():1044:1044 -> t
+    1:1:int getCurrentBlockNumber():1158:1158 -> k
+    1:1:int getNextInstructionNumber():1065:1065 -> l
+    1:1:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.code.IRCode.context():155:155 -> m
+    1:1:int getNumberOfArguments():1069 -> m
+    2:2:int getNumberOfArguments():1069:1069 -> m
+    3:3:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.code.IRCode.context():155:155 -> m
+    3:3:int getNumberOfArguments():1070 -> m
+    4:4:int getNumberOfArguments():1070:1070 -> m
+    1:7:com.android.tools.r8.ir.code.Value getThis():1096:1102 -> n
+    1:9:java.util.Set getUnreachableBlocks():1309:1317 -> o
+    1:1:com.android.tools.r8.ir.code.InstructionIterator instructionIterator():1021:1021 -> p
+    1:1:java.lang.Iterable instructions():1009:1009 -> q
+    1:1:boolean isConsistentGraph():608:608 -> r
+    2:2:boolean com.android.tools.r8.ir.code.IRCode.noColorsInUse():1267:1267 -> r
+    2:2:boolean isConsistentGraph():608 -> r
+    3:5:boolean isConsistentGraph():608:610 -> r
+    6:7:boolean com.android.tools.r8.ir.code.IRCode.consistentCatchHandlers():786:787 -> r
+    6:7:boolean isConsistentGraph():611 -> r
+    8:8:boolean isConsistentGraph():612:612 -> r
+    9:12:boolean com.android.tools.r8.ir.code.IRCode.consistentBlockInstructions():805:808 -> r
+    9:12:boolean isConsistentGraph():612 -> r
+    13:17:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean):66:70 -> r
+    13:17:boolean com.android.tools.r8.ir.code.IRCode.consistentBlockInstructions():806 -> r
+    13:17:boolean isConsistentGraph():612 -> r
+    18:18:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalRead():0:0 -> r
+    18:18:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean):70 -> r
+    18:18:boolean com.android.tools.r8.ir.code.IRCode.consistentBlockInstructions():806 -> r
+    18:18:boolean isConsistentGraph():612 -> r
+    19:20:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean):70:71 -> r
+    19:20:boolean com.android.tools.r8.ir.code.IRCode.consistentBlockInstructions():806 -> r
+    19:20:boolean isConsistentGraph():612 -> r
+    21:21:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> r
+    21:21:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean):71 -> r
+    21:21:boolean com.android.tools.r8.ir.code.IRCode.consistentBlockInstructions():806 -> r
+    21:21:boolean isConsistentGraph():612 -> r
+    22:25:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean):72:75 -> r
+    22:25:boolean com.android.tools.r8.ir.code.IRCode.consistentBlockInstructions():806 -> r
+    22:25:boolean isConsistentGraph():612 -> r
+    26:30:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean):74:78 -> r
+    26:30:boolean com.android.tools.r8.ir.code.IRCode.consistentBlockInstructions():806 -> r
+    26:30:boolean isConsistentGraph():612 -> r
+    31:31:boolean isConsistentGraph():613:613 -> r
+    32:34:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():815:817 -> r
+    32:34:boolean isConsistentGraph():613 -> r
+    35:35:boolean com.android.tools.r8.ir.code.Instruction.isAnd():0:0 -> r
+    35:35:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():819 -> r
+    35:35:boolean isConsistentGraph():613 -> r
+    36:36:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():820:820 -> r
+    36:36:boolean isConsistentGraph():613 -> r
+    37:37:boolean com.android.tools.r8.ir.code.Instruction.isCheckCast():0:0 -> r
+    37:37:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():822 -> r
+    37:37:boolean isConsistentGraph():613 -> r
+    38:41:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():823:826 -> r
+    38:41:boolean isConsistentGraph():613 -> r
+    42:42:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> r
+    42:42:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():828 -> r
+    42:42:boolean isConsistentGraph():613 -> r
+    43:43:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():829:829 -> r
+    43:43:boolean isConsistentGraph():613 -> r
+    44:44:boolean com.android.tools.r8.ir.code.Instruction.isDebugPosition():0:0 -> r
+    44:44:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():831 -> r
+    44:44:boolean isConsistentGraph():613 -> r
+    45:45:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():832:832 -> r
+    45:45:boolean isConsistentGraph():613 -> r
+    46:46:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> r
+    46:46:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():834 -> r
+    46:46:boolean isConsistentGraph():613 -> r
+    47:47:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():835:835 -> r
+    47:47:boolean isConsistentGraph():613 -> r
+    48:48:boolean com.android.tools.r8.ir.code.Instruction.isDiv():0:0 -> r
+    48:48:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():837 -> r
+    48:48:boolean isConsistentGraph():613 -> r
+    49:49:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():838:838 -> r
+    49:49:boolean isConsistentGraph():613 -> r
+    50:50:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> r
+    50:50:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():840 -> r
+    50:50:boolean isConsistentGraph():613 -> r
+    51:54:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():841:844 -> r
+    51:54:boolean isConsistentGraph():613 -> r
+    55:55:boolean com.android.tools.r8.ir.code.Instruction.isInstanceOf():0:0 -> r
+    55:55:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():846 -> r
+    55:55:boolean isConsistentGraph():613 -> r
+    56:62:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():847:853 -> r
+    56:62:boolean isConsistentGraph():613 -> r
+    63:63:boolean com.android.tools.r8.ir.code.Instruction.isInvokeInterface():0:0 -> r
+    63:63:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():855 -> r
+    63:63:boolean isConsistentGraph():613 -> r
+    64:64:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():856:856 -> r
+    64:64:boolean isConsistentGraph():613 -> r
+    65:65:boolean com.android.tools.r8.ir.code.Instruction.isInvokePolymorphic():0:0 -> r
+    65:65:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():858 -> r
+    65:65:boolean isConsistentGraph():613 -> r
+    66:69:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():859:862 -> r
+    66:69:boolean isConsistentGraph():613 -> r
+    70:70:boolean com.android.tools.r8.ir.code.Instruction.isInvokeSuper():0:0 -> r
+    70:70:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():864 -> r
+    70:70:boolean isConsistentGraph():613 -> r
+    71:74:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():865:868 -> r
+    71:74:boolean isConsistentGraph():613 -> r
+    75:75:boolean com.android.tools.r8.ir.code.Instruction.isOr():0:0 -> r
+    75:75:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():870 -> r
+    75:75:boolean isConsistentGraph():613 -> r
+    76:76:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():871:871 -> r
+    76:76:boolean isConsistentGraph():613 -> r
+    77:77:boolean com.android.tools.r8.ir.code.Instruction.isMonitor():0:0 -> r
+    77:77:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():873 -> r
+    77:77:boolean isConsistentGraph():613 -> r
+    78:78:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():874:874 -> r
+    78:78:boolean isConsistentGraph():613 -> r
+    79:79:boolean com.android.tools.r8.ir.code.Instruction.isMul():0:0 -> r
+    79:79:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():876 -> r
+    79:79:boolean isConsistentGraph():613 -> r
+    80:83:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():877:880 -> r
+    80:83:boolean isConsistentGraph():613 -> r
+    84:84:boolean com.android.tools.r8.ir.code.Instruction.isRem():0:0 -> r
+    84:84:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():882 -> r
+    84:84:boolean isConsistentGraph():613 -> r
+    85:85:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():883:883 -> r
+    85:85:boolean isConsistentGraph():613 -> r
+    86:86:boolean com.android.tools.r8.ir.code.Instruction.isShl():0:0 -> r
+    86:86:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():885 -> r
+    86:86:boolean isConsistentGraph():613 -> r
+    87:87:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():886:886 -> r
+    87:87:boolean isConsistentGraph():613 -> r
+    88:88:boolean com.android.tools.r8.ir.code.Instruction.isShr():0:0 -> r
+    88:88:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():888 -> r
+    88:88:boolean isConsistentGraph():613 -> r
+    89:89:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():889:889 -> r
+    89:89:boolean isConsistentGraph():613 -> r
+    90:90:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> r
+    90:90:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():891 -> r
+    90:90:boolean isConsistentGraph():613 -> r
+    91:97:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():892:898 -> r
+    91:97:boolean isConsistentGraph():613 -> r
+    98:98:boolean com.android.tools.r8.ir.code.Instruction.isSub():0:0 -> r
+    98:98:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():900 -> r
+    98:98:boolean isConsistentGraph():613 -> r
+    99:99:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():901:901 -> r
+    99:99:boolean isConsistentGraph():613 -> r
+    100:100:boolean com.android.tools.r8.ir.code.Instruction.isUshr():0:0 -> r
+    100:100:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():903 -> r
+    100:100:boolean isConsistentGraph():613 -> r
+    101:101:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():904:904 -> r
+    101:101:boolean isConsistentGraph():613 -> r
+    102:102:boolean com.android.tools.r8.ir.code.Instruction.isXor():0:0 -> r
+    102:102:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():906 -> r
+    102:102:boolean isConsistentGraph():613 -> r
+    103:103:boolean com.android.tools.r8.ir.code.IRCode.consistentMetadata():907:907 -> r
+    103:103:boolean isConsistentGraph():613 -> r
+    104:104:boolean isConsistentGraph():614:614 -> r
+    1:2:boolean isConsistentSSA():575:576 -> s
+    1:1:boolean isConsistentSSABeforeTypesAreCorrect():581:581 -> t
+    2:22:boolean com.android.tools.r8.ir.code.IRCode.consistentDefUseChains():671:691 -> t
+    2:22:boolean isConsistentSSABeforeTypesAreCorrect():582 -> t
+    23:23:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():102:102 -> t
+    23:23:boolean com.android.tools.r8.ir.code.IRCode.consistentDefUseChains():693 -> t
+    23:23:boolean isConsistentSSABeforeTypesAreCorrect():582 -> t
+    24:36:boolean com.android.tools.r8.ir.code.IRCode.consistentDefUseChains():693:705 -> t
+    24:36:boolean isConsistentSSABeforeTypesAreCorrect():582 -> t
+    37:37:boolean com.android.tools.r8.ir.code.IRCode.verifyValue(com.android.tools.r8.ir.code.Value):713:713 -> t
+    37:37:boolean com.android.tools.r8.ir.code.IRCode.consistentDefUseChains():705 -> t
+    37:37:boolean isConsistentSSABeforeTypesAreCorrect():582 -> t
+    38:38:boolean com.android.tools.r8.ir.code.IRCode.verifyPhi(com.android.tools.r8.ir.code.Phi):718:718 -> t
+    38:38:boolean com.android.tools.r8.ir.code.IRCode.verifyValue(com.android.tools.r8.ir.code.Value):713 -> t
+    38:38:boolean com.android.tools.r8.ir.code.IRCode.consistentDefUseChains():705 -> t
+    38:38:boolean isConsistentSSABeforeTypesAreCorrect():582 -> t
+    39:42:boolean com.android.tools.r8.ir.code.IRCode.verifyDefinition(com.android.tools.r8.ir.code.Value):723:726 -> t
+    39:42:boolean com.android.tools.r8.ir.code.IRCode.verifyValue(com.android.tools.r8.ir.code.Value):713 -> t
+    39:42:boolean com.android.tools.r8.ir.code.IRCode.consistentDefUseChains():705 -> t
+    39:42:boolean isConsistentSSABeforeTypesAreCorrect():582 -> t
+    43:43:boolean com.android.tools.r8.ir.code.IRCode.verifyDefinition(com.android.tools.r8.ir.code.Value):724:724 -> t
+    43:43:boolean com.android.tools.r8.ir.code.IRCode.verifyValue(com.android.tools.r8.ir.code.Value):713 -> t
+    43:43:boolean com.android.tools.r8.ir.code.IRCode.consistentDefUseChains():705 -> t
+    43:43:boolean isConsistentSSABeforeTypesAreCorrect():582 -> t
+    44:45:boolean com.android.tools.r8.ir.code.IRCode.consistentValueUses(com.android.tools.r8.ir.code.Value):731:732 -> t
+    44:45:boolean com.android.tools.r8.ir.code.IRCode.consistentDefUseChains():706 -> t
+    44:45:boolean isConsistentSSABeforeTypesAreCorrect():582 -> t
+    46:46:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():102:102 -> t
+    46:46:boolean com.android.tools.r8.ir.code.IRCode.consistentValueUses(com.android.tools.r8.ir.code.Value):732 -> t
+    46:46:boolean com.android.tools.r8.ir.code.IRCode.consistentDefUseChains():706 -> t
+    46:46:boolean isConsistentSSABeforeTypesAreCorrect():582 -> t
+    47:55:boolean com.android.tools.r8.ir.code.IRCode.consistentValueUses(com.android.tools.r8.ir.code.Value):732:740 -> t
+    47:55:boolean com.android.tools.r8.ir.code.IRCode.consistentDefUseChains():706 -> t
+    47:55:boolean isConsistentSSABeforeTypesAreCorrect():582 -> t
+    56:56:boolean isConsistentSSABeforeTypesAreCorrect():583:583 -> t
+    57:73:boolean com.android.tools.r8.ir.code.IRCode.validThrowingInstructions():915:931 -> t
+    57:73:boolean isConsistentSSABeforeTypesAreCorrect():583 -> t
+    74:74:boolean isConsistentSSABeforeTypesAreCorrect():584:584 -> t
+    75:86:boolean com.android.tools.r8.ir.code.IRCode.noCriticalEdges():642:653 -> t
+    75:86:boolean isConsistentSSABeforeTypesAreCorrect():584 -> t
+    87:88:boolean isConsistentSSABeforeTypesAreCorrect():584:585 -> t
     1:7:java.lang.String toString():473:479 -> toString
-    1:1:com.android.tools.r8.ir.code.IRMetadata metadata():151:151 -> u
-    1:1:com.android.tools.r8.graph.DexEncodedMethod method():160:160 -> v
-    1:3:com.android.tools.r8.com.google.common.collect.ImmutableList numberInstructions():1052:1054 -> w
-    1:7:int numberRemainingInstructions():1060:1066 -> x
-    1:23:void prepareBlocksForCatchHandlers():333:355 -> y
-    24:24:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1159:1159 -> y
-    24:24:void prepareBlocksForCatchHandlers():356 -> y
-    25:26:void prepareBlocksForCatchHandlers():356:357 -> 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():357 -> y
-    29:35:void prepareBlocksForCatchHandlers():358:364 -> y
-    1:1:boolean removeAllDeadAndTrivialPhis():1201:1201 -> z
-com.android.tools.r8.ir.code.IRCode$BlockMarker -> com.android.tools.r8.internal.fe$a:
+    1:1:com.android.tools.r8.ir.code.BasicBlockIterator listIterator():1039:1039 -> u
+    1:1:com.android.tools.r8.ir.code.IRMetadata metadata():151:151 -> v
+    1:1:com.android.tools.r8.graph.DexEncodedMethod method():160:160 -> w
+    1:3:com.android.tools.r8.com.google.common.collect.ImmutableList numberInstructions():1047:1049 -> x
+    1:7:int numberRemainingInstructions():1055:1061 -> y
+    1:23:void prepareBlocksForCatchHandlers():333:355 -> z
+    24:24:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1154:1154 -> z
+    24:24:void prepareBlocksForCatchHandlers():356 -> z
+    25:26:void prepareBlocksForCatchHandlers():356:357 -> z
+    27:28:void com.android.tools.r8.ir.code.Goto.<init>(com.android.tools.r8.ir.code.BasicBlock):21:22 -> z
+    27:28:void prepareBlocksForCatchHandlers():357 -> z
+    29:35:void prepareBlocksForCatchHandlers():358:364 -> z
+com.android.tools.r8.ir.code.IRCode$BlockMarker -> com.android.tools.r8.internal.sd$a:
     com.android.tools.r8.ir.code.BasicBlock block -> a
     1:2:void <init>(com.android.tools.r8.ir.code.BasicBlock):100:101 -> <init>
-com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets -> com.android.tools.r8.internal.fe$b:
+com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets -> com.android.tools.r8.internal.sd$b:
     java.util.Deque liveStackValues -> d
     java.util.Set liveLocalValues -> c
     java.util.Set liveValues -> b
@@ -31058,7 +31020,7 @@
     1:5:void <init>(java.util.Set,java.util.Set,java.util.Deque):73:77 -> <init>
     1:2:boolean equals(java.lang.Object):87:88 -> equals
     1:1:int hashCode():82:82 -> hashCode
-com.android.tools.r8.ir.code.IRCodeInstructionIterator -> com.android.tools.r8.internal.ge:
+com.android.tools.r8.ir.code.IRCodeInstructionIterator -> com.android.tools.r8.internal.td:
     java.util.ListIterator blockIterator -> b
     com.android.tools.r8.ir.code.IRCode code -> d
     com.android.tools.r8.ir.code.InstructionListIterator instructionIterator -> c
@@ -31073,7 +31035,7 @@
     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.he:
+com.android.tools.r8.ir.code.IRCodeInstructionListIterator -> com.android.tools.r8.internal.ud:
     java.util.ListIterator blockIterator -> b
     com.android.tools.r8.ir.code.IRCode code -> d
     com.android.tools.r8.ir.code.InstructionListIterator instructionIterator -> c
@@ -31087,38 +31049,37 @@
     5:5: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):61:61 -> a
     6:6:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):66:66 -> a
     7:7:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):78:78 -> a
-    8:8:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):95:95 -> a
-    9:9:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):105:105 -> a
-    10:10:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):111:111 -> a
-    11:11:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):116:116 -> a
-    12:12:com.android.tools.r8.ir.code.BasicBlock splitCopyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):122:122 -> a
-    13:13: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):133:133 -> a
-    14:14:void addThrowingInstructionToPossiblyThrowingBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.utils.InternalOptions):194:194 -> a
-    15:15:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):210:210 -> a
-    16:16:void setInsertionPosition(com.android.tools.r8.ir.code.Position):225:225 -> a
+    8:8:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):94:94 -> a
+    9:9:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):100:100 -> a
+    10:10:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):105:105 -> a
+    11:11:com.android.tools.r8.ir.code.BasicBlock splitCopyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):111:111 -> a
+    12:12: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):122:122 -> a
+    13:13:void addThrowingInstructionToPossiblyThrowingBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.utils.InternalOptions):183:183 -> a
+    14:14:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):199:199 -> a
+    15:15:void setInsertionPosition(com.android.tools.r8.ir.code.Position):214:214 -> a
     1:1:void add(java.lang.Object):22:22 -> add
-    2:2:void com.android.tools.r8.ir.code.IRCodeInstructionListIterator.add(com.android.tools.r8.ir.code.Instruction):185:185 -> add
+    2:2:void com.android.tools.r8.ir.code.IRCodeInstructionListIterator.add(com.android.tools.r8.ir.code.Instruction):174:174 -> add
     2:2:void add(java.lang.Object):22 -> add
     1:1:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):72:72 -> b
-    1:1:boolean hasNext():138:138 -> hasNext
-    1:1:boolean hasPrevious():156:156 -> hasPrevious
-    1:1:void unsetInsertionPosition():230:230 -> i
-    1:1:void removeOrReplaceByDebugLocalRead():215:215 -> j
+    1:1:boolean hasNext():127:127 -> hasNext
+    1:1:boolean hasPrevious():145:145 -> hasPrevious
+    1:1:void unsetInsertionPosition():219:219 -> i
+    1:1:void removeOrReplaceByDebugLocalRead():204:204 -> j
     1:1:void removeInstructionIgnoreOutValue():84:84 -> m
-    1:9:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.IRCodeInstructionListIterator.next():143:151 -> next
+    1:9:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.IRCodeInstructionListIterator.next():132:140 -> next
     1:9:java.lang.Object next():22 -> next
-    10:10:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.IRCodeInstructionListIterator.next():147:147 -> next
+    10:10:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.IRCodeInstructionListIterator.next():136:136 -> next
     10:10:java.lang.Object next():22 -> next
-    1:1:int nextIndex():175:175 -> nextIndex
+    1:1:int nextIndex():164:164 -> nextIndex
     1:1:java.lang.Object previous():22:22 -> previous
-    2:11:com.android.tools.r8.ir.code.Instruction previous():161:170 -> previous
-    12:12:com.android.tools.r8.ir.code.Instruction previous():165:165 -> previous
-    1:1:int previousIndex():180:180 -> previousIndex
-    1:1:void remove():200:200 -> remove
+    2:11:com.android.tools.r8.ir.code.Instruction previous():150:159 -> previous
+    12:12:com.android.tools.r8.ir.code.Instruction previous():154:154 -> previous
+    1:1:int previousIndex():169:169 -> previousIndex
+    1:1:void remove():189:189 -> remove
     1:1:void set(java.lang.Object):22:22 -> set
-    2:2:void com.android.tools.r8.ir.code.IRCodeInstructionListIterator.set(com.android.tools.r8.ir.code.Instruction):205:205 -> set
+    2:2:void com.android.tools.r8.ir.code.IRCodeInstructionListIterator.set(com.android.tools.r8.ir.code.Instruction):194:194 -> set
     2:2:void set(java.lang.Object):22 -> set
-com.android.tools.r8.ir.code.IRCodeUtils -> com.android.tools.r8.internal.ie:
+com.android.tools.r8.ir.code.IRCodeUtils -> com.android.tools.r8.internal.vd:
     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
@@ -31136,7 +31097,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.je:
+com.android.tools.r8.ir.code.IRMetadata -> com.android.tools.r8.internal.wd:
     long first -> b
     long second -> c
     boolean $assertionsDisabled -> a
@@ -31256,7 +31217,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.te:
+com.android.tools.r8.ir.code.If -> com.android.tools.r8.internal.Fd:
     boolean $assertionsDisabled -> i
     int $r8$clinit -> j
     com.android.tools.r8.ir.code.If$Type type -> k
@@ -31264,9 +31225,9 @@
     1:2:void <init>(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.Value):73:74 -> <init>
     3:4:void <init>(com.android.tools.r8.ir.code.If$Type,java.util.List):78:79 -> <init>
     com.android.tools.r8.ir.code.If asIf() -> H
-    1:1:int maxInValueRegister():182:182 -> W1
-    1:1:int maxOutValueRegister():187:187 -> X1
-    int opcode() -> Y1
+    1:1:int maxInValueRegister():182:182 -> V1
+    1:1:int maxOutValueRegister():187:187 -> W1
+    int opcode() -> X1
     1:1:boolean verifyTypeCompatible(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.code.If$Type):65:65 -> a
     2:2:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> a
     2:2:boolean verifyTypeCompatible(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.code.If$Type):65 -> a
@@ -31289,25 +31250,25 @@
     28:28:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):241:241 -> b
     29:29:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):239:239 -> b
     30:30:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):237:237 -> b
+    1:4:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():140:143 -> b2
     1:4:void setTrueTarget(com.android.tools.r8.ir.code.BasicBlock):132:135 -> c
-    1:4:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():140:143 -> c2
-    1:4:com.android.tools.r8.ir.code.BasicBlock getTrueTarget():125:128 -> d2
-    1:1:com.android.tools.r8.ir.code.If$Type getType():114:114 -> e2
-    1:2:void invert():118:119 -> f2
-    3:4:void com.android.tools.r8.ir.code.If.setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):148:149 -> f2
-    3:4:void invert():120 -> f2
-    5:5:void invert():121:121 -> f2
-    1:1:boolean isZeroTest():101:101 -> g2
-    1:1:com.android.tools.r8.ir.code.Value lhs():105:105 -> h2
-    1:2:com.android.tools.r8.ir.code.Value rhs():109:110 -> i2
-    1:3:com.android.tools.r8.ir.code.BasicBlock targetFromNonNullObject():222:224 -> j2
-    1:3:com.android.tools.r8.ir.code.BasicBlock targetFromNullObject():228:230 -> k2
-    boolean isIf() -> t1
+    1:4:com.android.tools.r8.ir.code.BasicBlock getTrueTarget():125:128 -> c2
+    1:1:com.android.tools.r8.ir.code.If$Type getType():114:114 -> d2
+    1:2:void invert():118:119 -> e2
+    3:4:void com.android.tools.r8.ir.code.If.setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):148:149 -> e2
+    3:4:void invert():120 -> e2
+    5:5:void invert():121:121 -> e2
+    1:1:boolean isZeroTest():101:101 -> f2
+    1:1:com.android.tools.r8.ir.code.Value lhs():105:105 -> g2
+    1:2:com.android.tools.r8.ir.code.Value rhs():109:110 -> h2
+    1:3:com.android.tools.r8.ir.code.BasicBlock targetFromNonNullObject():222:224 -> i2
+    1:3:com.android.tools.r8.ir.code.BasicBlock targetFromNullObject():228:230 -> j2
+    boolean isIf() -> s1
     1:8:java.lang.String toString():169:176 -> toString
-com.android.tools.r8.ir.code.If$1 -> com.android.tools.r8.internal.te$a:
+com.android.tools.r8.ir.code.If$1 -> com.android.tools.r8.internal.Fd$a:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
     1:1:void <clinit>():27:27 -> <clinit>
-com.android.tools.r8.ir.code.If$Type -> com.android.tools.r8.internal.te$b:
+com.android.tools.r8.ir.code.If$Type -> com.android.tools.r8.internal.Fd$b:
     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
@@ -31330,17 +31291,17 @@
     19:27:com.android.tools.r8.ir.code.If$Type inverted():49:57 -> b
     28:28:com.android.tools.r8.ir.code.If$Type inverted():47:47 -> b
     1:1:com.android.tools.r8.ir.code.If$Type[] values():22:22 -> c
-com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction -> com.android.tools.r8.internal.nf:
+com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction -> com.android.tools.r8.internal.ze:
     void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver) -> a
     com.android.tools.r8.ir.code.MemberType getMemberType() -> b
-com.android.tools.r8.ir.code.Inc -> com.android.tools.r8.internal.of:
+com.android.tools.r8.ir.code.Inc -> com.android.tools.r8.internal.Ae:
     int increment -> i
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():20:20 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,int):25:27 -> <init>
-    int maxInValueRegister() -> W1
-    int maxOutValueRegister() -> X1
-    int opcode() -> Y1
+    int maxInValueRegister() -> V1
+    int maxOutValueRegister() -> W1
+    int opcode() -> X1
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):37:37 -> a
     2:2:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):70:70 -> a
     3:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75:75 -> a
@@ -31349,17 +31310,17 @@
     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.wf:
+com.android.tools.r8.ir.code.InitClass -> com.android.tools.r8.internal.Ie:
     com.android.tools.r8.graph.DexType clazz -> i
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():26:26 -> <clinit>
     1:5:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):31:35 -> <init>
     com.android.tools.r8.ir.code.InitClass asInitClass() -> I
     boolean hasInvariantOutType() -> N0
-    boolean instructionTypeCanThrow() -> V0
-    int maxInValueRegister() -> W1
-    int maxOutValueRegister() -> X1
-    int opcode() -> Y1
+    boolean instructionTypeCanThrow() -> U0
+    int maxInValueRegister() -> V1
+    int maxOutValueRegister() -> W1
+    int opcode() -> X1
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):58:58 -> a
     2:2:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):68:68 -> a
     3:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):73:74 -> a
@@ -31372,13 +31333,16 @@
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isInitClass():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):95 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):95:95 -> b
-    4:16:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):101:113 -> b
-    1:1:com.android.tools.r8.ir.code.InitClass$Builder builder():39:39 -> c2
+    4:6:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):101:103 -> b
+    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> b
+    7:7:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):103 -> b
+    8:12:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):109:113 -> b
+    1:1:com.android.tools.r8.ir.code.InitClass$Builder builder():39:39 -> b2
+    1:1:com.android.tools.r8.graph.DexType getClassValue():43:43 -> c2
     1:8:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):127:134 -> d
-    1:1:com.android.tools.r8.graph.DexType getClassValue():43:43 -> d2
     1:1:java.lang.String toString():171:171 -> toString
-com.android.tools.r8.ir.code.InitClass$1 -> com.android.tools.r8.internal.uf:
-com.android.tools.r8.ir.code.InitClass$Builder -> com.android.tools.r8.internal.vf:
+com.android.tools.r8.ir.code.InitClass$1 -> com.android.tools.r8.internal.Ge:
+com.android.tools.r8.ir.code.InitClass$Builder -> com.android.tools.r8.internal.He:
     com.android.tools.r8.graph.DexType type -> c
     1:1:void <init>(com.android.tools.r8.ir.code.InitClass$1):174:174 -> <init>
     2:2:void <init>():178:178 -> <init>
@@ -31387,19 +31351,19 @@
     1:1:com.android.tools.r8.ir.code.InitClass build():187:187 -> 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):1565:1566 -> b
     2:3:com.android.tools.r8.ir.code.InitClass build():187 -> b
-com.android.tools.r8.ir.code.InstanceFieldInstruction -> com.android.tools.r8.internal.Tf:
+com.android.tools.r8.ir.code.InstanceFieldInstruction -> com.android.tools.r8.internal.ff:
     com.android.tools.r8.ir.code.Value object() -> c
-com.android.tools.r8.ir.code.InstanceGet -> com.android.tools.r8.internal.Wf:
+com.android.tools.r8.ir.code.InstanceGet -> com.android.tools.r8.internal.if:
     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>
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():210:210 -> G0
     com.android.tools.r8.ir.code.InstanceFieldInstruction asInstanceFieldInstruction() -> J
     com.android.tools.r8.ir.code.InstanceGet asInstanceGet() -> K
-    boolean instructionTypeCanThrow() -> V0
-    int maxInValueRegister() -> W1
-    int maxOutValueRegister() -> X1
-    int opcode() -> Y1
+    boolean instructionTypeCanThrow() -> U0
+    int maxInValueRegister() -> V1
+    int maxOutValueRegister() -> W1
+    int opcode() -> X1
     1:1:boolean outTypeKnownToBeBoolean(java.util.Set):48:48 -> a
     2:2:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):53:53 -> a
     3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.InstanceGet.dest():57:57 -> a
@@ -31421,24 +31385,24 @@
     74:77:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):193:193 -> a
     78:78:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):200:200 -> a
     79:79: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):220:220 -> a
+    boolean throwsOnNullInput() -> a2
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):137:137 -> b
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):137 -> b
     3:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):140:141 -> b
-    boolean throwsOnNullInput() -> b2
     1:2:com.android.tools.r8.ir.code.Value object():62:63 -> c
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-    1:1:com.android.tools.r8.ir.code.Value value():68:68 -> e2
+    1:1:com.android.tools.r8.ir.code.Value value():68:68 -> d2
     1:1:java.lang.String toString():172:172 -> toString
-com.android.tools.r8.ir.code.InstanceOf -> com.android.tools.r8.internal.Zf:
+com.android.tools.r8.ir.code.InstanceOf -> com.android.tools.r8.internal.lf:
     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
     boolean hasInvariantOutType() -> N0
-    boolean instructionTypeCanThrow() -> V0
-    int maxInValueRegister() -> W1
-    int maxOutValueRegister() -> X1
-    int opcode() -> Y1
+    boolean instructionTypeCanThrow() -> U0
+    int maxInValueRegister() -> V1
+    int maxOutValueRegister() -> W1
+    int opcode() -> X1
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36:36 -> a
     2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.InstanceOf.dest():44:44 -> a
     2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):53 -> a
@@ -31451,51 +31415,51 @@
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isInstanceOf():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):75 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):75:75 -> b
-    1:1:com.android.tools.r8.graph.DexType type():40:40 -> c2
+    1:1:com.android.tools.r8.graph.DexType type():40:40 -> b2
+    1:1:com.android.tools.r8.ir.code.Value value():48:48 -> c2
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-    1:1:com.android.tools.r8.ir.code.Value value():48:48 -> d2
     1:2:java.lang.String toString():127:128 -> toString
-com.android.tools.r8.ir.code.InstancePut -> com.android.tools.r8.internal.ag:
+com.android.tools.r8.ir.code.InstancePut -> com.android.tools.r8.internal.mf:
     boolean $assertionsDisabled -> j
-    1:1:void <clinit>():35:35 -> <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):38:38 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,boolean):50:53 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():241:241 -> G0
+    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>
+    2:5:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,boolean):49:52 -> <init>
+    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():239:239 -> G0
     com.android.tools.r8.ir.code.InstanceFieldInstruction asInstanceFieldInstruction() -> J
     com.android.tools.r8.ir.code.InstancePut asInstancePut() -> M
-    boolean instructionTypeCanThrow() -> V0
-    int maxInValueRegister() -> W1
-    1:1:int maxOutValueRegister():182:182 -> X1
-    int opcode() -> Y1
-    1:1:com.android.tools.r8.ir.code.InstancePut createPotentiallyInvalid(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):46:46 -> a
-    2:2:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):64:64 -> a
-    3:31:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):80:108 -> a
-    32:32:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):105:105 -> a
-    33:33:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):102:102 -> a
-    34:34:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):99:99 -> a
-    35:35:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):96:96 -> a
-    36:36:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):93:93 -> a
-    37:37:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):90:90 -> a
-    38:62:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):86:110 -> a
-    63:74:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):121:132 -> a
-    75:75:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.type():94:94 -> a
-    75:75:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):134 -> a
-    76:81:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):134:139 -> a
-    82:92:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):148:158 -> a
-    93:93:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):189:189 -> a
-    94:94:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):219:219 -> a
-    95:98:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):224:224 -> a
-    99:99:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):231:231 -> a
-    100:100: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):251:251 -> a
-    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):168:172 -> b
-    boolean throwsOnNullInput() -> b2
-    1:1:com.android.tools.r8.ir.code.Value object():69:69 -> c
+    boolean instructionTypeCanThrow() -> U0
+    int maxInValueRegister() -> V1
+    1:1:int maxOutValueRegister():180:180 -> W1
+    int opcode() -> X1
+    1:1:com.android.tools.r8.ir.code.InstancePut createPotentiallyInvalid(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):45:45 -> a
+    2:2:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):63:63 -> a
+    3:31:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):79:107 -> a
+    32:32:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):104:104 -> a
+    33:33:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):101:101 -> a
+    34:34:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):98:98 -> a
+    35:35:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):95:95 -> a
+    36:36:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):92:92 -> a
+    37:37:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):89:89 -> a
+    38:62:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):85:109 -> a
+    63:73:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):120:130 -> a
+    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.type():88:88 -> a
+    74:74:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):132 -> a
+    75:80:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):132:137 -> a
+    81:91:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):146:156 -> a
+    92:92:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):187:187 -> a
+    93:93:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):217:217 -> a
+    94:97:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):222:222 -> a
+    98:98:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):229:229 -> a
+    99:99: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):249:249 -> a
+    boolean throwsOnNullInput() -> a2
+    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):166:170 -> b
+    1:1:com.android.tools.r8.ir.code.Value object():68:68 -> c
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-    1:1:com.android.tools.r8.ir.code.Value value():74:74 -> e2
-    1:1:java.lang.String toString():214:214 -> toString
-    boolean isInstanceFieldInstruction() -> u1
-    boolean isInstancePut() -> v1
-com.android.tools.r8.ir.code.Instruction -> com.android.tools.r8.internal.dg:
+    1:1:com.android.tools.r8.ir.code.Value value():73:73 -> d2
+    boolean isInstanceFieldInstruction() -> t1
+    1:1:java.lang.String toString():212:212 -> toString
+    boolean isInstancePut() -> u1
+com.android.tools.r8.ir.code.Instruction -> com.android.tools.r8.internal.pf:
     com.android.tools.r8.ir.code.Position position -> g
     java.util.List inValues -> c
     java.util.Set debugValues -> f
@@ -31512,85 +31476,85 @@
     27:49:void <init>(com.android.tools.r8.ir.code.Value,java.util.List):48:70 -> <init>
     com.android.tools.r8.ir.code.DebugLocalsChange asDebugLocalsChange() -> A
     com.android.tools.r8.ir.code.Xor asXor() -> A0
-    boolean isInvokeMethod() -> A1
+    1:1:boolean com.android.tools.r8.ir.code.Instruction.isInvokeInterface():0:0 -> A1
+    1:1:boolean isInvokeMethodWithDynamicDispatch():1209 -> A1
+    2:2:boolean isInvokeMethodWithDynamicDispatch():1209:1209 -> A1
     com.android.tools.r8.ir.code.DebugPosition asDebugPosition() -> B
     1:2:void clearBlock():303:304 -> B0
-    1:1:boolean com.android.tools.r8.ir.code.Instruction.isInvokeInterface():0:0 -> B1
-    1:1:boolean isInvokeMethodWithDynamicDispatch():1209 -> B1
-    2:2:boolean isInvokeMethodWithDynamicDispatch():1209:1209 -> B1
+    boolean isInvokeMethodWithReceiver() -> B1
     com.android.tools.r8.ir.code.DexItemBasedConstString asDexItemBasedConstString() -> C
     1:5:void clearDebugValues():274:278 -> C0
-    boolean isInvokeMethodWithReceiver() -> C1
+    boolean isInvokeStatic() -> C1
     com.android.tools.r8.ir.code.Div asDiv() -> D
     1:7:boolean com.android.tools.r8.ir.code.Instruction.definesValueWithNonLocalUsages():560:566 -> D0
     1:7:boolean definesBlockLocalValue():556 -> D0
-    boolean isInvokeStatic() -> D1
+    boolean isInvokeVirtual() -> D1
     com.android.tools.r8.ir.code.Dup asDup() -> E
     1:1:java.util.Set getDebugValues():667:667 -> E0
-    boolean isInvokeVirtual() -> E1
+    boolean isJumpInstruction() -> E1
     com.android.tools.r8.ir.code.FieldInstruction asFieldInstruction() -> F
     1:1:java.lang.String getInstructionName():323:323 -> F0
-    boolean isJumpInstruction() -> F1
+    boolean isLoad() -> F1
     com.android.tools.r8.ir.code.Goto asGoto() -> G
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():1454:1454 -> G0
-    boolean isLoad() -> G1
+    boolean isLogicalBinop() -> G1
     com.android.tools.r8.ir.code.If asIf() -> H
     1:1:int getNumber():372:372 -> H0
-    boolean isLogicalBinop() -> H1
+    boolean isMonitorEnter() -> H1
     com.android.tools.r8.ir.code.InitClass asInitClass() -> I
     com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction() -> I0
-    boolean isMonitorEnter() -> I1
+    boolean isMove() -> I1
     com.android.tools.r8.ir.code.InstanceFieldInstruction asInstanceFieldInstruction() -> J
     1:2:com.android.tools.r8.ir.code.Position getPosition():82:83 -> J0
-    boolean isMove() -> J1
+    boolean isNewArrayEmpty() -> J1
     com.android.tools.r8.ir.code.InstanceGet asInstanceGet() -> K
     1:1:java.lang.String getPositionAsString():98:98 -> K0
-    boolean isNewArrayEmpty() -> K1
+    boolean isNewInstance() -> K1
     com.android.tools.r8.ir.code.InstanceOf asInstanceOf() -> L
     1:1:boolean hasBlock():319:319 -> L0
-    boolean isNewInstance() -> L1
+    boolean isNumberConversion() -> L1
     com.android.tools.r8.ir.code.InstancePut asInstancePut() -> M
     1:1:boolean hasInValueWithLocalInfo():116:116 -> M0
-    boolean isNumberConversion() -> M1
+    boolean isOutConstant() -> M1
     com.android.tools.r8.ir.code.IntSwitch asIntSwitch() -> N
     boolean hasInvariantOutType() -> N0
-    boolean isOutConstant() -> N1
+    boolean isReturn() -> N1
     com.android.tools.r8.ir.code.Invoke asInvoke() -> O
     1:1:boolean hasOutValue():129:129 -> O0
-    boolean isReturn() -> O1
+    boolean isStaticFieldInstruction() -> O1
     com.android.tools.r8.ir.code.InvokeCustom asInvokeCustom() -> P
     1:1:boolean hasPosition():78:78 -> P0
-    boolean isStaticFieldInstruction() -> P1
+    boolean isStaticPut() -> P1
     com.android.tools.r8.ir.code.InvokeDirect asInvokeDirect() -> Q
-    1:1:boolean hasUnusedOutValue():133:133 -> Q0
-    boolean isStaticPut() -> Q1
+    1:1:boolean hasUsedOutValue():137:137 -> Q0
+    boolean isStore() -> Q1
     com.android.tools.r8.ir.code.InvokeInterface asInvokeInterface() -> R
-    1:1:boolean hasUsedOutValue():137:137 -> R0
-    boolean isStore() -> R1
+    1:1:java.util.List inValues():102:102 -> R0
+    boolean isStringSwitch() -> R1
     com.android.tools.r8.ir.code.InvokeMethod asInvokeMethod() -> S
-    1:1:java.util.List inValues():102:102 -> S0
-    boolean isStringSwitch() -> S1
+    1:1:boolean instructionInstanceCanThrow():586:586 -> S0
+    boolean isSwitch() -> S1
     com.android.tools.r8.ir.code.InvokeMethodWithReceiver asInvokeMethodWithReceiver() -> T
-    1:1:boolean instructionInstanceCanThrow():586:586 -> T0
-    boolean isSwitch() -> T1
+    boolean instructionTypeCanBeCanonicalized() -> T0
+    boolean isThrow() -> T1
     com.android.tools.r8.ir.code.InvokeMultiNewArray asInvokeMultiNewArray() -> U
-    boolean instructionTypeCanBeCanonicalized() -> U0
-    boolean isThrow() -> U1
+    boolean instructionTypeCanThrow() -> U0
+    boolean isUnop() -> U1
     com.android.tools.r8.ir.code.InvokeNewArray asInvokeNewArray() -> V
-    boolean instructionTypeCanThrow() -> V0
-    boolean isUnop() -> V1
+    boolean isAdd() -> V0
+    int maxInValueRegister() -> V1
     com.android.tools.r8.ir.code.InvokePolymorphic asInvokePolymorphic() -> W
-    boolean isAdd() -> W0
-    int maxInValueRegister() -> W1
+    boolean isAllowedAfterThrowingInstruction() -> W0
+    int maxOutValueRegister() -> W1
     com.android.tools.r8.ir.code.InvokeStatic asInvokeStatic() -> X
-    boolean isAllowedAfterThrowingInstruction() -> X0
-    int maxOutValueRegister() -> X1
+    boolean isArgument() -> X0
+    int opcode() -> X1
     com.android.tools.r8.ir.code.InvokeSuper asInvokeSuper() -> Y
-    boolean isArgument() -> Y0
-    int opcode() -> Y1
+    boolean isArithmeticBinop() -> Y0
+    1:1:com.android.tools.r8.ir.code.ValueType outType():196:196 -> Y1
     com.android.tools.r8.ir.code.InvokeVirtual asInvokeVirtual() -> Z
-    boolean isArithmeticBinop() -> Z0
-    1:1:com.android.tools.r8.ir.code.ValueType outType():196:196 -> Z1
+    boolean isArrayAccess() -> Z0
+    1:1:com.android.tools.r8.ir.code.Value outValue():141:141 -> Z1
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void buildCf(com.android.tools.r8.ir.conversion.CfBuilder) -> a
     void buildDex(com.android.tools.r8.ir.conversion.DexBuilder) -> a
@@ -31639,7 +31603,7 @@
     168:184:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):515 -> a
     185:186:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):521:522 -> a
     187:187:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):529:529 -> a
-    188:189:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():773:773 -> a
+    188:189:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():770:770 -> a
     188:189:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):529 -> a
     190:196:boolean identicalStackValuesPair(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.StackValues):533:539 -> a
     197:197:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):595:595 -> a
@@ -31656,8 +31620,8 @@
     227:228:boolean verifyValidPositionInfo(boolean):1479:1480 -> a
     229:229:boolean verifyValidPositionInfo(boolean):1476:1476 -> a
     com.android.tools.r8.ir.code.JumpInstruction asJumpInstruction() -> a0
-    boolean isArrayAccess() -> a1
-    1:1:com.android.tools.r8.ir.code.Value outValue():141:141 -> a2
+    boolean isArrayGet() -> a1
+    boolean throwsOnNullInput() -> a2
     boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction) -> b
     1:2:void setPosition(com.android.tools.r8.ir.code.Position):87:88 -> b
     3:6:void addInValue(com.android.tools.r8.ir.code.Value):107:110 -> b
@@ -31665,111 +31629,110 @@
     11:11:void printLIR(com.android.tools.r8.utils.CfgPrinter):368:368 -> b
     12:12:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):606:606 -> b
     com.android.tools.r8.ir.code.Load asLoad() -> b0
-    boolean isArrayGet() -> b1
-    boolean throwsOnNullInput() -> b2
+    boolean isArrayPut() -> b1
     boolean needsValueInRegister(com.android.tools.r8.ir.code.Value) -> c
     1:7:void moveDebugValues(com.android.tools.r8.ir.code.Instruction):237:243 -> c
     8:8:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):590:590 -> c
     com.android.tools.r8.ir.code.LogicalBinop asLogicalBinop() -> c0
-    boolean isArrayPut() -> c1
+    boolean isAssume() -> c1
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     1:9:void removeDebugValue(com.android.tools.r8.ir.code.Value):247:255 -> d
     10:11:com.android.tools.r8.ir.code.BasicBlock getBlock():287:288 -> d
     com.android.tools.r8.ir.code.Monitor asMonitor() -> d0
-    boolean isAssume() -> d1
+    1:1:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> d1
+    1:1:boolean isAssumeWithDynamicTypeAssumption():737 -> d1
+    2:2:boolean isAssumeWithDynamicTypeAssumption():737:737 -> d1
     1:4:void setOutValue(com.android.tools.r8.ir.code.Value):145:148 -> e
     5:5:boolean isBlockLocalInstructionWithoutSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):552:552 -> e
+    6:6:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():663:663 -> e
     com.android.tools.r8.ir.code.Move asMove() -> e0
     1:1:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> e1
-    1:1:boolean isAssumeWithDynamicTypeAssumption():737 -> e1
-    2:2:boolean isAssumeWithDynamicTypeAssumption():737:737 -> e1
+    1:1:boolean isAssumeWithNonNullAssumption():741 -> e1
+    2:2:boolean isAssumeWithNonNullAssumption():741:741 -> e1
     1:5:com.android.tools.r8.ir.code.Value swapOutValue(com.android.tools.r8.ir.code.Value):153:157 -> f
     6:10:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):621:625 -> f
-    11:11:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():663:663 -> f
     com.android.tools.r8.ir.code.MoveException asMoveException() -> f0
-    1:1:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> f1
-    1:1:boolean isAssumeWithNonNullAssumption():741 -> f1
-    2:2:boolean isAssumeWithNonNullAssumption():741:741 -> f1
+    boolean isBinop() -> f1
     com.android.tools.r8.ir.code.Instruction asInstruction() -> g
     com.android.tools.r8.ir.code.Mul asMul() -> g0
-    boolean isBinop() -> g1
+    boolean isCheckCast() -> g1
     com.android.tools.r8.ir.code.Neg asNeg() -> h0
-    boolean isCheckCast() -> h1
+    boolean isConstInstruction() -> h1
     com.android.tools.r8.ir.code.Add asAdd() -> i
     com.android.tools.r8.ir.code.NewArrayEmpty asNewArrayEmpty() -> i0
-    boolean isConstInstruction() -> i1
+    boolean isConstNumber() -> i1
     com.android.tools.r8.ir.code.And asAnd() -> j
     com.android.tools.r8.ir.code.NewArrayFilledData asNewArrayFilledData() -> j0
-    boolean isConstNumber() -> j1
+    boolean isConstString() -> j1
     com.android.tools.r8.ir.code.Argument asArgument() -> k
     com.android.tools.r8.ir.code.NewInstance asNewInstance() -> k0
-    boolean isConstString() -> k1
+    1:1:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> k1
+    1:1:boolean isCreatingArray():1369 -> k1
+    2:2:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayFilledData():0:0 -> k1
+    2:2:boolean isCreatingArray():1370 -> k1
+    3:3:boolean com.android.tools.r8.ir.code.Instruction.isInvokeNewArray():0:0 -> k1
+    3:3:boolean isCreatingArray():1371 -> k1
+    4:4:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMultiNewArray():0:0 -> k1
+    4:4:boolean isCreatingArray():1372 -> k1
     com.android.tools.r8.ir.code.ArithmeticBinop asArithmeticBinop() -> l
     com.android.tools.r8.ir.code.Not asNot() -> l0
-    1:1:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> l1
-    1:1:boolean isCreatingArray():1369 -> l1
-    2:2:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayFilledData():0:0 -> l1
-    2:2:boolean isCreatingArray():1370 -> l1
-    3:3:boolean com.android.tools.r8.ir.code.Instruction.isInvokeNewArray():0:0 -> l1
-    3:3:boolean isCreatingArray():1371 -> l1
-    4:4:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMultiNewArray():0:0 -> l1
-    4:4:boolean isCreatingArray():1372 -> l1
+    1:1:boolean isCreatingInstanceOrArray():1376:1376 -> l1
     com.android.tools.r8.ir.code.ArrayAccess asArrayAccess() -> m
     com.android.tools.r8.ir.code.NumberConversion asNumberConversion() -> m0
-    1:1:boolean isCreatingInstanceOrArray():1376:1376 -> m1
+    1:1:boolean com.android.tools.r8.ir.code.Instruction.isDebugPosition():0:0 -> m1
+    1:1:boolean isDebugInstruction():1169 -> m1
+    2:2:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalsChange():0:0 -> m1
+    2:2:boolean isDebugInstruction():1170 -> m1
+    3:3:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalRead():0:0 -> m1
+    3:3:boolean isDebugInstruction():1171 -> m1
+    4:4:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalWrite():0:0 -> m1
+    4:4:boolean isDebugInstruction():1172 -> m1
+    5:5:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalUninitialized():0:0 -> m1
+    5:5:boolean isDebugInstruction():1173 -> m1
     com.android.tools.r8.ir.code.ArrayGet asArrayGet() -> n
     com.android.tools.r8.ir.code.Or asOr() -> n0
-    1:1:boolean com.android.tools.r8.ir.code.Instruction.isDebugPosition():0:0 -> n1
-    1:1:boolean isDebugInstruction():1169 -> n1
-    2:2:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalsChange():0:0 -> n1
-    2:2:boolean isDebugInstruction():1170 -> n1
-    3:3:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalRead():0:0 -> n1
-    3:3:boolean isDebugInstruction():1171 -> n1
-    4:4:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalWrite():0:0 -> n1
-    4:4:boolean isDebugInstruction():1172 -> n1
-    5:5:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalUninitialized():0:0 -> n1
-    5:5:boolean isDebugInstruction():1173 -> n1
+    boolean isDebugPosition() -> n1
     com.android.tools.r8.ir.code.ArrayLength asArrayLength() -> o
     com.android.tools.r8.ir.code.Rem asRem() -> o0
-    boolean isDebugPosition() -> o1
+    1:1:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> o1
+    1:1:boolean isFieldGet():929 -> o1
+    2:2:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> o1
+    2:2:boolean isFieldGet():929 -> o1
     com.android.tools.r8.ir.code.ArrayPut asArrayPut() -> p
     com.android.tools.r8.ir.code.Return asReturn() -> p0
-    1:1:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> p1
-    1:1:boolean isFieldGet():929 -> p1
-    2:2:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> p1
-    2:2:boolean isFieldGet():929 -> p1
+    boolean isFieldInstruction() -> p1
     com.android.tools.r8.ir.code.Assume asAssume() -> q
     com.android.tools.r8.ir.code.Shl asShl() -> q0
-    boolean isFieldInstruction() -> q1
+    1:1:boolean isFieldPut():933:933 -> q1
     com.android.tools.r8.ir.code.Binop asBinop() -> r
     com.android.tools.r8.ir.code.Shr asShr() -> r0
-    1:1:boolean isFieldPut():933:933 -> r1
+    boolean isGoto() -> r1
     com.android.tools.r8.ir.code.CheckCast asCheckCast() -> s
     com.android.tools.r8.ir.code.StaticGet asStaticGet() -> s0
-    boolean isGoto() -> s1
+    boolean isIf() -> s1
     com.android.tools.r8.ir.code.Cmp asCmp() -> t
     com.android.tools.r8.ir.code.StaticPut asStaticPut() -> t0
-    boolean isIf() -> t1
+    boolean isInstanceFieldInstruction() -> t1
     1:14:java.lang.String toString():328:341 -> toString
     com.android.tools.r8.ir.code.ConstClass asConstClass() -> u
     com.android.tools.r8.ir.code.Store asStore() -> u0
-    boolean isInstanceFieldInstruction() -> u1
+    boolean isInstancePut() -> u1
     com.android.tools.r8.ir.code.ConstInstruction asConstInstruction() -> v
     com.android.tools.r8.ir.code.StringSwitch asStringSwitch() -> v0
-    boolean isInstancePut() -> v1
+    boolean isIntSwitch() -> v1
     com.android.tools.r8.ir.code.ConstMethodHandle asConstMethodHandle() -> w
     com.android.tools.r8.ir.code.Sub asSub() -> w0
-    boolean isIntSwitch() -> w1
+    boolean isInvoke() -> w1
     com.android.tools.r8.ir.code.ConstMethodType asConstMethodType() -> x
     com.android.tools.r8.ir.code.Switch asSwitch() -> x0
-    boolean isInvoke() -> x1
+    boolean isInvokeCustom() -> x1
     com.android.tools.r8.ir.code.ConstNumber asConstNumber() -> y
     com.android.tools.r8.ir.code.Throw asThrow() -> y0
-    boolean isInvokeCustom() -> y1
+    boolean isInvokeDirect() -> y1
     com.android.tools.r8.ir.code.ConstString asConstString() -> z
     com.android.tools.r8.ir.code.Ushr asUshr() -> z0
-    boolean isInvokeDirect() -> z1
-com.android.tools.r8.ir.code.Instruction$BuilderBase -> com.android.tools.r8.internal.dg$a:
+    boolean isInvokeMethod() -> z1
+com.android.tools.r8.ir.code.Instruction$BuilderBase -> com.android.tools.r8.internal.pf$a:
     com.android.tools.r8.ir.code.Position position -> b
     com.android.tools.r8.ir.code.Value outValue -> a
     1:1:void <init>():1555:1555 -> <init>
@@ -31781,7 +31744,7 @@
     6:6:com.android.tools.r8.ir.code.Instruction$BuilderBase setPosition(com.android.tools.r8.ir.code.Instruction):1586:1586 -> a
     7:8:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setPosition(com.android.tools.r8.ir.code.Position):1581:1582 -> a
     7:8:com.android.tools.r8.ir.code.Instruction$BuilderBase setPosition(com.android.tools.r8.ir.code.Instruction):1586 -> a
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption -> com.android.tools.r8.internal.dg$b:
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption -> com.android.tools.r8.internal.pf$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
@@ -31792,24 +31755,24 @@
     1:1:com.android.tools.r8.ir.code.Instruction$SideEffectAssumption join(com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):1532:1532 -> a
     boolean canAssumeInvokedMethodDoesNotHaveSideEffects() -> b
     boolean canAssumeReceiverIsNotNull() -> c
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$1 -> com.android.tools.r8.internal.eg:
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$1 -> com.android.tools.r8.internal.qf:
     1:1:void <init>():1493:1493 -> <init>
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$2 -> com.android.tools.r8.internal.fg:
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$2 -> com.android.tools.r8.internal.rf:
     1:1:void <init>():1502:1502 -> <init>
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$3 -> com.android.tools.r8.internal.gg:
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$3 -> com.android.tools.r8.internal.sf:
     1:1:void <init>():1511:1511 -> <init>
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$4 -> com.android.tools.r8.internal.hg:
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$4 -> com.android.tools.r8.internal.tf:
     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):1532:1532 -> <init>
     1:2:boolean canAssumeClassIsAlreadyInitialized():1536:1537 -> a
     1:2:boolean canAssumeInvokedMethodDoesNotHaveSideEffects():1542:1543 -> b
     1:2:boolean canAssumeReceiverIsNotNull():1548:1549 -> c
-com.android.tools.r8.ir.code.InstructionIterator -> com.android.tools.r8.internal.jg:
-    1:3:com.android.tools.r8.ir.code.Instruction peekPrevious():45:47 -> e
+com.android.tools.r8.ir.code.InstructionIterator -> com.android.tools.r8.internal.vf:
+    1:3:com.android.tools.r8.ir.code.Instruction peekPrevious():45:47 -> f
     1:3:com.android.tools.r8.ir.code.Instruction peekNext():30:32 -> g
     1:1:void remove():15:15 -> remove
-com.android.tools.r8.ir.code.InstructionListIterator -> com.android.tools.r8.internal.kg:
+com.android.tools.r8.ir.code.InstructionListIterator -> com.android.tools.r8.internal.wf:
     void addThrowingInstructionToPossiblyThrowingBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.utils.InternalOptions) -> a
     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
@@ -31820,7 +31783,6 @@
     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 replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,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
@@ -31831,39 +31793,39 @@
     5:5:com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int):93:93 -> a
     6:6:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.lang.String):117:117 -> a
     7:7:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.lang.String):116:116 -> a
-    8:8:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):171:171 -> a
-    9:9:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode):175:175 -> a
-    10:12: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):253:255 -> a
+    8:8:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):163:163 -> a
+    9:9:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode):167:167 -> a
+    10:12: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):245:247 -> a
     void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString) -> b
     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:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> b
-    5:5:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int):205:205 -> b
+    5:5:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int):197:197 -> b
     void unsetInsertionPosition() -> i
     void removeOrReplaceByDebugLocalRead() -> j
     1:1:void removeInstructionIgnoreOutValue():67:67 -> m
-com.android.tools.r8.ir.code.InstructionOrPhi -> com.android.tools.r8.internal.lg:
+com.android.tools.r8.ir.code.InstructionOrPhi -> com.android.tools.r8.internal.xf:
     com.android.tools.r8.ir.code.BasicBlock getBlock() -> d
-    boolean isPhi() -> e
+    boolean isPhi() -> f
     com.android.tools.r8.ir.code.Instruction asInstruction() -> g
     com.android.tools.r8.ir.code.Phi asPhi() -> h
-com.android.tools.r8.ir.code.IntSwitch -> com.android.tools.r8.internal.Th:
+com.android.tools.r8.ir.code.IntSwitch -> com.android.tools.r8.internal.gh:
     int $r8$clinit -> m
     boolean $assertionsDisabled -> l
     int[] keys -> n
     1:1:void <clinit>():28:28 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,int[],int[],int):33:35 -> <init>
     com.android.tools.r8.ir.code.IntSwitch asIntSwitch() -> N
-    int maxInValueRegister() -> W1
-    int maxOutValueRegister() -> X1
-    int opcode() -> Y1
+    int maxInValueRegister() -> V1
+    int maxOutValueRegister() -> W1
+    int opcode() -> X1
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):45:45 -> a
     2:2:void forEachCase(com.android.tools.r8.utils.IntObjConsumer):49:49 -> a
     3:3:int com.android.tools.r8.ir.code.IntSwitch.getKey(int):212:212 -> a
     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):1133:1133 -> a
+    6:6:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1128:1128 -> 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
@@ -31905,29 +31867,29 @@
     1:2:long packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode,long):130:131 -> c
     1:1:long sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,long):154:154 -> d
     1:1:int getKey(int):212:212 -> e
-    1:7:boolean valid():61:67 -> g2
-    1:1:int getFirstKey():183:183 -> i2
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():220:221 -> j2
-    3:3:int com.android.tools.r8.ir.code.IntSwitch.getKey(int):212:212 -> j2
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():222 -> j2
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():222:222 -> j2
-    1:1:int[] getKeys():216:216 -> k2
+    1:7:boolean valid():61:67 -> f2
+    1:1:int getFirstKey():183:183 -> h2
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():220:221 -> i2
+    3:3:int com.android.tools.r8.ir.code.IntSwitch.getKey(int):212:212 -> i2
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():222 -> i2
+    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():222:222 -> i2
+    1:1:int[] getKeys():216:216 -> j2
     1:4:java.lang.String toString():270:273 -> toString
     5:5:int com.android.tools.r8.ir.code.IntSwitch.getKey(int):212:212 -> toString
     5:5:java.lang.String toString():274 -> toString
     6:11:java.lang.String toString():274:279 -> toString
-    boolean isIntSwitch() -> w1
-com.android.tools.r8.ir.code.Invoke -> com.android.tools.r8.internal.ni:
+    boolean isIntSwitch() -> v1
+com.android.tools.r8.ir.code.Invoke -> com.android.tools.r8.internal.yh:
     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():333:333 -> F0
     com.android.tools.r8.ir.code.Invoke asInvoke() -> O
-    boolean instructionTypeCanThrow() -> V0
-    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> W1
-    1:1:int maxInValueRegister():277 -> W1
-    2:4:int maxInValueRegister():277:279 -> W1
-    int maxOutValueRegister() -> X1
+    boolean instructionTypeCanThrow() -> U0
+    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> V1
+    1:1:int maxInValueRegister():277 -> V1
+    2:4:int maxInValueRegister():277:279 -> V1
+    int maxOutValueRegister() -> W1
     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
     25:25: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):134:134 -> a
@@ -31980,6 +31942,7 @@
     11:11:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> b
     11:11:com.android.tools.r8.ir.code.Value getArgument(int):160 -> b
     12:12:com.android.tools.r8.ir.code.Value getArgument(int):160:160 -> b
+    1:1:java.util.List arguments():156:156 -> b2
     1:1:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):304:304 -> c
     2:2:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> c
     2:2:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):311 -> c
@@ -31987,30 +31950,29 @@
     11:11:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> c
     11:11:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):319 -> c
     12:13:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):319:320 -> c
-    1:1:java.util.List arguments():156:156 -> c2
-    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> d2
-    1:1:boolean argumentsAreConsecutiveInputArguments():286 -> d2
-    2:2:boolean argumentsAreConsecutiveInputArguments():286:286 -> d2
-    3:3:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> d2
-    3:3:boolean argumentsAreConsecutiveInputArguments():289 -> d2
-    4:5:boolean argumentsAreConsecutiveInputArguments():289:290 -> d2
-    6:6:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> d2
-    6:6:boolean argumentsAreConsecutiveInputArguments():293 -> d2
-    7:7:boolean argumentsAreConsecutiveInputArguments():293:293 -> d2
-    8:8:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> d2
-    8:8:boolean argumentsAreConsecutiveInputArguments():294 -> d2
-    9:10:boolean argumentsAreConsecutiveInputArguments():294:295 -> d2
-    com.android.tools.r8.graph.DexType getReturnType() -> e2
-    com.android.tools.r8.ir.code.Invoke$Type getType() -> f2
-    java.lang.String getTypeString() -> g2
-    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> h2
-    1:1:boolean hasArguments():148 -> h2
-    2:2:boolean hasArguments():148:148 -> h2
-    1:1:int requiredArgumentRegisters():169:169 -> i2
-    2:2:int com.android.tools.r8.ir.code.Value.requiredRegisters():260:260 -> i2
-    2:2:int requiredArgumentRegisters():170 -> i2
-    boolean isInvoke() -> x1
-com.android.tools.r8.ir.code.Invoke$Type -> com.android.tools.r8.internal.ni$a:
+    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> c2
+    1:1:boolean argumentsAreConsecutiveInputArguments():286 -> c2
+    2:2:boolean argumentsAreConsecutiveInputArguments():286:286 -> c2
+    3:3:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> c2
+    3:3:boolean argumentsAreConsecutiveInputArguments():289 -> c2
+    4:5:boolean argumentsAreConsecutiveInputArguments():289:290 -> c2
+    6:6:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> c2
+    6:6:boolean argumentsAreConsecutiveInputArguments():293 -> c2
+    7:7:boolean argumentsAreConsecutiveInputArguments():293:293 -> c2
+    8:8:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> c2
+    8:8:boolean argumentsAreConsecutiveInputArguments():294 -> c2
+    9:10:boolean argumentsAreConsecutiveInputArguments():294:295 -> c2
+    com.android.tools.r8.graph.DexType getReturnType() -> d2
+    com.android.tools.r8.ir.code.Invoke$Type getType() -> e2
+    java.lang.String getTypeString() -> f2
+    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> g2
+    1:1:boolean hasArguments():148 -> g2
+    2:2:boolean hasArguments():148:148 -> g2
+    1:1:int requiredArgumentRegisters():169:169 -> h2
+    2:2:int com.android.tools.r8.ir.code.Value.requiredRegisters():260:260 -> h2
+    2:2:int requiredArgumentRegisters():170 -> h2
+    boolean isInvoke() -> w1
+com.android.tools.r8.ir.code.Invoke$Type -> com.android.tools.r8.internal.yh$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
@@ -32033,67 +31995,63 @@
     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.oi:
+com.android.tools.r8.ir.code.InvokeCustom -> com.android.tools.r8.internal.zh:
     com.android.tools.r8.graph.DexCallSite callSite -> j
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():26:26 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.ir.code.Value,java.util.List):31:33 -> <init>
     boolean hasInvariantOutType() -> N0
     com.android.tools.r8.ir.code.InvokeCustom asInvokeCustom() -> P
-    int opcode() -> Y1
-    1:17:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):65:81 -> a
-    18:18:boolean com.android.tools.r8.ir.analysis.type.InterfaceCollection.hasSingleKnownInterface():140:140 -> a
-    18:18:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):82 -> a
-    19:29:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):82:92 -> a
-    30:40:boolean com.android.tools.r8.ir.code.InvokeCustom.verifyLambdaInterfaces(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.graph.DexType):48:58 -> a
-    30:40:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):94 -> a
-    41:41:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):96:96 -> a
-    42:42:void lambda$evaluate$0(com.android.tools.r8.ir.analysis.type.InterfaceCollection$Builder,com.android.tools.r8.graph.DexType):91:91 -> a
-    43:43:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.ir.code.InvokeCustom.getCallSite():105:105 -> a
-    43:43:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):196 -> a
-    44:44:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):196:196 -> a
-    45:50:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):126:131 -> a
-    51:51:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.ir.code.InvokeCustom.getCallSite():105:105 -> a
-    51:51:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):131 -> a
-    52:56:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):131:135 -> a
-    57:57:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.ir.code.InvokeCustom.getCallSite():105:105 -> a
-    57:57:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):137 -> a
-    58:65:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):137:144 -> a
+    int opcode() -> X1
+    1:27:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):66:92 -> a
+    28:39:boolean com.android.tools.r8.ir.code.InvokeCustom.verifyLambdaInterfaces(com.android.tools.r8.ir.analysis.type.TypeElement,java.util.Set,com.android.tools.r8.graph.DexType):48:59 -> a
+    28:39:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):94 -> a
+    40:40:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):96:96 -> a
+    41:41:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.ir.code.InvokeCustom.getCallSite():105:105 -> a
+    41:41:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):196 -> a
+    42:42:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):196:196 -> a
+    43:48:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):126:131 -> a
+    49:49:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.ir.code.InvokeCustom.getCallSite():105:105 -> a
+    49:49:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):131 -> a
+    50:54:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):131:135 -> a
+    55:55:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.ir.code.InvokeCustom.getCallSite():105:105 -> a
+    55:55:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):137 -> a
+    56:63:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):137:144 -> a
+    64:64:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):149:149 -> a
+    65:65:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.ir.code.InvokeCustom.getCallSite():105:105 -> a
+    65:65:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):149 -> a
     66:66:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):149:149 -> a
-    67:67:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.ir.code.InvokeCustom.getCallSite():105:105 -> a
-    67:67:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):149 -> a
-    68:68:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):149:149 -> a
-    69:69:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):170:170 -> a
-    70:70:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvokeCustom():168:168 -> a
-    70:70:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):170 -> a
-    71:71:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):177:177 -> a
-    72:72:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.ir.code.InvokeCustom.getCallSite():105:105 -> a
-    72:72:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):178 -> a
-    73:76:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):178:181 -> a
-    77:77:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.ir.code.InvokeCustom.getCallSite():105:105 -> a
-    77:77:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):182 -> a
-    78:81:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):182:185 -> a
-    82:82:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeCustom):184:184 -> a
-    82:82:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):43 -> a
+    67:67:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):170:170 -> a
+    68:68:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvokeCustom():168:168 -> a
+    68:68:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):170 -> a
+    69:69:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):177:177 -> a
+    70:70:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.ir.code.InvokeCustom.getCallSite():105:105 -> a
+    70:70:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):178 -> a
+    71:74:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):178:181 -> a
+    75:75:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.ir.code.InvokeCustom.getCallSite():105:105 -> a
+    75:75:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):182 -> a
+    76:79:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):182:185 -> a
+    80:80:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeCustom):184:184 -> a
+    80:80:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):43 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):154:154 -> b
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isInvokeCustom():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):154 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):154:154 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-    1:1:com.android.tools.r8.graph.DexType getReturnType():101:101 -> e2
-    java.lang.String getTypeString() -> g2
-    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():105:105 -> j2
+    1:1:com.android.tools.r8.graph.DexType getReturnType():101:101 -> d2
+    java.lang.String getTypeString() -> f2
+    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():105:105 -> i2
     1:1:java.lang.String toString():120:120 -> toString
-com.android.tools.r8.ir.code.InvokeDirect -> com.android.tools.r8.internal.qi:
+com.android.tools.r8.ir.code.InvokeDirect -> com.android.tools.r8.internal.Bh:
     boolean isInterface -> m
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():33:33 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):42:45 -> <init>
     com.android.tools.r8.ir.code.InvokeDirect asInvokeDirect() -> Q
-    int opcode() -> Y1
+    int opcode() -> X1
     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):266:266 -> a
+    21:21:boolean com.android.tools.r8.graph.DexMethod.isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):261:261 -> 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
@@ -32104,26 +32062,26 @@
     43:43:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):590:590 -> 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):266:266 -> a
+    47:47:boolean com.android.tools.r8.graph.DexMethod.isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):261:261 -> 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
     56:56:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):61 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):112:112 -> b
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():66:66 -> e2
     1:5:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):193:197 -> f
     6:6:boolean com.android.tools.r8.graph.DexClassAndMethod.isProgramMethod():0:0 -> f
     6:6:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):201 -> f
     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:com.android.tools.r8.ir.code.Invoke$Type getType():66:66 -> f2
-    java.lang.String getTypeString() -> g2
-    1:1:boolean getInterfaceBit():56:56 -> j2
-    boolean isInvokeDirect() -> z1
-com.android.tools.r8.ir.code.InvokeInterface -> com.android.tools.r8.internal.si:
+    java.lang.String getTypeString() -> f2
+    1:1:boolean getInterfaceBit():56:56 -> i2
+    boolean isInvokeDirect() -> y1
+com.android.tools.r8.ir.code.InvokeInterface -> com.android.tools.r8.internal.Dh:
     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>
     com.android.tools.r8.ir.code.InvokeInterface asInvokeInterface() -> R
-    int opcode() -> Y1
+    int opcode() -> X1
     1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63:81 -> a
     20:33: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):105:118 -> a
     34:34: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):117:117 -> a
@@ -32137,110 +32095,117 @@
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isInvokeInterface():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):86 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):86:86 -> b
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():52:52 -> f2
-    java.lang.String getTypeString() -> g2
-    boolean getInterfaceBit() -> j2
-com.android.tools.r8.ir.code.InvokeMethod -> com.android.tools.r8.internal.ti:
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():52:52 -> e2
+    java.lang.String getTypeString() -> f2
+    boolean getInterfaceBit() -> i2
+com.android.tools.r8.ir.code.InvokeMethod -> com.android.tools.r8.internal.Eh:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexMethod method -> j
-    1:1:void <clinit>():40:40 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):45:46 -> <init>
-    boolean isInvokeMethod() -> A1
+    1:1:void <clinit>():38:38 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):43:44 -> <init>
     boolean hasInvariantOutType() -> N0
     com.android.tools.r8.ir.code.InvokeMethod asInvokeMethod() -> S
     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) -> a
     void lambda$lookupProgramDispatchTargets$1(com.android.tools.r8.graph.LookupLambdaTarget) -> a
-    1:1:void lambda$lookupProgramDispatchTargets$0(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexClassAndMethod):138:138 -> a
+    1:1:void lambda$lookupProgramDispatchTargets$0(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexClassAndMethod):136:136 -> a
     2:2:boolean com.android.tools.r8.graph.DexClassAndMethod.isProgramMethod():0:0 -> a
-    2:2:void lambda$lookupProgramDispatchTargets$0(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexClassAndMethod):138 -> a
-    3:3:void lambda$lookupProgramDispatchTargets$0(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexClassAndMethod):139:139 -> a
-    4:9:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):157:162 -> a
+    2:2:void lambda$lookupProgramDispatchTargets$0(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexClassAndMethod):136 -> a
+    3:3:void lambda$lookupProgramDispatchTargets$0(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexClassAndMethod):137:137 -> a
+    4:9:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):155:160 -> a
     10:10:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> a
-    10:10:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):167 -> a
-    11:11:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):167:167 -> a
+    10:10:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):165 -> a
+    11:11:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):165:165 -> a
     12:12:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> a
-    12:12:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):168 -> a
-    13:14:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):168:169 -> a
+    12:12:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):166 -> a
+    13:14:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):166:167 -> a
     15:15:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> a
-    15:15:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):169 -> a
-    16:16:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):169:169 -> a
-    17:25:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):180:188 -> a
-    26:26:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):199:199 -> a
-    27:32:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):215:220 -> a
-    33:33:boolean verifyD8LookupResult(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):228:228 -> a
-    34:40:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):234:240 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):62:62 -> b
+    15:15:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):167 -> a
+    16:16:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):167:167 -> a
+    17:25:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):178:186 -> a
+    26:26:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):197:197 -> a
+    27:32:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):213:218 -> a
+    33:33:boolean verifyD8LookupResult(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):226:226 -> a
+    34:40:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):232:238 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):60:60 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-    1:1:com.android.tools.r8.graph.DexType getReturnType():53:53 -> e2
-    1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):209:209 -> f
-    1:4:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):92:95 -> g
-    5:5:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.code.InvokeMethod.lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):86:86 -> g
-    5:5:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):96 -> g
-    6:6:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.DexClassAndMethod.asProgramMethodOrNull(com.android.tools.r8.graph.DexClassAndMethod):18:18 -> g
-    6:6:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.code.InvokeMethod.lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):86 -> g
-    6:6:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):96 -> g
+    1:1:com.android.tools.r8.graph.DexType getReturnType():51:51 -> d2
+    1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):207:207 -> f
+    1:4:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):90:93 -> g
+    5:5:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.code.InvokeMethod.lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):84:84 -> g
+    5:5:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):94 -> g
+    6:6:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.DexClassAndMethod.asProgramMethodOrNull(com.android.tools.r8.graph.DexClassAndMethod):16:16 -> g
+    6:6:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.code.InvokeMethod.lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):84 -> g
+    6:6:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):94 -> g
     7:8:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.utils.collections.ProgramMethodSet.create(com.android.tools.r8.graph.ProgramMethod):43:44 -> g
-    7:8:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):97 -> g
-    9:9:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):102:102 -> g
-    10:10:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):101:101 -> g
-    11:35:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):100:124 -> g
-    36:44:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):122:130 -> g
-    45:52:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):129:136 -> g
-    1:1:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):86:86 -> h
-    2:2:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.DexClassAndMethod.asProgramMethodOrNull(com.android.tools.r8.graph.DexClassAndMethod):18:18 -> h
-    2:2:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):86 -> h
+    7:8:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):95 -> g
+    9:9:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):100:100 -> g
+    10:10:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> g
+    10:10:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):99 -> g
+    11:19:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):98:106 -> g
+    20:20:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> g
+    20:20:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):106 -> g
+    21:37:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):106:122 -> g
+    38:46:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):120:128 -> g
+    47:54:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):127:134 -> g
+    1:1:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):84:84 -> h
+    2:2:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.DexClassAndMethod.asProgramMethodOrNull(com.android.tools.r8.graph.DexClassAndMethod):16:16 -> h
+    2:2:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):84 -> h
     com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> i
-    boolean getInterfaceBit() -> j2
-    1:1:com.android.tools.r8.graph.DexMethod getInvokedMethod():57:57 -> k2
-    1:1:java.lang.String toString():67:67 -> toString
-com.android.tools.r8.ir.code.InvokeMethod$Builder -> com.android.tools.r8.internal.ti$a:
+    boolean getInterfaceBit() -> i2
+    1:1:com.android.tools.r8.graph.DexMethod getInvokedMethod():55:55 -> j2
+    1:1:java.lang.String toString():65:65 -> toString
+    boolean isInvokeMethod() -> z1
+com.android.tools.r8.ir.code.InvokeMethod$Builder -> com.android.tools.r8.internal.Eh$a:
     java.util.List arguments -> e
     com.android.tools.r8.graph.DexMethod method -> d
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():246:246 -> <clinit>
-    1:5:void <init>():246:250 -> <init>
-com.android.tools.r8.ir.code.InvokeMethodWithReceiver -> com.android.tools.r8.internal.ui:
+    1:1:void <clinit>():244:244 -> <clinit>
+    1:5:void <init>():244:248 -> <init>
+com.android.tools.r8.ir.code.InvokeMethodWithReceiver -> com.android.tools.r8.internal.Fh:
     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>
-    boolean isInvokeMethodWithReceiver() -> C1
+    boolean isInvokeMethodWithReceiver() -> B1
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():112:112 -> G0
     com.android.tools.r8.ir.code.InvokeMethodWithReceiver asInvokeMethodWithReceiver() -> T
     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) -> a
     1:1: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):69:69 -> a
     2:2:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):102:102 -> a
     3:15:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):117:129 -> a
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.type.TypeAnalysis.getRefinedReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):166:166 -> a
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.type.TypeAnalysis.getRefinedReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):167:167 -> a
     16:16:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):129 -> a
-    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.type.TypeAnalysis.getRefinedReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value):171:171 -> a
-    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.type.TypeAnalysis.getRefinedReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):166 -> a
+    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.type.TypeAnalysis.getRefinedReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value):172:172 -> a
+    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.type.TypeAnalysis.getRefinedReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):167 -> a
     17:17:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):129 -> a
     18:23:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):130:135 -> a
     24:24:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):134:134 -> a
     25:25:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):130:130 -> a
-    26:54:boolean upperBoundAssumedByCallSiteOptimizationAndNoLongerInstantiated(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):148:176 -> a
-    55:111: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
-    112:112:boolean com.android.tools.r8.graph.DexClassAndMethod.isLibraryMethod():0:0 -> a
-    112:112:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):243 -> a
-    113:134:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):245:266 -> a
+    26:50:boolean upperBoundAssumedByCallSiteOptimizationAndNoLongerInstantiated(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):148:172 -> a
+    51:51:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    51:51:boolean upperBoundAssumedByCallSiteOptimizationAndNoLongerInstantiated(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):175 -> a
+    52:52:boolean upperBoundAssumedByCallSiteOptimizationAndNoLongerInstantiated(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):176:176 -> a
+    53:109: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
+    110:110:boolean com.android.tools.r8.graph.DexClassAndMethod.isLibraryMethod():0:0 -> a
+    110:110:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):243 -> a
+    111:132:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):245:266 -> a
+    boolean throwsOnNullInput() -> a2
     1:2:boolean hasRefinedReceiverLowerBoundType(com.android.tools.r8.graph.AppView):36:37 -> b
-    boolean throwsOnNullInput() -> b2
     1:3:boolean hasRefinedReceiverUpperBoundType(com.android.tools.r8.graph.AppView):41:43 -> c
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.type.TypeAnalysis.getRefinedReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):166:166 -> c
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.type.TypeAnalysis.getRefinedReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):167:167 -> c
     4:4:boolean hasRefinedReceiverUpperBoundType(com.android.tools.r8.graph.AppView):43 -> c
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.type.TypeAnalysis.getRefinedReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value):171:171 -> c
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.type.TypeAnalysis.getRefinedReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):166 -> c
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.type.TypeAnalysis.getRefinedReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value):172:172 -> c
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.type.TypeAnalysis.getRefinedReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):167 -> c
     5:5: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 -> l2
-com.android.tools.r8.ir.code.InvokeMultiNewArray -> com.android.tools.r8.internal.vi:
+    1:2:com.android.tools.r8.ir.code.Value getReceiver():58:59 -> k2
+com.android.tools.r8.ir.code.InvokeMultiNewArray -> com.android.tools.r8.internal.Gh:
     com.android.tools.r8.graph.DexType type -> j
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():25:25 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,java.util.List):30:31 -> <init>
     boolean hasInvariantOutType() -> N0
     com.android.tools.r8.ir.code.InvokeMultiNewArray asInvokeMultiNewArray() -> U
-    int opcode() -> Y1
+    int opcode() -> X1
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):81:81 -> a
     2:2:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):86:86 -> a
     3:3:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):96:96 -> a
@@ -32257,26 +32222,28 @@
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMultiNewArray():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):75 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):75:75 -> b
-    4:28:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):117:141 -> b
-    29:29:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> b
-    29:29:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):146 -> b
-    30:40:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):147:157 -> b
+    4:25:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):117:138 -> b
+    26:26:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> b
+    26:26:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):141 -> b
+    27:27:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> b
+    27:27:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):146 -> b
+    28:38:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):147:157 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-    1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.code.InvokeMultiNewArray.getArrayType():60:60 -> e2
-    1:1:com.android.tools.r8.graph.DexType getReturnType():65 -> e2
-    java.lang.String getTypeString() -> g2
-    1:1:com.android.tools.r8.graph.DexType getArrayType():60:60 -> j2
-    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> k2
-    1:1:boolean instructionInstanceCanThrowNegativeArraySizeException():162 -> k2
-    2:8:boolean instructionInstanceCanThrowNegativeArraySizeException():162:168 -> k2
-com.android.tools.r8.ir.code.InvokeNewArray -> com.android.tools.r8.internal.wi:
+    1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.code.InvokeMultiNewArray.getArrayType():60:60 -> d2
+    1:1:com.android.tools.r8.graph.DexType getReturnType():65 -> d2
+    java.lang.String getTypeString() -> f2
+    1:1:com.android.tools.r8.graph.DexType getArrayType():60:60 -> i2
+    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> j2
+    1:1:boolean instructionInstanceCanThrowNegativeArraySizeException():162 -> j2
+    2:8:boolean instructionInstanceCanThrowNegativeArraySizeException():162:168 -> j2
+com.android.tools.r8.ir.code.InvokeNewArray -> com.android.tools.r8.internal.Hh:
     com.android.tools.r8.graph.DexType type -> j
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():25:25 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,java.util.List):30:31 -> <init>
     boolean hasInvariantOutType() -> N0
     com.android.tools.r8.ir.code.InvokeNewArray asInvokeNewArray() -> V
-    int opcode() -> Y1
+    int opcode() -> X1
     1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:89 -> 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):110:110 -> a
     21:21:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):115:115 -> a
@@ -32290,24 +32257,26 @@
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isInvokeNewArray():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):94 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):94:94 -> b
-    4:28:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):144:168 -> b
-    29:29:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> b
-    29:29:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):173 -> b
-    30:36:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):174:180 -> b
+    4:25:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):144:165 -> b
+    26:26:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> b
+    26:26:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):168 -> b
+    27:27:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> b
+    27:27:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):173 -> b
+    28:34:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):174:180 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-    1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.code.InvokeNewArray.getArrayType():50:50 -> e2
-    1:1:com.android.tools.r8.graph.DexType getReturnType():46 -> e2
-    java.lang.String getTypeString() -> g2
-    1:1:com.android.tools.r8.errors.Unreachable cfUnsupported():139:139 -> j2
-    1:1:com.android.tools.r8.graph.DexType getArrayType():50:50 -> k2
+    1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.code.InvokeNewArray.getArrayType():50:50 -> d2
+    1:1:com.android.tools.r8.graph.DexType getReturnType():46 -> d2
+    java.lang.String getTypeString() -> f2
+    1:1:com.android.tools.r8.errors.Unreachable cfUnsupported():139:139 -> i2
+    1:1:com.android.tools.r8.graph.DexType getArrayType():50:50 -> j2
     1:1:java.lang.String toString():65:65 -> toString
-com.android.tools.r8.ir.code.InvokePolymorphic -> com.android.tools.r8.internal.xi:
+com.android.tools.r8.ir.code.InvokePolymorphic -> com.android.tools.r8.internal.Ih:
     boolean $assertionsDisabled -> k
     com.android.tools.r8.graph.DexProto proto -> l
     1:1:void <clinit>():29:29 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):34:35 -> <init>
     com.android.tools.r8.ir.code.InvokePolymorphic asInvokePolymorphic() -> W
-    int opcode() -> Y1
+    int opcode() -> X1
     1:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75:81 -> a
     8:8:com.android.tools.r8.graph.DexProto com.android.tools.r8.ir.code.InvokePolymorphic.getProto():69:69 -> a
     8:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):81 -> a
@@ -32329,23 +32298,23 @@
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isInvokePolymorphic():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):112 -> b
     3:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):112:114 -> b
-    1:1:com.android.tools.r8.graph.DexType getReturnType():55:55 -> e2
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():60:60 -> f2
+    1:1:com.android.tools.r8.graph.DexType getReturnType():55:55 -> d2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():60:60 -> e2
+    java.lang.String getTypeString() -> f2
     com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> g
-    java.lang.String getTypeString() -> g2
     com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> i
-    boolean getInterfaceBit() -> j2
-    1:1:com.android.tools.r8.graph.DexProto getProto():69:69 -> l2
-com.android.tools.r8.ir.code.InvokeStatic -> com.android.tools.r8.internal.Di:
+    boolean getInterfaceBit() -> i2
+    1:1:com.android.tools.r8.graph.DexProto getProto():69:69 -> k2
+com.android.tools.r8.ir.code.InvokeStatic -> com.android.tools.r8.internal.Oh:
     boolean isInterface -> m
     int $r8$clinit -> l
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():32:32 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):37:38 -> <init>
     3:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):42:43 -> <init>
-    boolean isInvokeStatic() -> D1
+    boolean isInvokeStatic() -> C1
     com.android.tools.r8.ir.code.InvokeStatic asInvokeStatic() -> X
-    int opcode() -> Y1
+    int opcode() -> X1
     1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):78:96 -> 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):141:141 -> 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):151:151 -> a
@@ -32355,8 +32324,8 @@
     85:85:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeStatic):214:214 -> a
     85:85:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):62 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):101:101 -> b
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():67:67 -> f2
-    java.lang.String getTypeString() -> g2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():67:67 -> e2
+    java.lang.String getTypeString() -> f2
     1:7:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):116:122 -> i
     8:12:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):121:125 -> 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
@@ -32364,46 +32333,33 @@
     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):127 -> i
     15:23:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):127:135 -> i
-    1:1:boolean getInterfaceBit():52:52 -> j2
-com.android.tools.r8.ir.code.InvokeStatic$Builder -> com.android.tools.r8.internal.Di$a:
+    1:1:boolean getInterfaceBit():52:52 -> i2
+com.android.tools.r8.ir.code.InvokeStatic$Builder -> com.android.tools.r8.internal.Oh$a:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():236:236 -> <clinit>
     1:1:void <init>():236:236 -> <init>
     com.android.tools.r8.ir.code.Instruction$BuilderBase self() -> a
-    1:2:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setFreshOutValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueFactory):259:260 -> a
-    1:2:com.android.tools.r8.ir.code.InvokeMethod$Builder setFreshOutValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueFactory):0 -> a
-    3:3:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement):1577:1577 -> a
-    3:3:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setFreshOutValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueFactory):259 -> a
-    3:3:com.android.tools.r8.ir.code.InvokeMethod$Builder setFreshOutValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueFactory):0 -> a
-    4:5:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setOutValue(com.android.tools.r8.ir.code.Value):1572:1573 -> a
-    4:5:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement):1577 -> a
-    4:5:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setFreshOutValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueFactory):259 -> a
-    4:5:com.android.tools.r8.ir.code.InvokeMethod$Builder setFreshOutValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueFactory):0 -> a
-    6:6:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setFreshOutValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueFactory):259:259 -> a
-    6:6:com.android.tools.r8.ir.code.InvokeMethod$Builder setFreshOutValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueFactory):0 -> a
-    7:7:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setMethod(com.android.tools.r8.graph.DexMethod):268:268 -> a
-    7:7:com.android.tools.r8.ir.code.InvokeMethod$Builder setMethod(com.android.tools.r8.graph.DexMethod):0 -> a
-    8:8:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setMethod(com.android.tools.r8.graph.DexClassAndMethod):273:273 -> a
-    8:8:com.android.tools.r8.ir.code.InvokeMethod$Builder setMethod(com.android.tools.r8.graph.DexClassAndMethod):0 -> a
+    1:1:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setMethod(com.android.tools.r8.graph.DexMethod):261:261 -> a
+    1:1:com.android.tools.r8.ir.code.InvokeMethod$Builder setMethod(com.android.tools.r8.graph.DexMethod):0 -> a
     1:5:com.android.tools.r8.ir.code.InvokeStatic build():240:244 -> 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):1565:1566 -> b
     6:7:com.android.tools.r8.ir.code.InvokeStatic build():244 -> b
-    8:8:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setSingleArgument(com.android.tools.r8.ir.code.Value):264:264 -> b
+    8:8:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setSingleArgument(com.android.tools.r8.ir.code.Value):257:257 -> b
     8:8:com.android.tools.r8.ir.code.InvokeMethod$Builder setSingleArgument(com.android.tools.r8.ir.code.Value):0 -> b
-    9:9:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setArguments(java.util.List):254:254 -> b
-    9:9:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setSingleArgument(com.android.tools.r8.ir.code.Value):264 -> b
+    9:9:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setArguments(java.util.List):252:252 -> b
+    9:9:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setSingleArgument(com.android.tools.r8.ir.code.Value):257 -> b
     9:9:com.android.tools.r8.ir.code.InvokeMethod$Builder setSingleArgument(com.android.tools.r8.ir.code.Value):0 -> b
-com.android.tools.r8.ir.code.InvokeSuper -> com.android.tools.r8.internal.Ei:
+com.android.tools.r8.ir.code.InvokeSuper -> com.android.tools.r8.internal.Ph:
     boolean isInterface -> m
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():26:26 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):31:32 -> <init>
+    int opcode() -> X1
     com.android.tools.r8.ir.code.InvokeSuper asInvokeSuper() -> Y
-    int opcode() -> Y1
     1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63:81 -> a
     20:22:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):86:86 -> a
     23:27: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):111:115 -> a
-    28:28:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):552:552 -> a
+    28:28:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):502:502 -> a
     28: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):115 -> a
     29:29:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):124:124 -> a
     30:30: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):134:134 -> a
@@ -32413,59 +32369,59 @@
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isInvokeSuper():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):92 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):92:92 -> b
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():52:52 -> f2
-    java.lang.String getTypeString() -> g2
-    1:1:boolean getInterfaceBit():37:37 -> j2
-com.android.tools.r8.ir.code.InvokeVirtual -> com.android.tools.r8.internal.Fi:
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():52:52 -> e2
+    java.lang.String getTypeString() -> f2
+    1:1:boolean getInterfaceBit():37:37 -> i2
+com.android.tools.r8.ir.code.InvokeVirtual -> com.android.tools.r8.internal.Qh:
     int $r8$clinit -> m
     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>
-    boolean isInvokeVirtual() -> E1
-    int opcode() -> Y1
+    boolean isInvokeVirtual() -> D1
+    int opcode() -> X1
     com.android.tools.r8.ir.code.InvokeVirtual asInvokeVirtual() -> Z
     1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68:86 -> a
     20:20: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):111:111 -> a
     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):110:110 -> 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):121:131 -> a
-    33: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):126:139 -> 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):126:138 -> a
+    46:46:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> 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):139 -> 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):141 -> a
-    48:49: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):141:142 -> a
-    50:50:boolean com.android.tools.r8.graph.DexClass.isFinal():575:575 -> a
-    50:50: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):144 -> a
-    51:51:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():493:493 -> a
-    51: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):144 -> 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):150:150 -> a
-    53:53:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):156:156 -> a
-    54:54:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):161:161 -> a
-    55:55: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
-    56:56:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeVirtual):224:224 -> a
-    56:56:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):52 -> 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):141:144 -> a
+    52:52:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():502:502 -> 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):144 -> 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):150:150 -> 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):156:156 -> a
+    55:55:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):161:161 -> a
+    56:56: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
+    57:57:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeVirtual):224:224 -> a
+    57:57:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):52 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):91:91 -> b
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():57:57 -> f2
-    java.lang.String getTypeString() -> g2
-    boolean getInterfaceBit() -> j2
-com.android.tools.r8.ir.code.InvokeVirtual$Builder -> com.android.tools.r8.internal.Fi$a:
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():57:57 -> e2
+    java.lang.String getTypeString() -> f2
+    boolean getInterfaceBit() -> i2
+com.android.tools.r8.ir.code.InvokeVirtual$Builder -> com.android.tools.r8.internal.Qh$a:
     1:1:void <init>():175:175 -> <init>
     com.android.tools.r8.ir.code.Instruction$BuilderBase self() -> a
-    1:1:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setMethod(com.android.tools.r8.graph.DexMethod):268:268 -> a
+    1:1:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setMethod(com.android.tools.r8.graph.DexMethod):261:261 -> a
     1:1:com.android.tools.r8.ir.code.InvokeMethod$Builder setMethod(com.android.tools.r8.graph.DexMethod):0 -> a
     1:1:com.android.tools.r8.ir.code.InvokeVirtual build():179:179 -> 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):1565:1566 -> b
     2:3:com.android.tools.r8.ir.code.InvokeVirtual build():179 -> b
-    4:4:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setSingleArgument(com.android.tools.r8.ir.code.Value):264:264 -> b
+    4:4:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setSingleArgument(com.android.tools.r8.ir.code.Value):257:257 -> b
     4:4:com.android.tools.r8.ir.code.InvokeMethod$Builder setSingleArgument(com.android.tools.r8.ir.code.Value):0 -> b
-    5:5:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setArguments(java.util.List):254:254 -> b
-    5:5:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setSingleArgument(com.android.tools.r8.ir.code.Value):264 -> b
+    5:5:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setArguments(java.util.List):252:252 -> b
+    5:5:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setSingleArgument(com.android.tools.r8.ir.code.Value):257 -> b
     5:5:com.android.tools.r8.ir.code.InvokeMethod$Builder setSingleArgument(com.android.tools.r8.ir.code.Value):0 -> b
-com.android.tools.r8.ir.code.JumpInstruction -> com.android.tools.r8.internal.rj:
+com.android.tools.r8.ir.code.JumpInstruction -> com.android.tools.r8.internal.zi:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():16:16 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.code.Value):20:20 -> <init>
     3:3:void <init>(java.util.List):24:24 -> <init>
-    boolean isJumpInstruction() -> F1
+    boolean isJumpInstruction() -> E1
     boolean hasInvariantOutType() -> N0
     1:1:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):37:37 -> a
     2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):53:53 -> a
@@ -32473,15 +32429,15 @@
     3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):53 -> a
     com.android.tools.r8.ir.code.JumpInstruction asJumpInstruction() -> a0
     1:1:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):32:32 -> b
-    com.android.tools.r8.ir.code.BasicBlock fallthroughBlock() -> c2
+    com.android.tools.r8.ir.code.BasicBlock fallthroughBlock() -> b2
     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.fo:
+com.android.tools.r8.ir.code.LazyDominatorTree -> com.android.tools.r8.internal.kn:
     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.Lo:
+com.android.tools.r8.ir.code.LinearFlowInstructionListIterator -> com.android.tools.r8.internal.Pn:
     java.util.Set seenBlocks -> e
     com.android.tools.r8.ir.code.IRCode code -> b
     com.android.tools.r8.ir.code.InstructionListIterator currentBlockIterator -> d
@@ -32499,39 +32455,38 @@
     6:6: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):81:81 -> a
     7:7:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):86:86 -> a
     8:8:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):98:98 -> a
-    9:9:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):110:110 -> a
-    10:10:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):121:121 -> a
-    11:11:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):128:128 -> a
-    12:12:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):133:133 -> a
-    13:13:com.android.tools.r8.ir.code.BasicBlock splitCopyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):139:139 -> a
-    14:14: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):150:150 -> a
-    15:15:void addThrowingInstructionToPossiblyThrowingBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.utils.InternalOptions):165:165 -> a
-    16:19:boolean isLinearEdge(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):175:178 -> a
-    20:30:com.android.tools.r8.ir.code.BasicBlock getBeginningOfTrivialLinearGotoChain(com.android.tools.r8.ir.code.BasicBlock):210:220 -> a
+    9:9:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):109:109 -> a
+    10:10:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):116:116 -> a
+    11:11:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):121:121 -> a
+    12:12:com.android.tools.r8.ir.code.BasicBlock splitCopyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):127:127 -> a
+    13:13: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):138:138 -> a
+    14:14:void addThrowingInstructionToPossiblyThrowingBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.utils.InternalOptions):153:153 -> a
+    15:18:boolean isLinearEdge(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):163:166 -> a
+    19:29:com.android.tools.r8.ir.code.BasicBlock getBeginningOfTrivialLinearGotoChain(com.android.tools.r8.ir.code.BasicBlock):198:208 -> a
     1:1:void add(java.lang.Object):21:21 -> add
-    2:2:void com.android.tools.r8.ir.code.LinearFlowInstructionListIterator.add(com.android.tools.r8.ir.code.Instruction):156:156 -> add
+    2:2:void com.android.tools.r8.ir.code.LinearFlowInstructionListIterator.add(com.android.tools.r8.ir.code.Instruction):144:144 -> add
     2:2:void add(java.lang.Object):21 -> add
     1:1:boolean hasVisitedBlock(com.android.tools.r8.ir.code.BasicBlock):47:47 -> b
     2:2:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):92:92 -> b
-    1:19:com.android.tools.r8.ir.code.Instruction next():188:206 -> f
-    1:1:boolean hasNext():183:183 -> hasNext
-    1:4:boolean hasPrevious():225:228 -> hasPrevious
-    1:1:void removeOrReplaceByDebugLocalRead():171:171 -> j
+    1:19:com.android.tools.r8.ir.code.Instruction next():176:194 -> e
+    1:1:boolean hasNext():171:171 -> hasNext
+    1:4:boolean hasPrevious():213:216 -> hasPrevious
+    1:1:void removeOrReplaceByDebugLocalRead():159:159 -> j
     1:1:java.lang.Object next():21:21 -> next
-    1:1:int nextIndex():251:251 -> nextIndex
+    1:1:int nextIndex():239:239 -> nextIndex
     1:1:java.lang.Object previous():21:21 -> previous
-    2:15:com.android.tools.r8.ir.code.Instruction previous():233:246 -> previous
-    1:1:int previousIndex():256:256 -> previousIndex
-    1:1:void remove():261:261 -> remove
+    2:15:com.android.tools.r8.ir.code.Instruction previous():221:234 -> previous
+    1:1:int previousIndex():244:244 -> previousIndex
+    1:1:void remove():249:249 -> remove
     1:1:void set(java.lang.Object):21:21 -> set
-    2:2:void com.android.tools.r8.ir.code.LinearFlowInstructionListIterator.set(com.android.tools.r8.ir.code.Instruction):266:266 -> set
+    2:2:void com.android.tools.r8.ir.code.LinearFlowInstructionListIterator.set(com.android.tools.r8.ir.code.Instruction):254:254 -> set
     2:2:void set(java.lang.Object):21 -> set
-com.android.tools.r8.ir.code.Load -> com.android.tools.r8.internal.dp:
+com.android.tools.r8.ir.code.Load -> com.android.tools.r8.internal.go:
     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() -> W1
-    1:1:int maxOutValueRegister():62:62 -> X1
-    int opcode() -> Y1
+    int maxInValueRegister() -> V1
+    1:1:int maxOutValueRegister():62:62 -> W1
+    int opcode() -> X1
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):33:33 -> a
     2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):68:68 -> a
@@ -32545,13 +32500,13 @@
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isLoad():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):52 -> b
     com.android.tools.r8.ir.code.Load asLoad() -> b0
-    1:1:com.android.tools.r8.ir.code.Value src():37:37 -> c2
+    1:1:com.android.tools.r8.ir.code.Value src():37:37 -> b2
     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.np:
+com.android.tools.r8.ir.code.LogicalBinop -> com.android.tools.r8.internal.qo:
     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>
-    boolean isLogicalBinop() -> H1
+    boolean isLogicalBinop() -> G1
     com.android.tools.r8.code.Instruction CreateInt(int,int,int) -> a
     1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55:73 -> a
     20:47:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):67:94 -> a
@@ -32579,11 +32534,11 @@
     1:5:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):44:48 -> c
     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() -> h2
-com.android.tools.r8.ir.code.LogicalBinop$1 -> com.android.tools.r8.internal.mp:
+    com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode() -> g2
+com.android.tools.r8.ir.code.LogicalBinop$1 -> com.android.tools.r8.internal.po:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():65:65 -> <clinit>
-com.android.tools.r8.ir.code.MemberType -> com.android.tools.r8.internal.wq:
+com.android.tools.r8.ir.code.MemberType -> com.android.tools.r8.internal.tp:
     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
@@ -32615,20 +32570,20 @@
     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
     1:1:com.android.tools.r8.ir.code.MemberType[] values():11:11 -> b
-com.android.tools.r8.ir.code.Monitor -> com.android.tools.r8.internal.or:
+com.android.tools.r8.ir.code.Monitor -> com.android.tools.r8.internal.mq:
     com.android.tools.r8.ir.code.Monitor$Type type -> i
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():21:21 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Monitor$Type,com.android.tools.r8.ir.code.Value):30:31 -> <init>
     1:7:java.lang.String getInstructionName():118:124 -> F0
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():155:155 -> G0
-    1:1:boolean com.android.tools.r8.ir.code.Monitor.isEnter():49:49 -> I1
-    1:1:boolean isMonitorEnter():102 -> I1
+    1:1:boolean com.android.tools.r8.ir.code.Monitor.isEnter():49:49 -> H1
+    1:1:boolean isMonitorEnter():102 -> H1
     boolean hasInvariantOutType() -> N0
-    boolean instructionTypeCanThrow() -> V0
-    int maxInValueRegister() -> W1
-    1:1:int maxOutValueRegister():86:86 -> X1
-    int opcode() -> Y1
+    boolean instructionTypeCanThrow() -> U0
+    int maxInValueRegister() -> V1
+    1:1:int maxOutValueRegister():86:86 -> W1
+    int opcode() -> X1
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):41:41 -> a
     2:9:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63:70 -> 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):113:113 -> a
@@ -32637,19 +32592,19 @@
     12:12:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):135:135 -> a
     13:13:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):140:140 -> a
     14:14:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):145:145 -> a
+    boolean throwsOnNullInput() -> a2
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):76:76 -> b
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isMonitor():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):76 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):76:76 -> b
-    boolean throwsOnNullInput() -> b2
+    1:1:boolean isEnter():49:49 -> b2
     1:1:com.android.tools.r8.ir.code.Value object():45:45 -> c
-    1:1:boolean isEnter():49:49 -> c2
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     com.android.tools.r8.ir.code.Monitor asMonitor() -> d0
-com.android.tools.r8.ir.code.Monitor$1 -> com.android.tools.r8.internal.nr:
+com.android.tools.r8.ir.code.Monitor$1 -> com.android.tools.r8.internal.lq:
     int[] $SwitchMap$com$android$tools$r8$ir$code$Monitor$Type -> a
     1:1:void <clinit>():118:118 -> <clinit>
-com.android.tools.r8.ir.code.Monitor$Type -> com.android.tools.r8.internal.or$a:
+com.android.tools.r8.ir.code.Monitor$Type -> com.android.tools.r8.internal.mq$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
@@ -32657,17 +32612,17 @@
     2:2:void <clinit>():23:23 -> <clinit>
     1:1:void <init>(java.lang.String,int):23:23 -> <init>
     1:1:com.android.tools.r8.ir.code.Monitor$Type[] values():23:23 -> a
-com.android.tools.r8.ir.code.Move -> com.android.tools.r8.internal.qr:
+com.android.tools.r8.ir.code.Move -> com.android.tools.r8.internal.nq:
     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>
     1:2:com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction():87:88 -> I0
-    boolean isMove() -> J1
+    boolean isMove() -> I1
+    1:1:boolean isOutConstant():82:82 -> M1
     boolean hasInvariantOutType() -> N0
-    1:1:boolean isOutConstant():82:82 -> N1
-    int maxInValueRegister() -> W1
-    int maxOutValueRegister() -> X1
-    int opcode() -> Y1
+    int maxInValueRegister() -> V1
+    int maxOutValueRegister() -> W1
+    int opcode() -> X1
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):34:34 -> a
     2:2:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):47:47 -> a
     3:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):52:52 -> a
@@ -32682,21 +32637,21 @@
     10:10:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):131 -> a
     11:11:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):132:132 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):72:72 -> b
-    1:1:com.android.tools.r8.ir.code.Value dest():38:38 -> c2
+    1:1:com.android.tools.r8.ir.code.Value dest():38:38 -> b2
+    1:1:com.android.tools.r8.ir.code.Value src():42:42 -> c2
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-    1:1:com.android.tools.r8.ir.code.Value src():42:42 -> d2
     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.sr:
+com.android.tools.r8.ir.code.MoveException -> com.android.tools.r8.internal.pq:
     com.android.tools.r8.graph.DexType exceptionType -> i
     boolean $assertionsDisabled -> h
     com.android.tools.r8.utils.InternalOptions options -> j
     1:1:void <clinit>():21:21 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):26:28 -> <init>
     boolean hasInvariantOutType() -> N0
-    1:1:int maxInValueRegister():53:53 -> W1
-    int maxOutValueRegister() -> X1
-    int opcode() -> Y1
+    1:1:int maxInValueRegister():53:53 -> V1
+    int maxOutValueRegister() -> W1
+    int opcode() -> X1
     void buildCf(com.android.tools.r8.ir.conversion.CfBuilder) -> a
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):38:38 -> a
     2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.MoveException.dest():42:42 -> a
@@ -32714,15 +32669,15 @@
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):64 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):67:67 -> b
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTypeBug():1830:1830 -> b
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTypeBug():1956:1956 -> b
     4:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):67 -> b
     5:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):68:68 -> b
-    1:1:com.android.tools.r8.graph.DexType getExceptionType():126:126 -> c2
+    1:1:com.android.tools.r8.graph.DexType getExceptionType():126:126 -> b2
     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.ur:
+com.android.tools.r8.ir.code.Mul -> com.android.tools.r8.internal.rq:
     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() -> Y1
+    int opcode() -> X1
     double foldDouble(double,double) -> a
     float foldFloat(float,float) -> a
     int foldIntegers(int,int) -> a
@@ -32737,20 +32692,20 @@
     5:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):104:104 -> b
     1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):45:45 -> c
     2:2:com.android.tools.r8.code.Instruction CreateFloat2Addr(int,int):84:84 -> c
+    boolean isCommutative() -> c2
     1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):74:74 -> d
     2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):99:99 -> d
-    boolean isCommutative() -> d2
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):79:79 -> e
     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):53:53 -> f
     com.android.tools.r8.ir.code.Mul asMul() -> g0
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():139:139 -> h2
-com.android.tools.r8.ir.code.Neg -> com.android.tools.r8.internal.es:
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():139:139 -> g2
+com.android.tools.r8.ir.code.Neg -> com.android.tools.r8.internal.Yq:
     com.android.tools.r8.ir.code.NumericType type -> i
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():21:21 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):26:27 -> <init>
-    int opcode() -> Y1
+    int opcode() -> X1
     1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Unop.dest():21:21 -> a
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55 -> a
     2:18:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55:71 -> a
@@ -32769,41 +32724,44 @@
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):49 -> b
     3:3: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.Neg$1 -> com.android.tools.r8.internal.ds:
+com.android.tools.r8.ir.code.Neg$1 -> com.android.tools.r8.internal.Xq:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():57:57 -> <clinit>
-com.android.tools.r8.ir.code.NewArrayEmpty -> com.android.tools.r8.internal.ms:
+com.android.tools.r8.ir.code.NewArrayEmpty -> com.android.tools.r8.internal.ir:
     com.android.tools.r8.graph.DexType type -> i
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():22:22 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):27:28 -> <init>
     boolean hasInvariantOutType() -> N0
-    1:4:boolean instructionInstanceCanThrow():79:82 -> T0
-    boolean instructionTypeCanThrow() -> V0
-    int maxInValueRegister() -> W1
-    int maxOutValueRegister() -> X1
-    int opcode() -> Y1
+    1:4:boolean instructionInstanceCanThrow():79:82 -> S0
+    boolean instructionTypeCanThrow() -> U0
+    int maxInValueRegister() -> V1
+    int maxOutValueRegister() -> W1
+    int opcode() -> X1
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):38:38 -> a
     2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):56:56 -> a
     3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.NewArrayEmpty.dest():47:47 -> a
     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:14:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):87:95 -> 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):93:93 -> a
-    16:16:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):116:116 -> a
-    17:17:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):126:126 -> a
-    18:19:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):131:132 -> a
-    20:21:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):137:138 -> a
-    22:22:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):143:143 -> 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):273:273 -> 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
+    15:15:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):116:116 -> a
+    16:16:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):126:126 -> a
+    17:18:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):131:132 -> a
+    19:20:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):137:138 -> a
+    21:21:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):143:143 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):100:100 -> b
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):100 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):100:100 -> b
-    1:1:com.android.tools.r8.ir.code.Value size():51:51 -> c2
+    1:1:com.android.tools.r8.ir.code.Value size():51:51 -> b2
     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.ns:
+com.android.tools.r8.ir.code.NewArrayFilledData -> com.android.tools.r8.internal.jr:
     long size -> j
     short[] data -> k
     int element_width -> i
@@ -32811,10 +32769,10 @@
     1:1:void <clinit>():19:19 -> <clinit>
     1:4:void <init>(com.android.tools.r8.ir.code.Value,int,long,short[]):29:32 -> <init>
     boolean hasInvariantOutType() -> N0
-    boolean instructionTypeCanThrow() -> V0
-    int maxInValueRegister() -> W1
-    1:1:int maxOutValueRegister():82:82 -> X1
-    int opcode() -> Y1
+    boolean instructionTypeCanThrow() -> U0
+    int maxInValueRegister() -> V1
+    1:1:int maxOutValueRegister():82:82 -> W1
+    int opcode() -> X1
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):42:42 -> a
     2:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55:56 -> a
     4:4:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):61:61 -> a
@@ -32831,22 +32789,22 @@
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):66 -> b
     3:6:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):69:72 -> b
     7:7:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):119:119 -> b
-    1:1:com.android.tools.r8.ir.code.Value src():46:46 -> c2
+    1:1:com.android.tools.r8.ir.code.Value src():46:46 -> b2
     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.os:
+com.android.tools.r8.ir.code.NewInstance -> com.android.tools.r8.internal.kr:
     com.android.tools.r8.graph.DexType clazz -> i
     boolean allowSpilling -> j
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():30:30 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):36:36 -> <init>
     2:7:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):33:38 -> <init>
-    boolean isNewInstance() -> L1
+    boolean isNewInstance() -> K1
     boolean hasInvariantOutType() -> N0
-    boolean instructionTypeCanThrow() -> V0
-    1:1:int maxInValueRegister():77:77 -> W1
-    int maxOutValueRegister() -> X1
-    int opcode() -> Y1
+    boolean instructionTypeCanThrow() -> U0
+    1:1:int maxInValueRegister():77:77 -> V1
+    int maxOutValueRegister() -> W1
+    int opcode() -> X1
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):52:52 -> a
     2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.NewInstance.dest():56:56 -> a
     2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):61 -> a
@@ -32857,27 +32815,30 @@
     8:8:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):125:125 -> a
     9:9:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):130:130 -> 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):140:140 -> a
-    11:26:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):147:162 -> a
-    27:27:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> 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):166 -> a
-    28:51:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):166:189 -> a
-    52:52:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):157:157 -> a
-    53:56:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):221:224 -> 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):147:161 -> a
+    26:26:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> 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):161 -> 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):162:162 -> a
+    28:28:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    28:28:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):166 -> a
+    29:52:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):166:189 -> a
+    53:53:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):157:157 -> a
+    54:57:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):221:224 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):72:72 -> b
-    1:1:com.android.tools.r8.ir.code.Value dest():56:56 -> c2
+    1:1:com.android.tools.r8.ir.code.Value dest():56:56 -> b2
+    1:1:boolean isSpillingAllowed():203:203 -> c2
     1:8:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):208:215 -> d
-    1:1:boolean isSpillingAllowed():203:203 -> d2
-    1:1:void markNoSpilling():199:199 -> e2
+    1:1:void markNoSpilling():199:199 -> d2
     com.android.tools.r8.ir.code.NewInstance asNewInstance() -> k0
     1:1:java.lang.String toString():67:67 -> toString
-com.android.tools.r8.ir.code.NextUntilIterator -> com.android.tools.r8.internal.ps:
+com.android.tools.r8.ir.code.NextUntilIterator -> com.android.tools.r8.internal.lr:
     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.Ns:
+com.android.tools.r8.ir.code.Not -> com.android.tools.r8.internal.Hr:
     com.android.tools.r8.ir.code.NumericType type -> i
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():19:19 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:25 -> <init>
-    int opcode() -> Y1
+    int opcode() -> X1
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):35:35 -> a
     2:3:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):45:46 -> a
     4:4:boolean com.android.tools.r8.ir.analysis.constant.LatticeElement.isConst():0:0 -> a
@@ -32895,15 +32856,15 @@
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):83 -> b
     3:3: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.Not$1 -> com.android.tools.r8.internal.Ms:
+com.android.tools.r8.ir.code.Not$1 -> com.android.tools.r8.internal.Gr:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():68:68 -> <clinit>
-com.android.tools.r8.ir.code.NumberConversion -> com.android.tools.r8.internal.Vs:
+com.android.tools.r8.ir.code.NumberConversion -> com.android.tools.r8.internal.Pr:
     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>
-    boolean isNumberConversion() -> M1
-    int opcode() -> Y1
+    boolean isNumberConversion() -> L1
+    int opcode() -> X1
     1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Unop.dest():21:21 -> a
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58 -> a
     2:75:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58:131 -> a
@@ -32928,15 +32889,15 @@
     247:247: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.NumberConversion$1 -> com.android.tools.r8.internal.Vs$a:
+com.android.tools.r8.ir.code.NumberConversion$1 -> com.android.tools.r8.internal.Pr$a:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():62:62 -> <clinit>
-com.android.tools.r8.ir.code.NumberGenerator -> com.android.tools.r8.internal.Ws:
+com.android.tools.r8.ir.code.NumberGenerator -> com.android.tools.r8.internal.Qr:
     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.at:
+com.android.tools.r8.ir.code.NumericType -> com.android.tools.r8.internal.Sr:
     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
@@ -32963,12 +32924,12 @@
     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
     1:1:com.android.tools.r8.ir.code.NumericType[] values():10:10 -> b
-com.android.tools.r8.ir.code.NumericType$1 -> com.android.tools.r8.internal.at$a:
+com.android.tools.r8.ir.code.NumericType$1 -> com.android.tools.r8.internal.Sr$a:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():20:20 -> <clinit>
-com.android.tools.r8.ir.code.Or -> com.android.tools.r8.internal.zu:
+com.android.tools.r8.ir.code.Or -> com.android.tools.r8.internal.st:
     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() -> Y1
+    int opcode() -> X1
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):28:28 -> a
@@ -32982,11 +32943,11 @@
     5:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):78:78 -> b
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):63:63 -> c
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):68:68 -> c
+    boolean isCommutative() -> c2
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> d
-    boolean isCommutative() -> d2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> h2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> g2
     com.android.tools.r8.ir.code.Or asOr() -> n0
-com.android.tools.r8.ir.code.Phi -> com.android.tools.r8.internal.fv:
+com.android.tools.r8.ir.code.Phi -> com.android.tools.r8.internal.Yt:
     com.android.tools.r8.ir.code.Phi$RegisterReadType readType -> t
     java.util.List definitionUsers -> v
     java.util.List operands -> s
@@ -33001,10 +32962,7 @@
     1:1:void markNonDebugLocalRead():164:164 -> Y
     1:1:boolean needsRegister():394:394 -> Z
     1:4:void constrainType(com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.utils.Reporter):89:92 -> a
-    5:27:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):114:136 -> a
-    28:29:void com.android.tools.r8.ir.code.Phi.appendOperand(com.android.tools.r8.ir.code.Value):175:176 -> a
-    28:29:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):137 -> a
-    30:30:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):139:139 -> a
+    5:30:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):114:139 -> a
     31:31:void com.android.tools.r8.ir.code.Phi.throwUndefinedValueError():168:168 -> a
     31:31:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):116 -> a
     32:32:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
@@ -33016,50 +32974,49 @@
     33:33:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):116 -> a
     34:34:void com.android.tools.r8.ir.code.Phi.throwUndefinedValueError():168:168 -> a
     34:34:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):116 -> a
-    35:35:void addOperands(java.util.List):143:143 -> a
-    36:41:void addOperands(java.util.List,boolean):150:155 -> a
-    42:42:boolean com.android.tools.r8.ir.code.Phi.removeTrivialPhi():240:240 -> a
-    42:42:void addOperands(java.util.List,boolean):158 -> a
-    43:43:void com.android.tools.r8.ir.code.Phi.throwUndefinedValueError():168:168 -> a
+    35:40:void addOperands(java.util.List,boolean):150:155 -> a
+    41:41:boolean com.android.tools.r8.ir.code.Phi.removeTrivialPhi():240:240 -> a
+    41:41:void addOperands(java.util.List,boolean):158 -> a
+    42:42:void com.android.tools.r8.ir.code.Phi.throwUndefinedValueError():168:168 -> a
+    42:42:void addOperands(java.util.List,boolean):152 -> a
+    43:43:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    43:43:void com.android.tools.r8.ir.code.Phi.throwUndefinedValueError():168 -> a
     43:43:void addOperands(java.util.List,boolean):152 -> a
-    44:44:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    44:44:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    44:44:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
     44:44:void com.android.tools.r8.ir.code.Phi.throwUndefinedValueError():168 -> a
     44:44:void addOperands(java.util.List,boolean):152 -> a
-    45:45:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    45:45:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    45:45:void com.android.tools.r8.ir.code.Phi.throwUndefinedValueError():168 -> a
+    45:45:void com.android.tools.r8.ir.code.Phi.throwUndefinedValueError():168:168 -> a
     45:45:void addOperands(java.util.List,boolean):152 -> a
-    46:46:void com.android.tools.r8.ir.code.Phi.throwUndefinedValueError():168:168 -> a
-    46:46:void addOperands(java.util.List,boolean):152 -> a
-    47:50:void replaceOperandAt(int,com.android.tools.r8.ir.code.Value):208:211 -> a
-    51:54:void replaceOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):215:218 -> a
-    55:87:boolean removeTrivialPhi(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):245:277 -> a
-    88:88:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
-    88:88:boolean removeTrivialPhi(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):277 -> a
-    89:107:boolean removeTrivialPhi(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):278:296 -> a
-    108:108:void com.android.tools.r8.ir.code.Phi.addDefinitionsUser(java.util.Map):353:353 -> a
-    108:108:boolean removeTrivialPhi(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):296 -> a
-    109:118:boolean removeTrivialPhi(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):303:312 -> a
-    119:126:void print(com.android.tools.r8.utils.CfgPrinter):341:348 -> a
-    127:127:void addDefinitionsUser(java.util.Map):353:353 -> a
-    128:131:void lambda$verifyIsStackPhi$0(java.util.Set,com.android.tools.r8.ir.code.Value):383:386 -> a
-    132:132:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):402:402 -> a
-    133:133:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():773:773 -> a
-    133:133:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):402 -> a
-    134:142:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):402:410 -> a
+    46:57:void removeOperandsByIndex(java.util.List):193:204 -> a
+    58:61:void replaceOperandAt(int,com.android.tools.r8.ir.code.Value):208:211 -> a
+    62:65:void replaceOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):215:218 -> a
+    66:98:boolean removeTrivialPhi(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):245:277 -> a
+    99:99:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
+    99:99:boolean removeTrivialPhi(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):277 -> a
+    100:118:boolean removeTrivialPhi(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):278:296 -> a
+    119:119:void com.android.tools.r8.ir.code.Phi.addDefinitionsUser(java.util.Map):353:353 -> a
+    119:119:boolean removeTrivialPhi(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):296 -> a
+    120:129:boolean removeTrivialPhi(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):303:312 -> a
+    130:137:void print(com.android.tools.r8.utils.CfgPrinter):341:348 -> a
+    138:138:void addDefinitionsUser(java.util.Map):353:353 -> a
+    139:142:void lambda$verifyIsStackPhi$0(java.util.Set,com.android.tools.r8.ir.code.Value):383:386 -> a
+    143:143:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):402:402 -> a
+    144:144:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():770:770 -> a
+    144:144:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):402 -> a
+    145:153:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):402:410 -> a
     boolean isDefinedByInstructionSatisfying(java.util.function.Predicate) -> b
     1:2:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object):16:17 -> b
     1:2:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):425 -> b
     3:24:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):426:447 -> b
     25:27:void abortOnInvalidDebugInfo(com.android.tools.r8.ir.code.ValueTypeConstraint):96:98 -> b
-    28:39:void removeOperandsByIndex(java.util.List):193:204 -> b
-    40:40:void removeDefinitionsUser(java.util.Map):357:357 -> b
+    28:28:void removeDefinitionsUser(java.util.Map):357:357 -> b
     1:1:void setIsStackPhi(boolean):376:376 -> c
     2:3:boolean verifyIsStackPhi(java.util.Set):380:381 -> c
     1:1:com.android.tools.r8.ir.code.BasicBlock getBlock():83:83 -> d
     2:2:com.android.tools.r8.ir.code.Value getOperand(int):180:180 -> d
     3:5:com.android.tools.r8.ir.analysis.type.TypeElement computePhiType(com.android.tools.r8.graph.AppView):415:417 -> d
-    boolean isPhi() -> e
+    boolean isPhi() -> f
     1:2:void removeOperand(int):188:189 -> g
     com.android.tools.r8.ir.code.Phi asPhi() -> h
     1:2:void appendOperand(com.android.tools.r8.ir.code.Value):175:176 -> i
@@ -33073,25 +33030,25 @@
     5:5:void removeDeadPhi():324 -> o0
     6:6:void removeDeadPhi():324:324 -> o0
     1:1:boolean removeTrivialPhi():240:240 -> p0
-com.android.tools.r8.ir.code.Phi$RegisterReadType -> com.android.tools.r8.internal.fv$a:
+com.android.tools.r8.ir.code.Phi$RegisterReadType -> com.android.tools.r8.internal.Yt$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.fv$b:
+com.android.tools.r8.ir.code.Phi$StackMapPhi -> com.android.tools.r8.internal.Yt$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.pv:
+com.android.tools.r8.ir.code.Pop -> com.android.tools.r8.internal.iu:
     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():61:61 -> W1
-    1:1:int maxOutValueRegister():66:66 -> X1
-    int opcode() -> Y1
+    1:1:int maxInValueRegister():61:61 -> V1
+    1:1:int maxOutValueRegister():66:66 -> W1
+    int opcode() -> X1
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):31:31 -> a
     2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):72:72 -> a
     3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forPop():300:300 -> a
@@ -33108,7 +33065,7 @@
     7:7:boolean com.android.tools.r8.ir.code.Instruction.isPop():0:0 -> b
     7:7:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):56 -> 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.qv:
+com.android.tools.r8.ir.code.Position -> com.android.tools.r8.internal.ju:
     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
@@ -33135,19 +33092,19 @@
     1:1:com.android.tools.r8.graph.DexMethod lambda$specify$3(com.android.tools.r8.ir.code.Position):45:45 -> d
     2:2:boolean isSyntheticNone():119:119 -> d
     1:1:com.android.tools.r8.ir.code.Position lambda$specify$4(com.android.tools.r8.ir.code.Position):46:46 -> e
-    2:2:com.android.tools.r8.ir.code.Position none():72:72 -> e
+    2:2:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():111:111 -> e
     1:1:boolean equals(java.lang.Object):138:138 -> equals
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():111:111 -> f
+    1:1:com.android.tools.r8.ir.code.Position none():72:72 -> f
     1:1:com.android.tools.r8.ir.code.Position syntheticNone():76:76 -> g
     1:1:com.android.tools.r8.ir.code.Position testingPosition():81:81 -> h
     1:5:int hashCode():143:147 -> hashCode
     com.android.tools.r8.utils.structural.StructuralItem self() -> k
     1:19:java.lang.String com.android.tools.r8.ir.code.Position.toString(boolean):152:170 -> toString
     1:19:java.lang.String toString():175 -> toString
-com.android.tools.r8.ir.code.Rem -> com.android.tools.r8.internal.Uz:
+com.android.tools.r8.ir.code.Rem -> com.android.tools.r8.internal.Gy:
     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 -> V0
-    int opcode() -> Y1
+    1:1:boolean instructionTypeCanThrow():134:134 -> U0
+    int opcode() -> X1
     double foldDouble(double,double) -> a
     float foldFloat(float,float) -> a
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):34:34 -> a
@@ -33166,23 +33123,23 @@
     5:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):104:104 -> b
     1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):54:54 -> c
     2:2:com.android.tools.r8.code.Instruction CreateFloat2Addr(int,int):84:84 -> c
+    boolean isCommutative() -> c2
     1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):74:74 -> d
     2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):99:99 -> d
-    boolean isCommutative() -> d2
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):79:79 -> e
     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 -> h2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> g2
     com.android.tools.r8.ir.code.Rem asRem() -> o0
-com.android.tools.r8.ir.code.Return -> com.android.tools.r8.internal.gB:
+com.android.tools.r8.ir.code.Return -> com.android.tools.r8.internal.Sz:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():21:21 -> <clinit>
     1:1:void <init>():24:24 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.code.Value):28:28 -> <init>
-    boolean isReturn() -> O1
-    int maxInValueRegister() -> W1
-    1:1:int maxOutValueRegister():97:97 -> X1
-    int opcode() -> Y1
+    boolean isReturn() -> N1
+    int maxInValueRegister() -> V1
+    1:1:int maxOutValueRegister():97:97 -> W1
+    int opcode() -> X1
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):38:38 -> a
     2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75:75 -> a
     3:3: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
@@ -33193,15 +33150,15 @@
     8:8:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):126:126 -> a
     1:15:com.android.tools.r8.code.Instruction createDexInstruction(com.android.tools.r8.ir.conversion.DexBuilder):56:70 -> b
     16:23:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):80:87 -> b
-    24:26:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isValueTypeCompatible(com.android.tools.r8.ir.analysis.type.TypeElement):424:426 -> b
+    24:26:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isValueTypeCompatible(com.android.tools.r8.ir.analysis.type.TypeElement):422:424 -> b
     24:26:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):87 -> b
-    1:2:com.android.tools.r8.ir.analysis.type.TypeElement getReturnType():46:47 -> d2
-    1:1:boolean isReturnVoid():42:42 -> e2
-    1:2:com.android.tools.r8.ir.code.Value returnValue():51:52 -> f2
+    1:2:com.android.tools.r8.ir.analysis.type.TypeElement getReturnType():46:47 -> c2
+    1:1:boolean isReturnVoid():42:42 -> d2
+    1:2:com.android.tools.r8.ir.code.Value returnValue():51:52 -> e2
     com.android.tools.r8.ir.code.Return asReturn() -> p0
-com.android.tools.r8.ir.code.Shl -> com.android.tools.r8.internal.NB:
+com.android.tools.r8.ir.code.Shl -> com.android.tools.r8.internal.zA:
     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() -> Y1
+    int opcode() -> X1
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):27:27 -> a
@@ -33214,14 +33171,14 @@
     5:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):83:83 -> b
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):68:68 -> c
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):73:73 -> c
+    boolean isCommutative() -> c2
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):58:58 -> d
-    boolean isCommutative() -> d2
     1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):33:33 -> g
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> h2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> g2
     com.android.tools.r8.ir.code.Shl asShl() -> q0
-com.android.tools.r8.ir.code.Shr -> com.android.tools.r8.internal.PB:
+com.android.tools.r8.ir.code.Shr -> com.android.tools.r8.internal.BA:
     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() -> Y1
+    int opcode() -> X1
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):27:27 -> a
@@ -33234,14 +33191,14 @@
     5:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):83:83 -> b
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):68:68 -> c
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):73:73 -> c
+    boolean isCommutative() -> c2
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):58:58 -> d
-    boolean isCommutative() -> d2
     1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):33:33 -> g
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> h2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> g2
     com.android.tools.r8.ir.code.Shr asShr() -> r0
-com.android.tools.r8.ir.code.SingleConstant -> com.android.tools.r8.internal.bC:
+com.android.tools.r8.ir.code.SingleConstant -> com.android.tools.r8.internal.NA:
     int decodedValue() -> a
-com.android.tools.r8.ir.code.StackValue -> com.android.tools.r8.internal.PC:
+com.android.tools.r8.ir.code.StackValue -> com.android.tools.r8.internal.AB:
     boolean $assertionsDisabled -> q
     int height -> r
     com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo typeInfo -> s
@@ -33254,7 +33211,7 @@
     1:1:int getHeight():31:31 -> k0
     1:1:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo():35:35 -> l0
     1:1:java.lang.String toString():59:59 -> toString
-com.android.tools.r8.ir.code.StackValues -> com.android.tools.r8.internal.QC:
+com.android.tools.r8.ir.code.StackValues -> com.android.tools.r8.internal.BB:
     boolean $assertionsDisabled -> q
     com.android.tools.r8.ir.code.StackValue[] stackValues -> r
     1:1:void <clinit>():14:14 -> <clinit>
@@ -33265,15 +33222,15 @@
     1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():25:25 -> k0
     1:10:java.lang.String toString():40:49 -> toString
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getType():59:59 -> y
-com.android.tools.r8.ir.code.StaticGet -> com.android.tools.r8.internal.aD:
+com.android.tools.r8.ir.code.StaticGet -> com.android.tools.r8.internal.PB:
     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>
-    boolean instructionTypeCanBeCanonicalized() -> U0
-    boolean instructionTypeCanThrow() -> V0
-    int maxInValueRegister() -> W1
-    int maxOutValueRegister() -> X1
-    int opcode() -> Y1
+    boolean instructionTypeCanBeCanonicalized() -> T0
+    boolean instructionTypeCanThrow() -> U0
+    int maxInValueRegister() -> V1
+    int maxOutValueRegister() -> W1
+    int opcode() -> X1
     1:2:com.android.tools.r8.ir.code.StaticGet copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.StaticGet):41:42 -> a
     3:4:com.android.tools.r8.ir.code.StaticGet com.android.tools.r8.ir.code.StaticGet.copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.StaticGet):47:48 -> a
     3:4:com.android.tools.r8.ir.code.StaticGet copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.StaticGet):43 -> a
@@ -33306,20 +33263,20 @@
     2:2:boolean com.android.tools.r8.ir.code.StaticGet.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):147:147 -> c
     2:2:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):141 -> c
     1:9:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):235:243 -> d
-    1:1:com.android.tools.r8.ir.code.Value value():67:67 -> e2
-    1:1:com.android.tools.r8.ir.code.Value dest():62:62 -> f2
+    1:1:com.android.tools.r8.ir.code.Value value():67:67 -> d2
+    1:1:com.android.tools.r8.ir.code.Value dest():62:62 -> e2
     com.android.tools.r8.ir.code.StaticGet asStaticGet() -> s0
     1:1:java.lang.String toString():177:177 -> toString
-com.android.tools.r8.ir.code.StaticPut -> com.android.tools.r8.internal.cD:
+com.android.tools.r8.ir.code.StaticPut -> com.android.tools.r8.internal.RB:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():33:33 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):36:36 -> <init>
-    boolean isStaticFieldInstruction() -> P1
-    boolean isStaticPut() -> Q1
-    boolean instructionTypeCanThrow() -> V0
-    int maxInValueRegister() -> W1
-    1:1:int maxOutValueRegister():138:138 -> X1
-    int opcode() -> Y1
+    boolean isStaticFieldInstruction() -> O1
+    boolean isStaticPut() -> P1
+    boolean instructionTypeCanThrow() -> U0
+    int maxInValueRegister() -> V1
+    1:1:int maxOutValueRegister():146:146 -> W1
+    int opcode() -> X1
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):46:46 -> a
     2:29:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58:85 -> a
     30:30:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):82:82 -> a
@@ -33329,30 +33286,30 @@
     34:34:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):70:70 -> a
     35:35:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):67:67 -> a
     36:60:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63:87 -> a
-    61:76:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):99:114 -> a
-    77:77:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):113:113 -> a
-    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.type():94:94 -> a
-    78:78:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):119 -> a
-    79:84:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):119:124 -> a
-    85:85:java.lang.Boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):114:114 -> a
-    86:96:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):144:154 -> a
-    97:97:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):174:174 -> a
-    98:98:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):199:199 -> a
-    99:102:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):204:204 -> a
-    103:103: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):216:216 -> a
-    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):164:168 -> b
-    1:9:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):222:230 -> d
-    1:2:com.android.tools.r8.ir.code.Value value():51:52 -> e2
+    61:84:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):99:122 -> a
+    85:85:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):121:121 -> a
+    86:86:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.type():88:88 -> a
+    86:86:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):127 -> a
+    87:92:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):127:132 -> a
+    93:93:java.lang.Boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):122:122 -> a
+    94:104:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):152:162 -> a
+    105:105:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):182:182 -> a
+    106:106:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):207:207 -> a
+    107:110:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):212:212 -> a
+    111:111: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):224:224 -> a
+    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):172:176 -> b
+    1:9:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):230:238 -> d
+    1:2:com.android.tools.r8.ir.code.Value value():51:52 -> d2
     com.android.tools.r8.ir.code.StaticPut asStaticPut() -> t0
-    1:1:java.lang.String toString():179:179 -> toString
-com.android.tools.r8.ir.code.Store -> com.android.tools.r8.internal.eD:
+    1:1:java.lang.String toString():187:187 -> toString
+com.android.tools.r8.ir.code.Store -> com.android.tools.r8.internal.UB:
     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>
     boolean hasInvariantOutType() -> N0
-    1:1:int maxInValueRegister():59:59 -> W1
-    int maxOutValueRegister() -> X1
-    int opcode() -> Y1
+    1:1:int maxInValueRegister():59:59 -> V1
+    int maxOutValueRegister() -> W1
+    int opcode() -> X1
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):35:35 -> a
     2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):70:70 -> a
     3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forStore():316:316 -> a
@@ -33366,19 +33323,19 @@
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):54:54 -> b
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isStore():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):54 -> b
+    1:1:com.android.tools.r8.ir.code.Value src():39:39 -> b2
     1:2:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):113:114 -> c
-    1:1:com.android.tools.r8.ir.code.Value src():39:39 -> c2
     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.BD:
+com.android.tools.r8.ir.code.StringSwitch -> com.android.tools.r8.internal.pC:
     boolean $assertionsDisabled -> l
     com.android.tools.r8.graph.DexString[] keys -> m
     1:1:void <clinit>():17:17 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexString[],int[],int):23:25 -> <init>
-    boolean isStringSwitch() -> S1
-    1:1:int maxInValueRegister():119:119 -> W1
-    1:1:int maxOutValueRegister():124:124 -> X1
-    int opcode() -> Y1
+    boolean isStringSwitch() -> R1
+    1:1:int maxInValueRegister():119:119 -> V1
+    1:1:int maxOutValueRegister():124:124 -> W1
+    int opcode() -> X1
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):39:39 -> a
     2:2:void forEachCase(com.android.tools.r8.utils.ThrowingBiConsumer):50:50 -> a
     3:3:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.code.StringSwitch.getKey(int):80:80 -> a
@@ -33389,17 +33346,17 @@
     7:7:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):114:114 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):109:109 -> b
     1:1:com.android.tools.r8.graph.DexString getKey(int):80:80 -> e
-    1:4:boolean valid():62:65 -> g2
+    1:4:boolean valid():62:65 -> f2
     1:4:java.lang.String toString():85:88 -> toString
     5:5:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.code.StringSwitch.getKey(int):80:80 -> toString
     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.ZD:
+com.android.tools.r8.ir.code.Sub -> com.android.tools.r8.internal.MC:
     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>
-    int opcode() -> Y1
+    int opcode() -> X1
     double foldDouble(double,double) -> a
     float foldFloat(float,float) -> a
     int foldIntegers(int,int) -> a
@@ -33420,25 +33377,25 @@
     1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):47:47 -> c
     2:2:com.android.tools.r8.code.Instruction CreateFloat2Addr(int,int):77:77 -> c
     3:15:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):145:157 -> c
+    boolean isCommutative() -> c2
     1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):67:67 -> d
     2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):94:94 -> d
-    boolean isCommutative() -> d2
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):72:72 -> e
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):88:88 -> e
+    1:8:int maxInOutValueRegisterSize():131:138 -> e2
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):52:52 -> f
-    1:8:int maxInOutValueRegisterSize():131:138 -> f2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():217:217 -> h2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():217:217 -> g2
     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.hE:
+com.android.tools.r8.ir.code.Swap -> com.android.tools.r8.internal.TC:
     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>
     2:5:void <init>(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):26:29 -> <init>
     boolean hasInvariantOutType() -> N0
-    int maxInValueRegister() -> W1
-    1:1:int maxOutValueRegister():87:87 -> X1
-    int opcode() -> Y1
+    int maxInValueRegister() -> V1
+    1:1:int maxOutValueRegister():87:87 -> W1
+    int opcode() -> X1
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):39:39 -> a
     2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):67:67 -> a
@@ -33451,41 +33408,41 @@
     2:2: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.iE:
+com.android.tools.r8.ir.code.Switch -> com.android.tools.r8.internal.UC:
     boolean $assertionsDisabled -> i
     int fallthroughBlockIndex -> k
     int[] targetBlockIndices -> j
     1:1:void <clinit>():10:10 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,int[],int):16:18 -> <init>
-    boolean isSwitch() -> T1
+    boolean isSwitch() -> S1
     1:1:int getTargetBlockIndex(int):39:39 -> b
     2:2:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):67:67 -> b
+    1:1:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():54:54 -> b2
     1:1:void setFallthroughBlockIndex(int):62:62 -> c
-    1:1:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():54:54 -> c2
+    1:1:int getFallthroughBlockIndex():58:58 -> c2
     1:1:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):35:35 -> d
     2:2:int[] com.android.tools.r8.ir.code.Switch.targetBlockIndices():43:43 -> d
     2:2:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):35 -> d
     3:3:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):35:35 -> d
-    1:1:int getFallthroughBlockIndex():58:58 -> d2
-    1:1:int numberOfKeys():71:71 -> e2
-    1:1:int[] targetBlockIndices():43:43 -> f2
-    1:2:boolean valid():28:29 -> g2
-    3:3:int com.android.tools.r8.ir.code.Switch.getTargetBlockIndex(int):39:39 -> g2
-    3:3:boolean valid():29 -> g2
-    4:4:int com.android.tools.r8.ir.code.Switch.getFallthroughBlockIndex():58:58 -> g2
-    4:4:boolean valid():29 -> g2
-    5:5:boolean valid():29:29 -> g2
-    1:1:com.android.tools.r8.ir.code.Value value():24:24 -> h2
+    1:1:int numberOfKeys():71:71 -> d2
+    1:1:int[] targetBlockIndices():43:43 -> e2
+    1:2:boolean valid():28:29 -> f2
+    3:3:int com.android.tools.r8.ir.code.Switch.getTargetBlockIndex(int):39:39 -> f2
+    3:3:boolean valid():29 -> f2
+    4:4:int com.android.tools.r8.ir.code.Switch.getFallthroughBlockIndex():58:58 -> f2
+    4:4:boolean valid():29 -> f2
+    5:5:boolean valid():29:29 -> f2
+    1:1:com.android.tools.r8.ir.code.Value value():24:24 -> g2
     com.android.tools.r8.ir.code.Switch asSwitch() -> x0
-com.android.tools.r8.ir.code.Throw -> com.android.tools.r8.internal.DE:
+com.android.tools.r8.ir.code.Throw -> com.android.tools.r8.internal.wD:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value):20:20 -> <init>
-    boolean isThrow() -> U1
-    boolean instructionTypeCanThrow() -> V0
-    int maxInValueRegister() -> W1
-    1:1:int maxOutValueRegister():49:49 -> X1
-    int opcode() -> Y1
+    boolean isThrow() -> T1
+    boolean instructionTypeCanThrow() -> U0
+    int maxInValueRegister() -> V1
+    1:1:int maxOutValueRegister():49:49 -> W1
+    int opcode() -> X1
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):30:30 -> a
     2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):39:39 -> a
     3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):76:76 -> a
@@ -33495,34 +33452,34 @@
     6:6:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):86:86 -> a
     7:24:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):91:108 -> a
     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 -> d2
+    1:1:com.android.tools.r8.ir.code.Value exception():34:34 -> c2
     com.android.tools.r8.ir.code.Throw asThrow() -> y0
-com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier -> com.android.tools.r8.internal.vF:
+com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier -> com.android.tools.r8.internal.KE:
     com.android.tools.r8.ir.analysis.type.TypeElement getOutType() -> a
     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() -> f
-com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier$1 -> com.android.tools.r8.internal.uF:
+    com.android.tools.r8.graph.DebugLocalInfo getLocalInfo() -> e
+com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier$1 -> com.android.tools.r8.internal.JE:
     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.ir.analysis.type.TypeElement getOutType():25:25 -> a
-    1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():20:20 -> f
-com.android.tools.r8.ir.code.Unop -> com.android.tools.r8.internal.aG:
+    1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():20:20 -> e
+com.android.tools.r8.ir.code.Unop -> com.android.tools.r8.internal.qF:
     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() -> V1
-    int maxInValueRegister() -> W1
-    int maxOutValueRegister() -> X1
+    boolean isUnop() -> U1
+    int maxInValueRegister() -> V1
+    int maxOutValueRegister() -> W1
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):51:51 -> a
     2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forUnop():328:328 -> a
     2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):51 -> a
     3:4:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):56:57 -> a
     5:5: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 -> c2
+    1:1:com.android.tools.r8.ir.code.Value source():25:25 -> b2
     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.nG:
+com.android.tools.r8.ir.code.Ushr -> com.android.tools.r8.internal.DF:
     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() -> Y1
+    int opcode() -> X1
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):27:27 -> a
@@ -33535,12 +33492,12 @@
     5:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):83:83 -> b
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):68:68 -> c
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):73:73 -> c
+    boolean isCommutative() -> c2
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):58:58 -> d
-    boolean isCommutative() -> d2
     1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):33:33 -> g
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> h2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> g2
     com.android.tools.r8.ir.code.Ushr asUshr() -> z0
-com.android.tools.r8.ir.code.Value -> com.android.tools.r8.internal.sG:
+com.android.tools.r8.ir.code.Value -> com.android.tools.r8.internal.IF:
     boolean isThis -> m
     com.android.tools.r8.ir.regalloc.LiveIntervals liveIntervals -> k
     int needsRegister -> l
@@ -33561,39 +33518,39 @@
     1:1:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):180:180 -> <init>
     2:20:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):166:184 -> <init>
     1:1:boolean hasAliasedValue():201:201 -> A
-    1:1:boolean hasAnyUsers():403:403 -> B
-    1:1:boolean hasDebugUsers():407:407 -> C
+    1:1:boolean hasAnyUsers():400:400 -> B
+    1:1:boolean hasDebugUsers():404:404 -> C
     1:1:boolean hasLocalInfo():268:268 -> D
-    1:1:boolean hasNonDebugUsers():411:411 -> E
-    1:1:boolean hasPhiUsers():415:415 -> F
-    1:1:boolean hasUsers():419:419 -> G
-    1:1:boolean hasUsersInfo():547:547 -> H
-    1:1:boolean hasValueRange():927:927 -> I
-    1:8:boolean internalComputeNeedsRegister():705:712 -> J
-    1:1:boolean isArgument():853:853 -> K
-    1:1:boolean isConstClass():811:811 -> L
+    1:1:boolean hasNonDebugUsers():408:408 -> E
+    1:1:boolean hasPhiUsers():412:412 -> F
+    1:1:boolean hasUsers():416:416 -> G
+    1:1:boolean hasUsersInfo():544:544 -> H
+    1:1:boolean hasValueRange():924:924 -> I
+    1:8:boolean internalComputeNeedsRegister():702:709 -> J
+    1:1:boolean isArgument():850:850 -> K
+    1:1:boolean isConstClass():808:808 -> L
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> L
-    2:2:boolean isConstClass():811 -> L
-    1:1:boolean isConstNumber():782:782 -> M
-    1:1:boolean isConstString():795:795 -> N
+    2:2:boolean isConstClass():808 -> L
+    1:1:boolean isConstNumber():779:779 -> M
+    1:1:boolean isConstString():792:792 -> N
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> N
-    2:2:boolean isConstString():795 -> N
-    1:1:boolean isConstant():815:815 -> O
-    1:1:boolean isDexItemBasedConstString():799:799 -> P
+    2:2:boolean isConstString():792 -> N
+    1:1:boolean isConstant():812:812 -> O
+    1:1:boolean isDexItemBasedConstString():796:796 -> P
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> P
-    2:2:boolean isDexItemBasedConstString():799 -> P
+    2:2:boolean isDexItemBasedConstString():796 -> P
     boolean isFixedRegisterValue() -> Q
     1:1:boolean isLinked():311:311 -> R
-    1:3:boolean isNeverNull():847:849 -> S
-    1:1:boolean isThis():919:919 -> T
-    1:1:boolean isUsed():460:460 -> U
-    2:2:int com.android.tools.r8.ir.code.Value.numberOfDebugUsers():452:452 -> U
-    2:2:boolean isUsed():460 -> U
+    1:3:boolean isNeverNull():844:846 -> S
+    1:1:boolean isThis():916:916 -> T
+    1:1:boolean isUsed():457:457 -> U
+    2:2:int com.android.tools.r8.ir.code.Value.numberOfDebugUsers():449:449 -> U
+    2:2:boolean isUsed():457 -> U
     boolean isValueOnStack() -> V
-    1:3:boolean isZero():1021:1023 -> W
-    1:3:void markAsThis():908:910 -> X
+    1:3:boolean isZero():1018:1020 -> W
+    1:3:void markAsThis():905:907 -> X
     1:1:void markNonDebugLocalRead():146:146 -> Y
-    1:3:boolean needsRegister():689:691 -> Z
+    1:3:boolean needsRegister():686:688 -> Z
     boolean lambda$fullyRemovePhiUser$1(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Phi) -> a
     boolean lambda$fullyRemoveUser$0(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
     1:14:void constrainType(com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.utils.Reporter):54:67 -> a
@@ -33647,127 +33604,133 @@
     160:161:com.android.tools.r8.ir.code.Value getSpecificAliasedValue(java.util.function.Predicate):251:252 -> a
     162:164:void setLocalInfo(com.android.tools.r8.graph.DebugLocalInfo):272:274 -> a
     165:167:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):284:286 -> a
-    168:172:boolean onlyUsedInBlock(com.android.tools.r8.ir.code.BasicBlock):331:335 -> a
-    173:175:java.util.Set aliasedUsers(com.android.tools.r8.ir.code.AliasedValueConfiguration):363:365 -> a
-    176:183:void collectAliasedUsersViaAssume(com.android.tools.r8.ir.code.AliasedValueConfiguration,java.util.Set,java.util.Set,java.util.Set):374:381 -> a
-    184:184:void collectAliasedUsersViaAssume(com.android.tools.r8.ir.code.AliasedValueConfiguration,java.util.Set,java.util.Set,java.util.Set):380:380 -> a
-    185:186:void addPhiUser(com.android.tools.r8.ir.code.Phi):516:517 -> a
-    187:189:java.util.Set affectedValues():562:564 -> a
-    190:190:void addAffectedValuesTo(java.util.Set):568:568 -> a
-    191:196:void forEachAffectedValue(java.util.function.Consumer):572:577 -> a
-    197:200:void replaceSelectiveInstructionUsers(com.android.tools.r8.ir.code.Value,java.util.function.Predicate):613:616 -> a
-    201:226:void replaceSelectiveUsers(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):631:656 -> a
-    227:227:void com.android.tools.r8.ir.code.Value.replaceUserInDebugData(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):665:665 -> a
-    227:227:void replaceSelectiveUsers(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):657 -> a
-    228:228:void replaceSelectiveUsers(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):658:658 -> a
-    229:230:void setLiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):680:681 -> a
-    231:231:int compareTo(com.android.tools.r8.ir.code.Value):734:734 -> a
-    232:233:boolean isConstBoolean(boolean):786:787 -> a
-    234:243:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):819:828 -> a
-    244:244:void setValueRange(com.android.tools.r8.utils.LongInterval):923:923 -> a
-    245:245:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):955:955 -> a
-    246:246:boolean com.android.tools.r8.ir.code.Value.isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate):960:960 -> a
-    246:246:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):955 -> a
-    247:283:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):977:1013 -> a
-    284:285:void setType(com.android.tools.r8.ir.analysis.type.TypeElement):1032:1033 -> a
-    286:286:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1052:1052 -> a
-    287:288:boolean com.android.tools.r8.ir.code.Value.skipWideningOrNarrowingCheck(com.android.tools.r8.graph.AppView):1064:1065 -> a
-    287:288:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1052 -> a
-    289:296:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1052:1059 -> a
-    297:328:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1125:1156 -> a
-    1:1:int com.android.tools.r8.ir.code.Value.numberOfAllNonDebugUsers():448:448 -> a0
-    1:1:int numberOfAllUsers():456 -> a0
-    2:2:int com.android.tools.r8.ir.code.Value.numberOfDebugUsers():452:452 -> a0
-    2:2:int numberOfAllUsers():456 -> a0
-    1:1:java.util.Set aliasedUsers():359:359 -> b
-    2:4:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers(com.android.tools.r8.ir.code.AliasedValueConfiguration):363:365 -> b
-    2:4:java.util.Set aliasedUsers():359 -> b
-    5:6:void addUser(com.android.tools.r8.ir.code.Instruction):487:488 -> b
-    7:8:void fullyRemovePhiUser(com.android.tools.r8.ir.code.Phi):526:527 -> b
-    9:12:void replaceDebugUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):672:675 -> b
-    13:14:void setNeedsRegister(boolean):695:696 -> b
-    15:15:boolean isDefinedByInstructionSatisfying(java.util.function.Predicate):832:832 -> b
-    16:16:boolean knownToBeBoolean(java.util.Set):882:882 -> b
+    168:169:boolean onlyUsedInBlock(com.android.tools.r8.ir.code.BasicBlock):331:332 -> a
+    170:172:java.util.Set aliasedUsers(com.android.tools.r8.ir.code.AliasedValueConfiguration):360:362 -> a
+    173:180:void collectAliasedUsersViaAssume(com.android.tools.r8.ir.code.AliasedValueConfiguration,java.util.Set,java.util.Set,java.util.Set):371:378 -> a
+    181:181:void collectAliasedUsersViaAssume(com.android.tools.r8.ir.code.AliasedValueConfiguration,java.util.Set,java.util.Set,java.util.Set):377:377 -> a
+    182:183:void addPhiUser(com.android.tools.r8.ir.code.Phi):513:514 -> a
+    184:186:java.util.Set affectedValues():559:561 -> a
+    187:187:void addAffectedValuesTo(java.util.Set):565:565 -> a
+    188:193:void forEachAffectedValue(java.util.function.Consumer):569:574 -> a
+    194:197:void replaceSelectiveInstructionUsers(com.android.tools.r8.ir.code.Value,java.util.function.Predicate):610:613 -> a
+    198:223:void replaceSelectiveUsers(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):628:653 -> a
+    224:224:void com.android.tools.r8.ir.code.Value.replaceUserInDebugData(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):662:662 -> a
+    224:224:void replaceSelectiveUsers(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):654 -> a
+    225:225:void replaceSelectiveUsers(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):655:655 -> a
+    226:227:void setLiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):677:678 -> a
+    228:228:int compareTo(com.android.tools.r8.ir.code.Value):731:731 -> a
+    229:230:boolean isConstBoolean(boolean):783:784 -> a
+    231:240:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):816:825 -> a
+    241:241:void setValueRange(com.android.tools.r8.utils.LongInterval):920:920 -> a
+    242:242:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):952:952 -> a
+    243:243:boolean com.android.tools.r8.ir.code.Value.isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate):957:957 -> a
+    243:243:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):952 -> a
+    244:280:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):974:1010 -> a
+    281:282:void setType(com.android.tools.r8.ir.analysis.type.TypeElement):1029:1030 -> a
+    283:283:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1049:1049 -> a
+    284:285:boolean com.android.tools.r8.ir.code.Value.skipWideningOrNarrowingCheck(com.android.tools.r8.graph.AppView):1061:1062 -> a
+    284:285:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1049 -> a
+    286:293:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1049:1056 -> a
+    294:296:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1122:1124 -> a
+    297:297:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    297:297:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1125 -> a
+    298:310:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1126:1138 -> a
+    311:311:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    311:311:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1139 -> a
+    312:325:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1140:1153 -> a
+    1:1:int com.android.tools.r8.ir.code.Value.numberOfAllNonDebugUsers():445:445 -> a0
+    1:1:int numberOfAllUsers():453 -> a0
+    2:2:int com.android.tools.r8.ir.code.Value.numberOfDebugUsers():449:449 -> a0
+    2:2:int numberOfAllUsers():453 -> a0
+    1:1:java.util.Set aliasedUsers():356:356 -> b
+    2:4:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers(com.android.tools.r8.ir.code.AliasedValueConfiguration):360:362 -> b
+    2:4:java.util.Set aliasedUsers():356 -> b
+    5:6:void addUser(com.android.tools.r8.ir.code.Instruction):484:485 -> b
+    7:8:void fullyRemovePhiUser(com.android.tools.r8.ir.code.Phi):523:524 -> b
+    9:12:void replaceDebugUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):669:672 -> b
+    13:14:void setNeedsRegister(boolean):692:693 -> b
+    15:15:boolean isDefinedByInstructionSatisfying(java.util.function.Predicate):829:829 -> b
+    16:16:boolean knownToBeBoolean(java.util.Set):879:879 -> b
     17:17:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> b
-    17:17:boolean knownToBeBoolean(java.util.Set):882 -> b
-    18:36:boolean knownToBeBoolean(java.util.Set):886:904 -> b
-    37:37:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1039:1039 -> b
-    38:39:boolean com.android.tools.r8.ir.code.Value.skipWideningOrNarrowingCheck(com.android.tools.r8.graph.AppView):1064:1065 -> b
-    38:39:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1039 -> b
-    40:47:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1039:1046 -> b
-    48:88:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1078:1118 -> b
-    89:89:boolean lambda$getDynamicLowerBoundType$5(com.android.tools.r8.ir.code.Value):1151:1151 -> b
+    17:17:boolean knownToBeBoolean(java.util.Set):879 -> b
+    18:36:boolean knownToBeBoolean(java.util.Set):883:901 -> b
+    37:37:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1036:1036 -> b
+    38:39:boolean com.android.tools.r8.ir.code.Value.skipWideningOrNarrowingCheck(com.android.tools.r8.graph.AppView):1061:1062 -> b
+    38:39:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1036 -> b
+    40:47:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1036:1043 -> b
+    48:88:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1075:1115 -> b
+    89:89:boolean lambda$getDynamicLowerBoundType$5(com.android.tools.r8.ir.code.Value):1148:1148 -> b
     90:90:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> b
     90:90:boolean com.android.tools.r8.ir.code.Instruction.isAssumeWithDynamicTypeAssumption():737 -> b
-    90:90:boolean lambda$getDynamicLowerBoundType$5(com.android.tools.r8.ir.code.Value):1151 -> b
+    90:90:boolean lambda$getDynamicLowerBoundType$5(com.android.tools.r8.ir.code.Value):1148 -> b
     91:91:boolean com.android.tools.r8.ir.code.Instruction.isAssumeWithDynamicTypeAssumption():737:737 -> b
-    91:91:boolean lambda$getDynamicLowerBoundType$5(com.android.tools.r8.ir.code.Value):1151 -> b
-    1:5:int numberOfPhiUsers():440:444 -> b0
+    91:91:boolean lambda$getDynamicLowerBoundType$5(com.android.tools.r8.ir.code.Value):1148 -> b
+    1:5:int numberOfPhiUsers():437:441 -> b0
     com.android.tools.r8.ir.code.FixedRegisterValue asFixedRegisterValue() -> c
-    1:9:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):464:472 -> c
-    10:11:void fullyRemoveUser(com.android.tools.r8.ir.code.Instruction):497:498 -> c
-    12:13:void removePhiUser(com.android.tools.r8.ir.code.Phi):521:522 -> c
-    14:14:boolean lambda$getDynamicUpperBoundType$3(com.android.tools.r8.ir.code.Value):1082:1082 -> c
-    1:5:int numberOfUsers():432:436 -> c0
+    1:9:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):461:469 -> c
+    10:11:void fullyRemoveUser(com.android.tools.r8.ir.code.Instruction):494:495 -> c
+    12:13:void removePhiUser(com.android.tools.r8.ir.code.Phi):518:519 -> c
+    14:14:boolean lambda$getDynamicUpperBoundType$3(com.android.tools.r8.ir.code.Value):1079:1079 -> c
+    1:5:int numberOfUsers():429:433 -> c0
     1:1:int compareTo(java.lang.Object):50:50 -> compareTo
-    2:2:int com.android.tools.r8.ir.code.Value.compareTo(com.android.tools.r8.ir.code.Value):734:734 -> compareTo
+    2:2:int com.android.tools.r8.ir.code.Value.compareTo(com.android.tools.r8.ir.code.Value):731:731 -> compareTo
     2:2:int compareTo(java.lang.Object):50 -> compareTo
-    1:5:void removeDebugUser(com.android.tools.r8.ir.code.Instruction):539:543 -> d
-    6:6:com.android.tools.r8.ir.code.BasicBlock getBlock():1069:1069 -> d
-    7:7:boolean lambda$getDynamicUpperBoundType$4(com.android.tools.r8.ir.code.Value):1096:1096 -> d
-    1:15:boolean onlyDependsOnArgument():857:871 -> d0
-    16:16:boolean onlyDependsOnArgument():869:869 -> d0
-    boolean isPhi() -> e
+    1:5:void removeDebugUser(com.android.tools.r8.ir.code.Instruction):536:540 -> d
+    6:6:com.android.tools.r8.ir.code.BasicBlock getBlock():1066:1066 -> d
+    7:7:boolean lambda$getDynamicUpperBoundType$4(com.android.tools.r8.ir.code.Value):1093:1093 -> d
+    1:15:boolean onlyDependsOnArgument():854:868 -> d0
+    16:16:boolean onlyDependsOnArgument():866:866 -> d0
     boolean lambda$replaceSelectiveUsers$2(com.android.tools.r8.ir.code.Value) -> e
-    1:2:void removeUser(com.android.tools.r8.ir.code.Instruction):492:493 -> e
-    1:1:com.android.tools.r8.ir.code.ValueType outType():773:773 -> e0
+    1:2:void removeUser(com.android.tools.r8.ir.code.Instruction):489:490 -> e
+    1:1:com.android.tools.r8.ir.code.ValueType outType():770:770 -> e0
+    boolean isPhi() -> f
     1:4:void linkTo(com.android.tools.r8.ir.code.Value):290:293 -> f
     1:1:int requiredRegisters():260:260 -> f0
-    1:2:void replacePhiUsers(com.android.tools.r8.ir.code.Value):603:604 -> g
-    3:4:void com.android.tools.r8.ir.code.Value.clearPhiUsers():511:512 -> g
-    3:4:void replacePhiUsers(com.android.tools.r8.ir.code.Value):606 -> g
-    1:2:com.android.tools.r8.ir.code.Instruction singleUniqueUser():354:355 -> g0
+    1:2:void replacePhiUsers(com.android.tools.r8.ir.code.Value):600:601 -> g
+    3:4:void com.android.tools.r8.ir.code.Value.clearPhiUsers():508:509 -> g
+    3:4:void replacePhiUsers(com.android.tools.r8.ir.code.Value):603 -> g
+    1:2:com.android.tools.r8.ir.code.Instruction singleUniqueUser():351:352 -> g0
     com.android.tools.r8.ir.code.Phi asPhi() -> h
-    1:8:void replaceUsers(com.android.tools.r8.ir.code.Value):584:591 -> h
-    9:9:void com.android.tools.r8.ir.code.Value.replaceUserInDebugData(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):665:665 -> h
-    9:9:void replaceUsers(com.android.tools.r8.ir.code.Value):592 -> h
-    10:12:void replaceUsers(com.android.tools.r8.ir.code.Value):594:596 -> h
-    1:4:java.util.Set uniquePhiUsers():392:395 -> h0
-    1:1:int hashCode():739:739 -> hashCode
-    1:2:void clearUsers():502:503 -> i
-    3:4:void com.android.tools.r8.ir.code.Value.clearPhiUsers():511:512 -> i
-    3:4:void clearUsers():504 -> i
-    5:6:void clearUsers():505:506 -> i
-    1:4:java.util.Set uniqueUsers():343:346 -> i0
-    1:6:void clearUsersInfo():551:556 -> j
-    1:2:boolean usedInMonitorOperation():478:479 -> j0
+    1:8:void replaceUsers(com.android.tools.r8.ir.code.Value):581:588 -> h
+    9:9:void com.android.tools.r8.ir.code.Value.replaceUserInDebugData(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):662:662 -> h
+    9:9:void replaceUsers(com.android.tools.r8.ir.code.Value):589 -> h
+    10:12:void replaceUsers(com.android.tools.r8.ir.code.Value):591:593 -> h
+    1:4:java.util.Set uniquePhiUsers():389:392 -> h0
+    1:1:int hashCode():736:736 -> hashCode
+    1:2:void clearUsers():499:500 -> i
+    3:4:void com.android.tools.r8.ir.code.Value.clearPhiUsers():508:509 -> i
+    3:4:void clearUsers():501 -> i
+    5:6:void clearUsers():502:503 -> i
+    1:4:java.util.Set uniqueUsers():340:343 -> i0
+    1:6:void clearUsersInfo():548:553 -> j
+    1:2:boolean usedInMonitorOperation():475:476 -> j0
     3:3:boolean com.android.tools.r8.ir.code.Instruction.isMonitor():0:0 -> j0
-    3:3:boolean usedInMonitorOperation():479 -> j0
-    1:2:void computeNeedsRegister():700:701 -> l
-    1:1:java.util.Set debugUsers():399:399 -> m
-    1:2:com.android.tools.r8.ir.code.Phi firstPhiUser():387:388 -> o
+    3:3:boolean usedInMonitorOperation():476 -> j0
+    1:2:void computeNeedsRegister():697:698 -> l
+    1:1:java.util.Set debugUsers():396:396 -> m
+    1:2:com.android.tools.r8.ir.code.Phi firstPhiUser():384:385 -> o
     1:1:com.android.tools.r8.ir.code.Value getAliasedValue():216:216 -> p
     2:2:com.android.tools.r8.ir.code.Value getAliasedValue():215:215 -> p
-    1:2:com.android.tools.r8.ir.code.ConstInstruction getConstInstruction():777:778 -> q
+    1:2:com.android.tools.r8.ir.code.ConstInstruction getConstInstruction():774:775 -> q
     1:3:java.util.Set getDebugLocalEnds():278:280 -> r
     1:2:com.android.tools.r8.ir.code.Instruction getDefinition():196:197 -> s
-    1:1:com.android.tools.r8.ir.regalloc.LiveIntervals getLiveIntervals():685:685 -> t
-    1:26:java.lang.String toString():744:769 -> toString
+    1:1:com.android.tools.r8.ir.regalloc.LiveIntervals getLiveIntervals():682:682 -> t
+    1:26:java.lang.String toString():741:766 -> toString
     1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():264:264 -> u
     1:1:com.android.tools.r8.ir.code.Value getNextConsecutive():323:323 -> v
     1:1:int getNumber():256:256 -> w
     1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getPreviousConsecutive():327:327 -> x
     1:1:com.android.tools.r8.ir.code.Value getStartOfConsecutive():316 -> x
-    1:1:com.android.tools.r8.ir.analysis.type.TypeElement getType():1073:1073 -> y
-    1:11:com.android.tools.r8.utils.LongInterval getValueRange():939:949 -> z
-com.android.tools.r8.ir.code.Value$DebugData -> com.android.tools.r8.internal.sG$a:
+    1:1:com.android.tools.r8.ir.analysis.type.TypeElement getType():1070:1070 -> y
+    1:11:com.android.tools.r8.utils.LongInterval getValueRange():936:946 -> z
+com.android.tools.r8.ir.code.Value$DebugData -> com.android.tools.r8.internal.IF$a:
     com.android.tools.r8.graph.DebugLocalInfo local -> a
     java.util.Set users -> b
     1:1:void <init>(com.android.tools.r8.graph.DebugLocalInfo):156:156 -> <init>
     2:5:void <init>(com.android.tools.r8.graph.DebugLocalInfo):154:157 -> <init>
-com.android.tools.r8.ir.code.ValueFactory -> com.android.tools.r8.internal.tG:
+com.android.tools.r8.ir.code.ValueFactory -> com.android.tools.r8.internal.JF:
     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.zG:
+com.android.tools.r8.ir.code.ValueType -> com.android.tools.r8.internal.PF:
     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
@@ -33816,17 +33779,17 @@
     13:13:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement toPrimitiveType():148:148 -> d
     14:14:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement toPrimitiveType():146:146 -> d
     15:15:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement toPrimitiveType():144:144 -> d
-    1:1:com.android.tools.r8.ir.code.ValueType[] values():16:16 -> e
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():34:34 -> f
+    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():34:34 -> e
+    1:1:com.android.tools.r8.ir.code.ValueType[] values():16:16 -> f
     com.android.tools.r8.utils.structural.StructuralItem self() -> k
-com.android.tools.r8.ir.code.ValueType$1 -> com.android.tools.r8.internal.zG$a:
+com.android.tools.r8.ir.code.ValueType$1 -> com.android.tools.r8.internal.PF$a:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> b
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> c
     int[] $SwitchMap$com$android$tools$r8$ir$code$MemberType -> a
     1:1:void <clinit>():142:142 -> <clinit>
     2:2:void <clinit>():105:105 -> <clinit>
     3:3:void <clinit>():54:54 -> <clinit>
-com.android.tools.r8.ir.code.ValueTypeConstraint -> com.android.tools.r8.internal.AG:
+com.android.tools.r8.ir.code.ValueTypeConstraint -> com.android.tools.r8.internal.QF:
     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
@@ -33875,7 +33838,7 @@
     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
     1:1:com.android.tools.r8.ir.code.ValueTypeConstraint[] values():13:13 -> c
-com.android.tools.r8.ir.code.ValueTypeConstraint$1 -> com.android.tools.r8.internal.AG$a:
+com.android.tools.r8.ir.code.ValueTypeConstraint$1 -> com.android.tools.r8.internal.QF$a:
     int[] $SwitchMap$com$android$tools$r8$ir$code$MemberType -> b
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> c
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueTypeConstraint -> d
@@ -33884,12 +33847,12 @@
     2:2:void <clinit>():115:115 -> <clinit>
     3:3:void <clinit>():63:63 -> <clinit>
     4:4:void <clinit>():46:46 -> <clinit>
-com.android.tools.r8.ir.code.WideConstant -> com.android.tools.r8.internal.iH:
+com.android.tools.r8.ir.code.WideConstant -> com.android.tools.r8.internal.AG:
     long decodedValue() -> a
-com.android.tools.r8.ir.code.Xor -> com.android.tools.r8.internal.tI:
+com.android.tools.r8.ir.code.Xor -> com.android.tools.r8.internal.JH:
     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() -> Y1
+    int opcode() -> X1
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):28:28 -> a
@@ -33903,10 +33866,10 @@
     5:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):78:78 -> b
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):63:63 -> c
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):68:68 -> c
+    boolean isCommutative() -> c2
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> d
-    boolean isCommutative() -> d2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> h2
-com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver -> com.android.tools.r8.internal.u1:
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> g2
+com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver -> com.android.tools.r8.internal.t1:
     java.util.Map unresolvedPayload -> b
     java.util.Map payloadToData -> c
     boolean $assertionsDisabled -> a
@@ -33918,8 +33881,8 @@
     19:19:void clear():63:63 -> a
     1:1:int getElementWidth(int):51:51 -> b
     1:1:long getSize(int):55:55 -> c
-com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver$1 -> com.android.tools.r8.internal.s1:
-com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver$PayloadData -> com.android.tools.r8.internal.t1:
+com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver$1 -> com.android.tools.r8.internal.r1:
+com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver$PayloadData -> com.android.tools.r8.internal.s1:
     long size -> b
     short[] data -> c
     int element_width -> a
@@ -33972,9 +33935,9 @@
     5:5:int compareTo(java.lang.Object):39 -> compareTo
     1:1:boolean hasCaller(com.android.tools.r8.ir.conversion.CallGraph$Node):185:185 -> d
     2:2:com.android.tools.r8.graph.DexEncodedMethod getMethod():244:244 -> d
-    1:1:int getNumberOfCallSites():177:177 -> e
-    2:2:boolean hasReader(com.android.tools.r8.ir.conversion.CallGraph$Node):189:189 -> e
-    1:1:boolean hasWriter(com.android.tools.r8.ir.conversion.CallGraph$Node):193:193 -> f
+    1:1:boolean hasReader(com.android.tools.r8.ir.conversion.CallGraph$Node):189:189 -> e
+    1:1:int getNumberOfCallSites():177:177 -> f
+    2:2:boolean hasWriter(com.android.tools.r8.ir.conversion.CallGraph$Node):193:193 -> f
     1:4:void removeCaller(com.android.tools.r8.ir.conversion.CallGraph$Node):119:122 -> g
     5:5:boolean hasReader(com.android.tools.r8.ir.conversion.CallGraph$Node):189:189 -> g
     5:5:void removeCaller(com.android.tools.r8.ir.conversion.CallGraph$Node):123 -> g
@@ -34145,22 +34108,25 @@
     1:4:void <init>(com.android.tools.r8.ir.conversion.CallGraphBuilderBase,com.android.tools.r8.ir.conversion.CallGraph$Node,java.util.function.Predicate):113:116 -> <init>
     1:3:void addClassInitializerTarget(com.android.tools.r8.graph.DexProgramClass):120:122 -> a
     4:11:void addCallEdge(com.android.tools.r8.graph.ProgramMethod,boolean):135:142 -> a
-    12:12:boolean com.android.tools.r8.graph.DexEncodedMethod.isNative():497:497 -> a
+    12:12:boolean com.android.tools.r8.graph.DexEncodedMethod.isNative():506:506 -> a
     12:12:void addCallEdge(com.android.tools.r8.graph.ProgramMethod,boolean):142 -> a
     13:19:void addCallEdge(com.android.tools.r8.graph.ProgramMethod,boolean):146:152 -> a
     20:24:void addFieldReadEdge(com.android.tools.r8.graph.ProgramMethod):160:164 -> a
     25:42:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):168:185 -> a
-    43:43:boolean com.android.tools.r8.graph.DexEncodedMethod.isBridge():489:489 -> a
+    43:43:boolean com.android.tools.r8.graph.DexEncodedMethod.isBridge():498:498 -> a
     43:43:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):185 -> a
     44:44:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):186:186 -> a
     45:51:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):185:191 -> a
     52:56:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):175:179 -> a
-    57:64:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):198:205 -> a
+    57:58: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
+    59:59:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    59:59:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):199 -> a
+    60:64: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
     65:65:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
     65:65:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):206 -> a
     66:104:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):212:250 -> a
     105:105:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$processInvokeWithDynamicDispatch$2(boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):217:217 -> a
-    106:107:com.android.tools.r8.graph.ResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveMethod(com.android.tools.r8.graph.DexMethod,boolean):599:600 -> a
+    106:107:com.android.tools.r8.graph.ResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveMethod(com.android.tools.r8.graph.DexMethod,boolean):549:550 -> a
     106:107:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$processInvokeWithDynamicDispatch$2(boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):217 -> a
     108:111:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$processInvokeWithDynamicDispatch$2(boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):218:221 -> a
     112:118:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$processInvokeWithDynamicDispatch$2(boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):220:226 -> a
@@ -34188,24 +34154,35 @@
     179:188:void com.android.tools.r8.graph.UseRegistry.registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):88:97 -> a
     179:188:void registerCallSite(com.android.tools.r8.graph.DexCallSite):368 -> a
     1:1:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):325:325 -> b
-    1:6:void processInitClass(com.android.tools.r8.graph.DexType):295:300 -> c
-    1:6:void registerInitClass(com.android.tools.r8.graph.DexType):305 -> c
-    7:7:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):320:320 -> c
-    8:8:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):340:340 -> c
+    1:1:void processInitClass(com.android.tools.r8.graph.DexType):295:295 -> c
+    1:1:void registerInitClass(com.android.tools.r8.graph.DexType):305 -> c
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> c
+    2:2:void processInitClass(com.android.tools.r8.graph.DexType):295 -> c
+    2:2:void registerInitClass(com.android.tools.r8.graph.DexType):305 -> c
+    3:8:void processInitClass(com.android.tools.r8.graph.DexType):295:300 -> c
+    3:8:void registerInitClass(com.android.tools.r8.graph.DexType):305 -> c
+    9:9:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):320:320 -> c
+    10:10:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):340:340 -> c
     void registerInstanceOf(com.android.tools.r8.graph.DexType) -> d
     1:1:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):330:330 -> d
     1:1:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):310:310 -> e
     2:3:void registerNewInstance(com.android.tools.r8.graph.DexType):345:346 -> e
     4:4:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):352:352 -> e
     void registerTypeReference(com.android.tools.r8.graph.DexType) -> f
-    1:4:void addClassInitializerTarget(com.android.tools.r8.graph.DexType):127:130 -> g
-    5:5:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):357:357 -> g
+    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):273:273 -> 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):357:357 -> g
     1:11:void processFieldRead(com.android.tools.r8.graph.DexField):256:266 -> i
-    12:12:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():209:209 -> i
-    12:12:void processFieldRead(com.android.tools.r8.graph.DexField):272 -> i
-    13:19:void processFieldRead(com.android.tools.r8.graph.DexField):273:279 -> i
+    12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> i
+    12:12:void processFieldRead(com.android.tools.r8.graph.DexField):266 -> i
+    13:13:void processFieldRead(com.android.tools.r8.graph.DexField):266:266 -> i
+    14:14:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():199:199 -> i
+    14:14:void processFieldRead(com.android.tools.r8.graph.DexField):272 -> i
+    15:21:void processFieldRead(com.android.tools.r8.graph.DexField):273:279 -> i
     1:2:void processFieldWrite(com.android.tools.r8.graph.DexField):285:286 -> j
-    3:3:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():209:209 -> j
+    3:3:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():199:199 -> j
     3:3:void processFieldWrite(com.android.tools.r8.graph.DexField):287 -> j
     4:4:void processFieldWrite(com.android.tools.r8.graph.DexField):289:289 -> j
 com.android.tools.r8.ir.conversion.CallSiteInformation -> com.android.tools.r8.ir.conversion.e:
@@ -34226,7 +34203,7 @@
     boolean hasDoubleCallSite(com.android.tools.r8.graph.ProgramMethod) -> a
     1:1:com.android.tools.r8.ir.conversion.CallSiteInformation$EmptyCallSiteInformation access$000():32:32 -> a
     boolean hasSingleCallSite(com.android.tools.r8.graph.ProgramMethod) -> b
-com.android.tools.r8.ir.conversion.CfBuilder -> com.android.tools.r8.internal.N3:
+com.android.tools.r8.ir.conversion.CfBuilder -> com.android.tools.r8.internal.A3:
     java.util.List thisInitializers -> q
     java.util.Map newInstanceLabels -> r
     com.android.tools.r8.ir.code.Position currentPosition -> i
@@ -34388,31 +34365,36 @@
     291:311:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():316:336 -> a
     291:311:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
     312:312:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):166:166 -> a
-    313:321:boolean com.android.tools.r8.ir.conversion.CfBuilder.verifyInvokeInterface(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.AppView):172:180 -> a
-    313:321:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):166 -> a
-    322:322:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):167:167 -> a
-    323:329:java.util.List computeInitializers(com.android.tools.r8.ir.code.Value):215:221 -> a
-    330:333:boolean localsChanged():524:527 -> a
-    334:335: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
-    336:341: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
-    336:341: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
-    342:342:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.TypeVerificationHelper$NewInstanceInfo.getDexType():70:70 -> a
-    342:342: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
-    342:342: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
-    343:372: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
-    343:372: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
-    373:373: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
-    374:374: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
-    374:374: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
-    375:377:void emitLabel(com.android.tools.r8.cf.code.CfLabel):621:623 -> a
-    378:378:com.android.tools.r8.cf.code.CfLabel getLabel(com.android.tools.r8.ir.code.BasicBlock):630:630 -> a
-    379:379:void add(com.android.tools.r8.cf.code.CfInstruction):638:638 -> a
+    313:320:boolean com.android.tools.r8.ir.conversion.CfBuilder.verifyInvokeInterface(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.AppView):172:179 -> a
+    313:320:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):166 -> a
+    321:321:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    321:321:boolean com.android.tools.r8.ir.conversion.CfBuilder.verifyInvokeInterface(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.AppView):179 -> a
+    321:321:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):166 -> a
+    322:322:boolean com.android.tools.r8.ir.conversion.CfBuilder.verifyInvokeInterface(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.AppView):180:180 -> a
+    322:322:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):166 -> a
+    323:323:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):167:167 -> a
+    324:330:java.util.List computeInitializers(com.android.tools.r8.ir.code.Value):215:221 -> a
+    331:334:boolean localsChanged():524:527 -> a
+    335:336: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
+    337:342: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
+    337:342: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
+    343:343:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.TypeVerificationHelper$NewInstanceInfo.getDexType():70:70 -> a
+    343:343: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
+    343:343: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
+    344:373: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
+    344:373: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
+    374:374: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
+    375:375: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
+    375:375: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
+    376:378:void emitLabel(com.android.tools.r8.cf.code.CfLabel):621:623 -> a
+    379:379:com.android.tools.r8.cf.code.CfLabel getLabel(com.android.tools.r8.ir.code.BasicBlock):630:630 -> a
+    380:380: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
     28:28:int getLocalRegister(com.android.tools.r8.ir.code.Value):634:634 -> b
-com.android.tools.r8.ir.conversion.CfBuilder$1 -> com.android.tools.r8.internal.L3:
-com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker -> com.android.tools.r8.internal.M3:
+com.android.tools.r8.ir.conversion.CfBuilder$1 -> com.android.tools.r8.internal.y3:
+com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker -> com.android.tools.r8.internal.z3:
     boolean $assertionsDisabled -> a
     int maxHeight -> b
     int height -> c
@@ -34420,7 +34402,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.X4:
+com.android.tools.r8.ir.conversion.CfSourceCode -> com.android.tools.r8.internal.K4:
     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
@@ -34565,22 +34547,19 @@
     13:21:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):877:877 -> b
     30:43:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):886:899 -> b
     1:13:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):398:410 -> c
-    14:14:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.getProto():388:388 -> c
+    14:14:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.proto():415:415 -> c
     14:14:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):410 -> c
-    15:15:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexMethod.getProto():62:62 -> c
-    15:15:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.getProto():388 -> c
-    15:15:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):410 -> c
-    16:28:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):410:422 -> c
-    29:42:void com.android.tools.r8.ir.conversion.CfSourceCode.buildMethodEnterSynchronization(com.android.tools.r8.ir.conversion.IRBuilder):438:451 -> c
-    29:42:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):423 -> c
-    43:44:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):425:426 -> c
-    45:45:boolean com.android.tools.r8.ir.conversion.CfSourceCode.isCurrentlyGeneratingMethodSynchronization():430:430 -> c
-    45:45:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):756 -> c
-    46:46:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):756:756 -> c
-    47:47:boolean com.android.tools.r8.ir.conversion.CfSourceCode.isCurrentlyGeneratingMethodSynchronization():430:430 -> c
-    47:47:boolean verifyCurrentInstructionCanThrow():860 -> c
-    48:49:boolean verifyCurrentInstructionCanThrow():860:861 -> c
-    50:50:boolean lambda$getCanonicalDebugPositionAtOffset$0(com.android.tools.r8.cf.code.CfInstruction):881:881 -> c
+    15:27:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):410:422 -> c
+    28:41:void com.android.tools.r8.ir.conversion.CfSourceCode.buildMethodEnterSynchronization(com.android.tools.r8.ir.conversion.IRBuilder):438:451 -> c
+    28:41:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):423 -> c
+    42:43:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):425:426 -> c
+    44:44:boolean com.android.tools.r8.ir.conversion.CfSourceCode.isCurrentlyGeneratingMethodSynchronization():430:430 -> c
+    44:44:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):756 -> c
+    45:45:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):756:756 -> c
+    46:46:boolean com.android.tools.r8.ir.conversion.CfSourceCode.isCurrentlyGeneratingMethodSynchronization():430:430 -> c
+    46:46:boolean verifyCurrentInstructionCanThrow():860 -> c
+    47:48:boolean verifyCurrentInstructionCanThrow():860:861 -> c
+    49:49:boolean lambda$getCanonicalDebugPositionAtOffset$0(com.android.tools.r8.cf.code.CfInstruction):881:881 -> c
     int getMoveExceptionRegister(int) -> d
     1:1:int instructionCount():272:272 -> d
     2:2:com.android.tools.r8.ir.code.Position lambda$getCanonicalDebugPositionAtOffset$1(com.android.tools.r8.cf.code.CfInstruction):882:882 -> d
@@ -34601,16 +34580,16 @@
     29:32:java.lang.Iterable lambda$getCanonicalDebugPositionAtOffset$2():880:883 -> i
     1:1:boolean localsChanged():786:786 -> j
     1:10:void setLocalVariableLists():773:782 -> k
-com.android.tools.r8.ir.conversion.CfSourceCode$1 -> com.android.tools.r8.internal.U4:
+com.android.tools.r8.ir.conversion.CfSourceCode$1 -> com.android.tools.r8.internal.H4:
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:void <clinit>():816:816 -> <clinit>
-com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList -> com.android.tools.r8.internal.V4:
+com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList -> com.android.tools.r8.internal.I4:
     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.W4:
+com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList -> com.android.tools.r8.internal.J4:
     java.util.List guards -> d
     boolean $assertionsDisabled -> a
     int startOffset -> b
@@ -34619,13 +34598,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.Y4:
+com.android.tools.r8.ir.conversion.CfSourceUtils -> com.android.tools.r8.internal.L4:
     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.e5:
+    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.R4:
     com.android.tools.r8.ir.conversion.CfState$Snapshot current -> b
     boolean $assertionsDisabled -> a
     com.android.tools.r8.ir.code.Position position -> c
@@ -34659,8 +34640,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.a5:
-com.android.tools.r8.ir.conversion.CfState$BaseSnapshot -> com.android.tools.r8.internal.b5:
+com.android.tools.r8.ir.conversion.CfState$1 -> com.android.tools.r8.internal.N4:
+com.android.tools.r8.ir.conversion.CfState$BaseSnapshot -> com.android.tools.r8.internal.O4:
     com.android.tools.r8.ir.conversion.CfState$SlotType[] locals -> d
     com.android.tools.r8.ir.conversion.CfState$SlotType[] stack -> e
     boolean $assertionsDisabled -> c
@@ -34683,7 +34664,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.c5:
+com.android.tools.r8.ir.conversion.CfState$Pop -> com.android.tools.r8.internal.P4:
     int stackHeight -> d
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():476:476 -> <clinit>
@@ -34692,7 +34673,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.d5:
+com.android.tools.r8.ir.conversion.CfState$Push -> com.android.tools.r8.internal.Q4:
     com.android.tools.r8.ir.conversion.CfState$Slot slot -> d
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():437:437 -> <clinit>
@@ -34719,7 +34700,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.e5$a:
+com.android.tools.r8.ir.conversion.CfState$Slot -> com.android.tools.r8.internal.R4$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
@@ -34736,24 +34717,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.h5:
+com.android.tools.r8.ir.conversion.CfState$SlotType -> com.android.tools.r8.internal.U4:
     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.f5:
+com.android.tools.r8.ir.conversion.CfState$SlotType$Imprecise -> com.android.tools.r8.internal.S4:
     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.g5:
+com.android.tools.r8.ir.conversion.CfState$SlotType$Precise -> com.android.tools.r8.internal.T4:
     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.i5:
+com.android.tools.r8.ir.conversion.CfState$Snapshot -> com.android.tools.r8.internal.V4:
     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>
@@ -34765,7 +34746,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.j5:
+com.android.tools.r8.ir.conversion.CfState$Write -> com.android.tools.r8.internal.W4:
     com.android.tools.r8.ir.conversion.CfState$Slot slot -> d
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():508:508 -> <clinit>
@@ -34774,43 +34755,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.ClassConverter -> com.android.tools.r8.ir.conversion.i:
-    com.android.tools.r8.ir.conversion.D8MethodProcessor methodProcessor -> b
-    com.android.tools.r8.ir.conversion.IRConverter converter -> a
-    1:3:void <init>(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.D8MethodProcessor):24:26 -> <init>
-    void convertClass(com.android.tools.r8.graph.DexProgramClass) -> a
-    void notifyAllClassesConverted() -> a
-    1:2:void convertClasses(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):38:39 -> a
-    1:14:void internalConvertClasses(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):44:57 -> b
-    15:15:void convertMethods(com.android.tools.r8.graph.DexProgramClass):65:65 -> b
-com.android.tools.r8.ir.conversion.ClassConverter$DefaultClassConverter -> com.android.tools.r8.ir.conversion.g:
-    1:1:void <init>(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.D8MethodProcessor):73:73 -> <init>
-    void notifyAllClassesConverted() -> a
-    1:1:void convertClass(com.android.tools.r8.graph.DexProgramClass):78:78 -> a
-com.android.tools.r8.ir.conversion.ClassConverter$LibraryDesugaredClassConverter -> com.android.tools.r8.ir.conversion.h:
-    com.android.tools.r8.graph.AppView appView -> c
-    java.util.Set alreadyLibraryDesugared -> d
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.D8MethodProcessor):94:94 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.D8MethodProcessor):90:95 -> <init>
-    1:5:void convertClass(com.android.tools.r8.graph.DexProgramClass):102:106 -> a
-    6:6:void notifyAllClassesConverted():112:112 -> a
-com.android.tools.r8.ir.conversion.CodeOptimization -> com.android.tools.r8.internal.s7:
+com.android.tools.r8.ir.conversion.CodeOptimization -> com.android.tools.r8.internal.d7:
     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.D8MethodProcessor -> com.android.tools.r8.ir.conversion.j:
-    java.util.concurrent.ExecutorService executorService -> d
-    java.util.List futures -> e
-    com.android.tools.r8.ir.conversion.IRConverter converter -> c
-    1:1:void <clinit>():16:16 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):22:22 -> <init>
-    2:6:void <init>(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):20:24 -> <init>
-    1:1:void scheduleMethodForProcessingAfterCurrentWave(com.android.tools.r8.graph.ProgramMethod):39:39 -> b
-    2:2:java.util.concurrent.Future com.android.tools.r8.utils.ThreadUtils.processAsynchronously(java.util.concurrent.Callable,java.util.concurrent.ExecutorService):24:24 -> b
-    2:2:void scheduleMethodForProcessingAfterCurrentWave(com.android.tools.r8.graph.ProgramMethod):40 -> b
-    3:3:void scheduleMethodForProcessingAfterCurrentWave(com.android.tools.r8.graph.ProgramMethod):39:39 -> b
-    boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod) -> c
-    1:2:void awaitMethodProcessing():28:29 -> d
-    3:3:com.android.tools.r8.utils.Timing lambda$scheduleMethodForProcessingAfterCurrentWave$0(com.android.tools.r8.graph.ProgramMethod):42:42 -> d
-com.android.tools.r8.ir.conversion.DexBuilder -> com.android.tools.r8.internal.X9:
+com.android.tools.r8.ir.conversion.DexBuilder -> com.android.tools.r8.internal.u9:
     boolean hasBackwardsBranch -> n
     int inRegisterCount -> l
     int outRegisterCount -> m
@@ -34871,7 +34818,7 @@
     125:125: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
     125:125:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):426 -> a
     126:139:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):428:441 -> a
-    140:140:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1030:1030 -> a
+    140:140:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1025:1025 -> a
     140:140:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):442 -> a
     141:170:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):444:473 -> a
     171:182:void com.android.tools.r8.ir.conversion.DexBuilder.rewriteIfs():489:500 -> a
@@ -34887,7 +34834,7 @@
     196:199:void com.android.tools.r8.ir.conversion.DexBuilder.reset():164:167 -> a
     196:199:com.android.tools.r8.graph.DexCode build():190 -> a
     200:241:com.android.tools.r8.graph.DexCode build():195:236 -> a
-    242:242:boolean com.android.tools.r8.utils.InternalOptions.canHaveTracingPastInstructionsStreamBug():1766:1766 -> a
+    242:242:boolean com.android.tools.r8.utils.InternalOptions.canHaveTracingPastInstructionsStreamBug():1892:1892 -> a
     242:242:com.android.tools.r8.graph.DexCode build():236 -> a
     243:286:com.android.tools.r8.graph.DexCode build():237:280 -> a
     287:306: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
@@ -34941,10 +34888,10 @@
     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$1 -> com.android.tools.r8.internal.M9:
+com.android.tools.r8.ir.conversion.DexBuilder$1 -> com.android.tools.r8.internal.j9:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
     1:1:void <clinit>():1275:1275 -> <clinit>
-com.android.tools.r8.ir.conversion.DexBuilder$FallThroughInfo -> com.android.tools.r8.internal.N9:
+com.android.tools.r8.ir.conversion.DexBuilder$FallThroughInfo -> com.android.tools.r8.internal.k9:
     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
@@ -34952,11 +34899,11 @@
     int getSize() -> d
     int maxSize() -> e
     int minSize() -> f
-com.android.tools.r8.ir.conversion.DexBuilder$FillArrayDataInfo -> com.android.tools.r8.internal.O9:
+com.android.tools.r8.ir.conversion.DexBuilder$FillArrayDataInfo -> com.android.tools.r8.internal.l9:
     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):1521:1523 -> <init>
-com.android.tools.r8.ir.conversion.DexBuilder$FixedSizeInfo -> com.android.tools.r8.internal.P9:
+com.android.tools.r8.ir.conversion.DexBuilder$FixedSizeInfo -> com.android.tools.r8.internal.m9:
     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):953:954 -> <init>
     1:2:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):974:975 -> a
@@ -34965,7 +34912,7 @@
     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.Q9:
+com.android.tools.r8.ir.conversion.DexBuilder$GotoInfo -> com.android.tools.r8.internal.n9:
     boolean $assertionsDisabled -> e
     int size -> f
     1:1:void <clinit>():1079:1079 -> <clinit>
@@ -34984,7 +34931,7 @@
     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.R9:
+com.android.tools.r8.ir.conversion.DexBuilder$IfInfo -> com.android.tools.r8.internal.o9:
     boolean $assertionsDisabled -> e
     int size -> f
     1:1:void <clinit>():1210:1210 -> <clinit>
@@ -35100,7 +35047,7 @@
     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.S9:
+com.android.tools.r8.ir.conversion.DexBuilder$Info -> com.android.tools.r8.internal.p9:
     com.android.tools.r8.ir.code.Instruction ir -> b
     int maxOffset -> d
     boolean $assertionsDisabled -> a
@@ -35120,7 +35067,7 @@
     int getSize() -> d
     int maxSize() -> e
     int minSize() -> f
-com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo -> com.android.tools.r8.internal.T9:
+com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo -> com.android.tools.r8.internal.q9:
     boolean $assertionsDisabled -> e
     int size -> f
     1:1:void <clinit>():1357:1357 -> <clinit>
@@ -35167,7 +35114,7 @@
     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.U9:
+com.android.tools.r8.ir.conversion.DexBuilder$MultiFixedSizeInfo -> com.android.tools.r8.internal.r9:
     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[]):997:1003 -> <init>
@@ -35177,11 +35124,11 @@
     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.V9:
+com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo -> com.android.tools.r8.internal.s9:
     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):1510:1512 -> <init>
-com.android.tools.r8.ir.conversion.DexBuilder$TryItem -> com.android.tools.r8.internal.W9:
+com.android.tools.r8.ir.conversion.DexBuilder$TryItem -> com.android.tools.r8.internal.t9:
     com.android.tools.r8.ir.code.CatchHandlers handlers -> a
     int start -> b
     int end -> c
@@ -35190,7 +35137,7 @@
     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.ka:
+com.android.tools.r8.ir.conversion.DexSourceCode -> com.android.tools.r8.internal.H9:
     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
@@ -35238,15 +35185,12 @@
     78:83:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):354:359 -> a
     84:84:boolean com.android.tools.r8.ir.conversion.DexSourceCode.isInvoke(com.android.tools.r8.code.Instruction):296:296 -> a
     84:84:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):359 -> a
-    85:102:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):359:376 -> a
-    103:104:int[] com.android.tools.r8.ir.conversion.SwitchPayloadResolver.absoluteTargets(com.android.tools.r8.code.Instruction):63:64 -> a
-    103:104:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):376 -> a
-    105:108:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):376:379 -> a
-    109:118:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexCode$Try):401:410 -> a
-    119:120:void lambda$getCurrentCatchHandlers$0(java.util.List,java.util.List,com.android.tools.r8.graph.DexType,java.lang.Integer):407:408 -> a
-    121:129:void forEachTryRange(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):415:423 -> a
-    130:131:java.util.List getTryHandlerOffsets(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory):433:434 -> a
-    132:132:void lambda$getTryHandlerOffsets$1(java.util.List,com.android.tools.r8.graph.DexType,java.lang.Integer):434:434 -> a
+    85:105:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):359:379 -> a
+    106:115:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexCode$Try):401:410 -> a
+    116:117:void lambda$getCurrentCatchHandlers$0(java.util.List,java.util.List,com.android.tools.r8.graph.DexType,java.lang.Integer):407:408 -> a
+    118:126:void forEachTryRange(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):415:423 -> a
+    127:128:java.util.List getTryHandlerOffsets(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory):433:434 -> a
+    129:129:void lambda$getTryHandlerOffsets$1(java.util.List,com.android.tools.r8.graph.DexType,java.lang.Integer):434:434 -> a
     1:8:void setUp():121:128 -> b
     9:9:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):172:172 -> b
     10:13:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):187:190 -> b
@@ -35265,30 +35209,30 @@
     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.Mb:
+com.android.tools.r8.ir.conversion.ExtraConstantIntParameter -> com.android.tools.r8.internal.fb:
     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.Nb:
+com.android.tools.r8.ir.conversion.ExtraParameter -> com.android.tools.r8.internal.gb:
     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.Ob:
+com.android.tools.r8.ir.conversion.ExtraUnusedNullParameter -> com.android.tools.r8.internal.hb:
     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():37:37 -> 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.ic:
+com.android.tools.r8.ir.conversion.FieldOptimizationFeedback -> com.android.tools.r8.internal.Bb:
     void markFieldBitsRead(com.android.tools.r8.graph.DexEncodedField,int) -> a
     void markFieldCannotBeKept(com.android.tools.r8.graph.DexEncodedField) -> 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
-com.android.tools.r8.ir.conversion.IRBuilder -> com.android.tools.r8.internal.ee:
+com.android.tools.r8.ir.conversion.IRBuilder -> com.android.tools.r8.internal.rd:
     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
@@ -35510,18 +35454,18 @@
     402:446:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2705:2749 -> a
     402:446:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):698 -> a
     447:461:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):701:715 -> a
-    462:462:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder):1205:1205 -> a
+    462:462:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder):1200:1200 -> a
     462:462:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):718 -> a
     463:477:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):719:733 -> a
-    478:478:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
+    478:478:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
     478:478:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):733 -> a
     479:479:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):733:733 -> a
     480:480:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):729:729 -> a
-    481:481:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
+    481:481:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
     481:481:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):729 -> a
     482:482:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):729:729 -> a
     483:506:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):724:747 -> a
-    507:507:boolean com.android.tools.r8.utils.InternalOptions.isStringSwitchConversionEnabled():1500:1500 -> a
+    507:507:boolean com.android.tools.r8.utils.InternalOptions.isStringSwitchConversionEnabled():1626:1626 -> a
     507:507:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):747 -> a
     508:508:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):748:748 -> 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
@@ -35564,11 +35508,11 @@
     557:557:void addNonThisArgument(com.android.tools.r8.ir.code.Argument):1019 -> a
     558:558:void addNonThisArgument(com.android.tools.r8.ir.code.Argument):1020:1020 -> a
     559:563:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1075:1079 -> a
-    564:564:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():531:531 -> a
+    564:564:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():528:528 -> a
     564:564:boolean com.android.tools.r8.ir.conversion.IRBuilder.isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):1052 -> a
     564:564:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1080 -> a
     565:565:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalUninitialized():0:0 -> a
-    565:565:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():531 -> a
+    565:565:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():528 -> a
     565:565:boolean com.android.tools.r8.ir.conversion.IRBuilder.isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):1052 -> a
     565:565:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1080 -> a
     566:566:boolean com.android.tools.r8.ir.conversion.IRBuilder.isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):1052:1052 -> a
@@ -35775,10 +35719,10 @@
     1157:1157:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getIncomingLocal(int):2352:2352 -> a
     1157:1157:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2125 -> a
     1158:1162:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2126:2130 -> a
-    1163:1163:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():531:531 -> a
+    1163:1163:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():528:528 -> a
     1163:1163:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2130 -> a
     1164:1164:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalUninitialized():0:0 -> a
-    1164:1164:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():531 -> a
+    1164:1164:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():528 -> a
     1164:1164:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2130 -> a
     1165:1175:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2131:2141 -> a
     1176:1180:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2139:2143 -> a
@@ -35804,8 +35748,8 @@
     1199:1199:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2459:2459 -> a
     1199:1199:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2426 -> a
     1200:1225:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2427:2452 -> a
-    1226:1230:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2441:2445 -> a
-    1231:1237:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2443:2449 -> a
+    1226:1230:void lambda$addInstruction$4(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2441:2445 -> a
+    1231:1237:void lambda$addInstruction$4(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2443:2449 -> a
     1238:1238:boolean com.android.tools.r8.ir.conversion.IRBuilder.isOffsetProcessed(int):2523:2523 -> a
     1238:1238:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.ensureBlock(int):2516 -> a
     1238:1238:void ensureSuccessorBlock(int,int,boolean):2552 -> a
@@ -36232,8 +36176,8 @@
     11:13:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2108:2110 -> v
     14:14:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2422:2422 -> v
     14:14:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2111 -> v
-com.android.tools.r8.ir.conversion.IRBuilder$1 -> com.android.tools.r8.internal.ee$a:
-com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo -> com.android.tools.r8.internal.ee$b:
+com.android.tools.r8.ir.conversion.IRBuilder$1 -> com.android.tools.r8.internal.rd$a:
+com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo -> com.android.tools.r8.internal.rd$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
@@ -36241,7 +36185,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.ee$c:
+com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem -> com.android.tools.r8.internal.rd$c:
     com.android.tools.r8.graph.DexType guard -> d
     int targetOffset -> f
     int sourceOffset -> e
@@ -36250,7 +36194,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.ee$d:
+com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem -> com.android.tools.r8.internal.rd$d:
     int sourceOffset -> d
     int targetOffset -> e
     com.android.tools.r8.ir.code.Position position -> f
@@ -36258,13 +36202,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.ee$e:
+com.android.tools.r8.ir.conversion.IRBuilder$ValueList -> com.android.tools.r8.internal.rd$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.ee$f:
+com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem -> com.android.tools.r8.internal.rd$f:
     boolean $assertionsDisabled -> a
     int firstInstructionIndex -> c
     com.android.tools.r8.ir.code.BasicBlock block -> b
@@ -36273,7 +36217,7 @@
     2:5:void <init>(com.android.tools.r8.ir.code.BasicBlock,int):188:191 -> <init>
     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.k:
+com.android.tools.r8.ir.conversion.IRConverter -> com.android.tools.r8.ir.conversion.g:
     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
@@ -36285,6 +36229,7 @@
     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
@@ -36321,295 +36266,296 @@
     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.ir.desugar.nest.D8NestBasedAccessDesugaring d8NestBasedAccessDesugaring -> n
     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:201: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:370 -> <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):211:211 -> a
+    1:1:void <clinit>():124:124 -> <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):192:192 -> <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):174:368 -> <init>
+    boolean lambda$materializeInstructionBeforeLongOperationsWorkaround$21(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):214:214 -> a
     2:2:java.lang.String com.android.tools.r8.utils.DescriptorUtils.getPackageBinaryNameFromJavaType(java.lang.String):380:380 -> a
-    2:2:java.lang.String lambda$new$0(java.lang.String):211 -> a
-    3:3:java.lang.String lambda$new$0(java.lang.String):211:211 -> a
-    4:5:void removeLambdaDeserializationMethods():388:389 -> a
-    4:5:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):484 -> a
-    6:6:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):486:486 -> a
-    7:10:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):485:488 -> a
-    11:12:void convertClasses(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):528:529 -> a
-    11:12:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):490 -> a
-    13:15:com.android.tools.r8.ir.conversion.ClassConverter com.android.tools.r8.ir.conversion.ClassConverter.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.D8MethodProcessor):31:33 -> a
-    13:15:void convertClasses(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):529 -> a
-    13:15:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):490 -> a
-    16:16:void convertClasses(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):530:530 -> a
-    16:16:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):490 -> a
-    17:18:void synthesizeBridgesForNestBasedAccessesOnClasspath(com.android.tools.r8.ir.conversion.MethodProcessor,java.util.concurrent.ExecutorService):395:396 -> a
-    17:18:void convertClasses(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):532 -> a
-    17:18:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):490 -> a
-    19:19:void convertClasses(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):533:533 -> a
-    19:19:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):490 -> a
-    20:20:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):493:493 -> a
-    21:26:void finalizeNestBasedAccessDesugaring(com.android.tools.r8.graph.DexApplication$Builder):402:407 -> a
-    21:26:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):495 -> a
-    27:29:void synthesizeLambdaClasses(java.util.concurrent.ExecutorService):412:414 -> a
-    27:29:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):498 -> a
-    30:31:void processTwrCloseResourceUtilityMethods():444:445 -> a
-    30:31:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):499 -> a
-    32:36:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):500:504 -> a
-    37:46:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):501:510 -> a
-    47:48:void processSynthesizedJava8UtilityClasses(java.util.concurrent.ExecutorService):451:452 -> a
-    47:48:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):511 -> a
-    49:50:void synthesizeRetargetClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):458:459 -> a
-    49:50:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):512 -> a
-    51:52:void synthesizeInvokeSpecialBridges(java.util.concurrent.ExecutorService):465:466 -> a
-    51:52:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):513 -> a
-    53:54:void processCovariantReturnTypeAnnotations(com.android.tools.r8.graph.DexApplication$Builder):477:478 -> a
-    53:54:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):514 -> a
-    55:56:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):996:997 -> a
-    55:56:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):515 -> a
-    57:63:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):517:523 -> a
-    64:64:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):520:520 -> a
-    65:67:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):436:438 -> a
-    68:88:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.conversion.MethodProcessor):537:557 -> a
-    89:89:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.conversion.MethodProcessor):556:556 -> a
-    90:92:void lambda$convertMethods$2(boolean,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.ProgramMethod):549:551 -> a
-    93:96:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):562:565 -> a
-    97:103:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):564:570 -> a
-    104:129:void checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):622:647 -> a
-    104:129:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):573 -> a
-    130:130:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    130:130:void checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):647 -> a
-    130:130:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):573 -> a
-    131:131:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    131:131:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    131:131:void checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):647 -> a
-    131:131:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):573 -> a
-    132:132:void checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):647:647 -> a
-    132:132:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):573 -> a
-    133:133:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):574:574 -> a
-    134:134:boolean needsIRConversion(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.ProgramMethod):590:590 -> a
-    134:134:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):574 -> a
-    135:135:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():408:408 -> a
-    135:135:boolean needsIRConversion(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.ProgramMethod):593 -> a
-    135:135:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):574 -> a
-    136:157:boolean needsIRConversion(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.ProgramMethod):597:618 -> a
-    136:157:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):574 -> a
-    158:163:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):577:582 -> a
-    164:169:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):580:585 -> a
-    170:174:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1805:1809 -> a
-    170:174:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):585 -> a
-    175:180:void workaroundAbstractMethodOnNonAbstractClassVerificationBug(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):654:659 -> a
-    181:181:void workaroundAbstractMethodOnNonAbstractClassVerificationBug(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):658:658 -> a
-    182:183:void lambda$workaroundAbstractMethodOnNonAbstractClassVerificationBug$4(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexProgramClass):661:662 -> a
-    184:186:void lambda$workaroundAbstractMethodOnNonAbstractClassVerificationBug$3(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod):664:666 -> a
-    187:187: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):717:717 -> a
-    188:189:void lambda$optimize$6(com.android.tools.r8.ir.code.IRCode):833:834 -> a
-    190:197:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet):900:907 -> a
-    198:204:void addWaveDoneAction(com.android.tools.r8.utils.Action):911:917 -> a
-    205:205:void addWaveDoneAction(com.android.tools.r8.utils.Action):915:915 -> a
-    206:206:void addWaveDoneAction(com.android.tools.r8.utils.Action):912:912 -> a
-    207:207:void computeReachabilitySensitivity(com.android.tools.r8.graph.DexApplication):925:925 -> a
-    208:208:void lambda$computeReachabilitySensitivity$9(com.android.tools.r8.graph.DexEncodedMethod):927:927 -> a
-    209:210:void forEachSelectedOutliningMethod(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.function.Consumer,java.util.concurrent.ExecutorService):937:938 -> a
-    211:213:void lambda$forEachSelectedOutliningMethod$11(java.util.function.Consumer,com.android.tools.r8.graph.ProgramMethod):941:943 -> a
-    214:214:boolean com.android.tools.r8.graph.Code.isOutlineCode():0:0 -> a
-    214:214:void lambda$forEachSelectedOutliningMethod$11(java.util.function.Consumer,com.android.tools.r8.graph.ProgramMethod):943 -> a
-    215:223:void lambda$forEachSelectedOutliningMethod$11(java.util.function.Consumer,com.android.tools.r8.graph.ProgramMethod):943:951 -> a
-    224:228:void forEachSynthesizedServiceLoaderMethod(com.android.tools.r8.graph.ProgramMethod):964:968 -> a
-    229:229:void forEachSynthesizedServiceLoaderMethod(com.android.tools.r8.graph.ProgramMethod):967:967 -> a
-    230:230:void clearDexMethodCompilationState():1002:1002 -> a
-    231:231:void clearDexMethodCompilationState(com.android.tools.r8.graph.DexProgramClass):1006:1006 -> a
-    232:243:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1019:1030 -> a
-    244:244:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1077:1077 -> a
-    244:244:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1030 -> a
-    245:245:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1030:1030 -> a
-    246:246:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1029:1029 -> a
-    247:248:void optimizeSynthesizedMethods(java.util.List,java.util.concurrent.ExecutorService):1038:1039 -> a
-    249:253:void optimizeSynthesizedClasses(java.util.Collection,java.util.concurrent.ExecutorService):1045:1049 -> a
-    254:254:void lambda$optimizeSynthesizedMethod$12(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId):1059:1059 -> a
-    255:257:void processMethodsConcurrently(com.android.tools.r8.utils.collections.SortedProgramMethodSet,java.util.concurrent.ExecutorService):1066:1068 -> a
-    258:258:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1077:1077 -> a
-    259:268: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):1132:1141 -> a
-    259:268:com.android.tools.r8.utils.Timing lambda$rewriteCode$14(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 -> a
-    269:281: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):1137:1149 -> a
-    269:281:com.android.tools.r8.utils.Timing lambda$rewriteCode$14(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 -> a
-    282:300: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):1145:1163 -> a
-    282:300:com.android.tools.r8.utils.Timing lambda$rewriteCode$14(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 -> a
-    301:309: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):1195:1203 -> a
-    310:315:void printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):2013:2018 -> a
-    310:315: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):1206 -> a
-    316:322: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:1213 -> a
-    323:323:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtStringNewInitBug():1718:1718 -> a
-    323:323: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):1213 -> a
-    324:349: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):1214:1239 -> a
-    350:387: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):1237:1274 -> a
-    388:405: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):1273:1290 -> a
-    406:406:void com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringsInMethod(com.android.tools.r8.ir.code.IRCode):96:96 -> a
-    406:406: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):1290 -> a
-    407:444: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):1291:1328 -> a
-    445:445: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):887:887 -> a
-    445:445: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):1328 -> a
-    446:446: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):881:881 -> a
-    446:446: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):1328 -> a
-    447:457: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):1329:1339 -> a
-    458:553: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):1338:1433 -> a
-    554:555:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination.shouldRun(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):84:85 -> a
-    554:555: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):1433 -> a
-    556:561: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):1434:1439 -> a
-    562:564:void invertConditionalsForTesting(com.android.tools.r8.ir.code.IRCode):1109:1111 -> a
-    562:564: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):1440 -> a
-    565:577: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):1444:1456 -> a
-    578:627: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):1455:1504 -> a
-    628:737: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):1493:1602 -> a
-    738:743:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):1033:1038 -> a
-    738:743: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):1602 -> a
-    744:786: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):1603:1645 -> a
-    787:787:boolean com.android.tools.r8.utils.InternalOptions.canHaveNumberConversionRegisterAllocationBug():1726:1726 -> a
-    787:787: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):1645 -> a
-    788:796: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):1646:1654 -> a
-    797:797: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):1317:1317 -> a
-    798:798:void lambda$optimize$16(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):1321:1321 -> a
-    799:801:com.android.tools.r8.ir.optimize.InliningOracle lambda$optimize$17(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):1506:1506 -> a
-    802:852: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):1667:1717 -> a
-    853:854:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1731:1732 -> a
-    855:860:void finalizeToCf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1748:1753 -> a
-    855:860:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1733 -> a
-    861:861:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1735:1735 -> a
-    862:872:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1757:1767 -> a
-    862:872:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1736 -> a
-    873:877:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1805:1809 -> a
-    873:877:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1767 -> a
-    873:877:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1736 -> a
-    878:880:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1768:1770 -> a
-    878:880:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1736 -> a
-    881:881:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1077:1077 -> a
-    881:881:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1770 -> a
-    881:881:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1736 -> a
-    882:882:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1770:1770 -> a
-    882:882:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1736 -> a
-    883:889:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1769:1775 -> a
-    883:889:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1736 -> a
-    890:891:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1741:1742 -> a
-    892:892:com.android.tools.r8.graph.Code com.android.tools.r8.graph.DexEncodedMethod.buildEmptyThrowingCode(com.android.tools.r8.utils.InternalOptions):1000:1000 -> a
-    892:892:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1742 -> a
-    893:893:com.android.tools.r8.graph.CfCode com.android.tools.r8.graph.DexEncodedMethod.buildEmptyThrowingCfCode():1006:1006 -> a
-    893:893:com.android.tools.r8.graph.Code com.android.tools.r8.graph.DexEncodedMethod.buildEmptyThrowingCode(com.android.tools.r8.utils.InternalOptions):1001 -> a
-    893:893:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1742 -> a
-    894:894:com.android.tools.r8.graph.Code com.android.tools.r8.graph.DexEncodedMethod.buildEmptyThrowingCode(com.android.tools.r8.utils.InternalOptions):1002:1002 -> a
-    894:894:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1742 -> a
-    895:896:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1743:1744 -> a
-    897:897:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1780:1780 -> a
-    898:907:boolean shouldComputeInliningConstraint(com.android.tools.r8.graph.ProgramMethod):1789:1798 -> a
-    898:907:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1782 -> a
-    908:910:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1783:1785 -> a
-    911:918: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):1818:1825 -> a
-    919:919:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():1751:1751 -> a
-    919:919: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):1825 -> a
-    920:920: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):1826:1826 -> a
-    921:933:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3896:3908 -> a
-    921:933: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):1826 -> a
-    934:934:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1559:1559 -> a
-    934:934:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3909 -> a
-    934:934: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):1826 -> a
-    935:936:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3909:3910 -> a
-    935:936: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):1826 -> a
-    937:950: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):1828:1841 -> a
-    951:951: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):1840:1840 -> a
-    952:953:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$19(com.android.tools.r8.graph.DexItemFactory):1906:1907 -> a
-    954:954:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$19(com.android.tools.r8.graph.DexItemFactory):1905:1905 -> a
-    955:955:boolean isNotPseudoInstruction(com.android.tools.r8.ir.code.Instruction):1953:1953 -> a
-    956:956:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):2029:2029 -> a
-    957:957:void com.android.tools.r8.utils.CfgPrinter.resetUnusedValue():24:24 -> a
-    957:957:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):2030 -> a
-    958:975:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):2031:2048 -> a
-    1:1:boolean lambda$convertMethods$1(com.android.tools.r8.graph.DexEncodedMethod):547:547 -> b
-    2:6:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):678:682 -> b
-    7:8:void collectLambdaMergingCandidates(com.android.tools.r8.graph.DexApplication):972:973 -> b
-    7:8:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):683 -> b
-    9:10:void collectStaticizerCandidates(com.android.tools.r8.graph.DexApplication):426:427 -> b
-    9:10:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):684 -> b
-    11:35:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):685:709 -> b
-    36:84:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):708:756 -> b
-    85:85:com.android.tools.r8.ir.optimize.enums.EnumDataMap com.android.tools.r8.ir.optimize.enums.EnumDataMap.empty():18:18 -> b
-    85:85:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):758 -> b
-    86:107:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):758:779 -> b
-    108:109:void staticizeClasses(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):420:421 -> b
-    108:109:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):781 -> b
-    110:122:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):782:794 -> b
-    123:136:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):791:804 -> b
-    137:138:void processSynthesizedJava8UtilityClasses(java.util.concurrent.ExecutorService):451:452 -> b
-    137:138:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):805 -> b
-    139:140:void synthesizeRetargetClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):458:459 -> b
-    139:140:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):806 -> b
-    141:142:void synthesizeEnumUnboxingUtilityMethods(java.util.concurrent.ExecutorService):471:472 -> b
-    141:142:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):807 -> b
-    143:143:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):809:809 -> b
-    144:148: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):984:988 -> b
-    144:148:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):811 -> b
-    149:149:com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses.empty():31:31 -> b
-    149:149: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):988 -> b
-    149:149:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):811 -> b
-    150:152: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):988:990 -> b
-    150:152:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):811 -> b
-    153:153:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):813:813 -> b
-    154:155:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):996:997 -> b
-    154:155:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):814 -> b
-    156:158:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):816:818 -> b
-    159:222:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):817:880 -> b
-    223:226:boolean checkLegacySyntheticsAreInBuilder(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication$Builder):888:891 -> b
-    223:226:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):881 -> b
-    227:227:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):882:882 -> b
-    228:231:void lambda$optimize$7(com.android.tools.r8.ir.code.IRCode):842:845 -> b
-    232:232:void lambda$optimize$7(com.android.tools.r8.ir.code.IRCode):844:844 -> b
-    233:233:void lambda$optimize$8(com.android.tools.r8.graph.ProgramMethod):850:850 -> b
-    234:234:void waveStart(com.android.tools.r8.utils.collections.ProgramMethodSet):896:896 -> b
-    235:236:void lambda$computeReachabilitySensitivity$10(com.android.tools.r8.graph.DexProgramClass):926:927 -> b
-    237:237:void processSynthesizedServiceLoaderMethods(java.util.List,java.util.concurrent.ExecutorService):959:959 -> b
-    238:238:void lambda$processMethodsConcurrently$13(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId):1070:1070 -> b
-    239:239:java.util.List getOptimizationsForPostIRProcessing():1087:1087 -> b
-    240:249: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):1096:1105 -> b
-    250:265:boolean desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):1167:1182 -> b
-    266:266:com.android.tools.r8.ir.desugar.nest.D8NestBridgeConsumer com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer.createForD8(com.android.tools.r8.ir.conversion.MethodProcessor):14:14 -> b
-    266:266:boolean desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):1183 -> b
-    267:267:boolean desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):1184:1184 -> b
-    268:272: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):1723:1727 -> b
-    273:277:boolean lambda$workaroundForwardingInitializerBug$18(com.android.tools.r8.ir.code.Instruction):1869:1873 -> b
-    278:279:void printPhase(java.lang.String):2023:2024 -> b
-    1:1:boolean isInWave():921:921 -> c
-    2:6:void optimizeSynthesizedMethod(com.android.tools.r8.graph.ProgramMethod):1053:1057 -> c
-    7:8: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):1122:1123 -> c
-    9:9: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):1121:1121 -> c
-    10:10:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1898:1898 -> c
-    11:11:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatLinkedListBug():1702:1702 -> c
-    11:11:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1898 -> c
-    12:23:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1901:1912 -> c
-    24:24:boolean com.android.tools.r8.ir.code.Instruction.isMul():0:0 -> c
-    24:24:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1958 -> c
-    24:24:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1913 -> c
-    25:26:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1959:1960 -> c
-    25:26:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1913 -> c
-    27:27:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1916:1916 -> c
-    28:28:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1965:1965 -> c
-    28:28:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1917 -> c
-    29:29:boolean com.android.tools.r8.ir.code.Instruction.isSub():0:0 -> c
-    29:29:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1965 -> c
-    29:29:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1917 -> c
-    30:30:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1966:1966 -> c
-    30:30:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1917 -> c
-    31:32:boolean isFallthoughTarget(com.android.tools.r8.ir.code.BasicBlock):1970:1971 -> c
-    31:32:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1920 -> c
-    33:34:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1923:1924 -> c
-    35:39:boolean isAliasOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1944:1948 -> c
-    35:39:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1925 -> c
-    40:45:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1926:1931 -> c
-    46:57: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):1980:1991 -> c
-    46:57:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1932 -> c
-    1:1:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1847:1847 -> d
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.canHaveForwardingInitInliningBug():1739:1739 -> d
-    2:2:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1847 -> d
-    3:19:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1851:1867 -> d
-    20:32:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1997:2009 -> d
-    20:32:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1878 -> d
-com.android.tools.r8.ir.conversion.LensCodeRewriter -> com.android.tools.r8.ir.conversion.m:
+    2:2:java.lang.String lambda$new$0(java.lang.String):214 -> a
+    3:3:java.lang.String lambda$new$0(java.lang.String):214:214 -> a
+    4:5:void removeLambdaDeserializationMethods():400:401 -> a
+    4:5:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):486 -> a
+    6:6:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):488:488 -> a
+    7:18:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):487:498 -> a
+    19:43:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):497:521 -> a
+    44:45:void desugarNestBasedAccess(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):407:408 -> a
+    44:45:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):523 -> a
+    46:48:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):414:416 -> a
+    46:48:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):524 -> a
+    49:49:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):525:525 -> a
+    50:51:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):438:439 -> a
+    50:51:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):525 -> a
+    52:53:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):446:447 -> a
+    52:53:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):526 -> a
+    54:55:void processSynthesizedJava8UtilityClasses(java.util.concurrent.ExecutorService):453:454 -> a
+    54:55:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):527 -> a
+    56:57:void synthesizeRetargetClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):460:461 -> a
+    56:57:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):528 -> a
+    58:59:void synthesizeInvokeSpecialBridges(java.util.concurrent.ExecutorService):467:468 -> a
+    58:59:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):529 -> a
+    60:61:void processCovariantReturnTypeAnnotations(com.android.tools.r8.graph.DexApplication$Builder):479:480 -> a
+    60:61:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):530 -> a
+    62:63:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):1002:1003 -> a
+    62:63:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):531 -> a
+    64:70:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):533:539 -> a
+    71:71:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):536:536 -> a
+    72:78:void lambda$convert$1(com.android.tools.r8.ir.conversion.LibraryDesugaredChecker,com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.graph.DexProgramClass):500:506 -> a
+    79:79:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexType.getDescriptor():83:83 -> a
+    79:79:void lambda$convert$1(com.android.tools.r8.ir.conversion.LibraryDesugaredChecker,com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.graph.DexProgramClass):506 -> a
+    80:80:void lambda$convert$1(com.android.tools.r8.ir.conversion.LibraryDesugaredChecker,com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.graph.DexProgramClass):506:506 -> a
+    81:81:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    81:81:void lambda$convert$1(com.android.tools.r8.ir.conversion.LibraryDesugaredChecker,com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.graph.DexProgramClass):506 -> a
+    82:86:void lambda$convert$1(com.android.tools.r8.ir.conversion.LibraryDesugaredChecker,com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.graph.DexProgramClass):506:510 -> a
+    87:89:void lambda$convertMethods$3(boolean,com.android.tools.r8.graph.ProgramMethod):555:557 -> a
+    90:93:void convertMethod(com.android.tools.r8.graph.ProgramMethod):568:571 -> a
+    94:100:void convertMethod(com.android.tools.r8.graph.ProgramMethod):570:576 -> a
+    101:126:void checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):629:654 -> a
+    101:126:void convertMethod(com.android.tools.r8.graph.ProgramMethod):579 -> a
+    127:127:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    127:127:void checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):654 -> a
+    127:127:void convertMethod(com.android.tools.r8.graph.ProgramMethod):579 -> a
+    128:128:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    128:128:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    128:128:void checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):654 -> a
+    128:128:void convertMethod(com.android.tools.r8.graph.ProgramMethod):579 -> a
+    129:129:void checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):654:654 -> a
+    129:129:void convertMethod(com.android.tools.r8.graph.ProgramMethod):579 -> a
+    130:130:void convertMethod(com.android.tools.r8.graph.ProgramMethod):580:580 -> a
+    131:131:boolean needsIRConversion(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.ProgramMethod):597:597 -> a
+    131:131:void convertMethod(com.android.tools.r8.graph.ProgramMethod):580 -> a
+    132:132:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():415:415 -> a
+    132:132:boolean needsIRConversion(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.ProgramMethod):600 -> a
+    132:132:void convertMethod(com.android.tools.r8.graph.ProgramMethod):580 -> a
+    133:154:boolean needsIRConversion(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.ProgramMethod):604:625 -> a
+    133:154:void convertMethod(com.android.tools.r8.graph.ProgramMethod):580 -> a
+    155:161:void convertMethod(com.android.tools.r8.graph.ProgramMethod):583:589 -> a
+    162:164:void convertMethod(com.android.tools.r8.graph.ProgramMethod):586:586 -> a
+    169:170:void convertMethod(com.android.tools.r8.graph.ProgramMethod):591:592 -> a
+    171:175:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1824:1828 -> a
+    171:175:void convertMethod(com.android.tools.r8.graph.ProgramMethod):592 -> a
+    176:181:void workaroundAbstractMethodOnNonAbstractClassVerificationBug(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):661:666 -> a
+    182:182:void workaroundAbstractMethodOnNonAbstractClassVerificationBug(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):665:665 -> a
+    183:184:void lambda$workaroundAbstractMethodOnNonAbstractClassVerificationBug$5(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexProgramClass):668:669 -> a
+    185:187:void lambda$workaroundAbstractMethodOnNonAbstractClassVerificationBug$4(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod):671:673 -> a
+    188:188:com.android.tools.r8.utils.Timing lambda$optimize$6(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):724:724 -> a
+    189:190:void lambda$optimize$7(com.android.tools.r8.ir.code.IRCode):836:837 -> a
+    191:198:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet):905:912 -> a
+    199:205:void addWaveDoneAction(com.android.tools.r8.utils.Action):916:922 -> a
+    206:206:void addWaveDoneAction(com.android.tools.r8.utils.Action):920:920 -> a
+    207:207:void addWaveDoneAction(com.android.tools.r8.utils.Action):917:917 -> a
+    208:208:void computeReachabilitySensitivity(com.android.tools.r8.graph.DexApplication):930:930 -> a
+    209:209:void lambda$computeReachabilitySensitivity$9(com.android.tools.r8.graph.DexEncodedMethod):932:932 -> a
+    210:211:void forEachSelectedOutliningMethod(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.function.Consumer,java.util.concurrent.ExecutorService):942:943 -> a
+    212:214:void lambda$forEachSelectedOutliningMethod$11(java.util.function.Consumer,com.android.tools.r8.graph.ProgramMethod):946:948 -> a
+    215:215:boolean com.android.tools.r8.graph.Code.isOutlineCode():0:0 -> a
+    215:215:void lambda$forEachSelectedOutliningMethod$11(java.util.function.Consumer,com.android.tools.r8.graph.ProgramMethod):948 -> a
+    216:224:void lambda$forEachSelectedOutliningMethod$11(java.util.function.Consumer,com.android.tools.r8.graph.ProgramMethod):948:956 -> a
+    225:225:void clearDexMethodCompilationState():1008:1008 -> a
+    226:226:void clearDexMethodCompilationState(com.android.tools.r8.graph.DexProgramClass):1012:1012 -> a
+    227:238:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1025:1036 -> a
+    239:239:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1099:1099 -> a
+    239:239:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1036 -> a
+    240:240:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1036:1036 -> a
+    241:241:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1035:1035 -> a
+    242:243:void optimizeSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,java.util.concurrent.ExecutorService):1060:1061 -> a
+    244:248:void optimizeSynthesizedClasses(java.util.Collection,java.util.concurrent.ExecutorService):1067:1071 -> a
+    249:249:void lambda$optimizeSynthesizedMethod$12(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId):1081:1081 -> a
+    250:252:void processMethodsConcurrently(com.android.tools.r8.utils.collections.SortedProgramMethodSet,java.util.concurrent.ExecutorService):1088:1090 -> a
+    253:253:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1099:1099 -> a
+    254:256: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):1154:1156 -> a
+    254:256:com.android.tools.r8.utils.Timing lambda$rewriteCode$14(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):1146 -> a
+    257:265: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):1155:1163 -> a
+    257:265:com.android.tools.r8.utils.Timing lambda$rewriteCode$14(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):1146 -> a
+    266:278: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):1159:1171 -> a
+    266:278:com.android.tools.r8.utils.Timing lambda$rewriteCode$14(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):1146 -> a
+    279:297: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):1167:1185 -> a
+    279:297:com.android.tools.r8.utils.Timing lambda$rewriteCode$14(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):1146 -> a
+    298:306: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):1213:1221 -> a
+    307:312:void printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):2032:2037 -> a
+    307:312: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):1224 -> a
+    313:319: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):1225:1231 -> a
+    320:320:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtStringNewInitBug():1844:1844 -> a
+    320:320: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):1231 -> a
+    321:342: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):1232:1253 -> a
+    343:379: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):1251:1287 -> a
+    380:397: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):1286:1303 -> a
+    398:398:void com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringsInMethod(com.android.tools.r8.ir.code.IRCode):96:96 -> a
+    398:398: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):1303 -> a
+    399:436: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):1304:1341 -> a
+    437:437: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):886:886 -> a
+    437:437: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):1341 -> a
+    438:438: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):880:880 -> a
+    438:438: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):1341 -> a
+    439:449: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):1342:1352 -> a
+    450:545: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):1351:1446 -> a
+    546:547:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination.shouldRun(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):82:83 -> a
+    546:547: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):1446 -> a
+    548:553: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):1447:1452 -> a
+    554:556:void invertConditionalsForTesting(com.android.tools.r8.ir.code.IRCode):1131:1133 -> a
+    554:556: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):1453 -> a
+    557:569: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):1457:1469 -> a
+    570:619: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):1468:1517 -> a
+    620:737: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):1506:1623 -> a
+    738:743:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):1172:1177 -> a
+    738:743: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 -> a
+    744:786: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):1624:1666 -> a
+    787:787:boolean com.android.tools.r8.utils.InternalOptions.canHaveNumberConversionRegisterAllocationBug():1852:1852 -> a
+    787:787: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):1666 -> a
+    788:796: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):1667:1675 -> a
+    797:797:void lambda$optimize$16(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1330:1330 -> a
+    798:798:void lambda$optimize$17(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):1334:1334 -> a
+    799:801:com.android.tools.r8.ir.optimize.InliningOracle lambda$optimize$18(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):1519:1519 -> a
+    802:852: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):1688:1738 -> a
+    853:854:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1752:1753 -> a
+    855:860:void finalizeToCf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1769:1774 -> a
+    855:860:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1754 -> a
+    861:861:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1756:1756 -> a
+    862:870:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1778:1786 -> a
+    862:870:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1757 -> a
+    871:875:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1824:1828 -> a
+    871:875:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1786 -> a
+    871:875:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1757 -> a
+    876:878:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1787:1789 -> a
+    876:878:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1757 -> a
+    879:879:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1099:1099 -> a
+    879:879:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1789 -> a
+    879:879:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1757 -> a
+    880:880:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1789:1789 -> a
+    880:880:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1757 -> a
+    881:887:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1788:1794 -> a
+    881:887:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1757 -> a
+    888:889:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1762:1763 -> a
+    890:892:com.android.tools.r8.graph.Code com.android.tools.r8.graph.DexEncodedMethod.buildEmptyThrowingCode(com.android.tools.r8.utils.InternalOptions):1013:1015 -> a
+    890:892:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1763 -> a
+    893:894:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1764:1765 -> a
+    895:895:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1799:1799 -> a
+    896:905:boolean shouldComputeInliningConstraint(com.android.tools.r8.graph.ProgramMethod):1808:1817 -> a
+    896:905:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1801 -> a
+    906:908:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1802:1804 -> a
+    909:916: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):1837:1844 -> a
+    917:917:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():1877:1877 -> a
+    917:917: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):1844 -> a
+    918:918: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):1845:1845 -> a
+    919:931:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3837:3849 -> a
+    919:931: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):1845 -> a
+    932:932:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1559:1559 -> a
+    932:932:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3850 -> a
+    932:932: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):1845 -> a
+    933:934:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3850:3851 -> a
+    933:934: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):1845 -> a
+    935:948: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):1847:1860 -> a
+    949:949: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):1859:1859 -> a
+    950:951:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$20(com.android.tools.r8.graph.DexItemFactory):1925:1926 -> a
+    952:952:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$20(com.android.tools.r8.graph.DexItemFactory):1924:1924 -> a
+    953:953:boolean isNotPseudoInstruction(com.android.tools.r8.ir.code.Instruction):1972:1972 -> a
+    954:954:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):2048:2048 -> a
+    955:955:void com.android.tools.r8.utils.CfgPrinter.resetUnusedValue():24:24 -> a
+    955:955:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):2049 -> a
+    956:973:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):2050:2067 -> a
+    1:7:boolean enableTryWithResourcesDesugaring():390:396 -> b
+    8:28:void convertMethods(com.android.tools.r8.graph.DexProgramClass):543:563 -> b
+    29:29:void convertMethods(com.android.tools.r8.graph.DexProgramClass):562:562 -> b
+    30:30:boolean lambda$convertMethods$2(com.android.tools.r8.graph.DexEncodedMethod):553:553 -> b
+    31:35:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):685:689 -> b
+    36:37:void collectLambdaMergingCandidates(com.android.tools.r8.graph.DexApplication):978:979 -> b
+    36:37:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):690 -> b
+    38:39:void collectStaticizerCandidates(com.android.tools.r8.graph.DexApplication):428:429 -> b
+    38:39:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):691 -> b
+    40:64:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):692:716 -> b
+    65:109:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):715:759 -> b
+    110:110:com.android.tools.r8.ir.optimize.enums.EnumDataMap com.android.tools.r8.ir.optimize.enums.EnumDataMap.empty():18:18 -> b
+    110:110:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):761 -> b
+    111:137:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):761:787 -> b
+    138:139:void staticizeClasses(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):422:423 -> b
+    138:139:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):789 -> b
+    140:151:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):790:801 -> b
+    152:153:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):438:439 -> b
+    152:153:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):801 -> b
+    154:156:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):802:804 -> b
+    157:158:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):446:447 -> b
+    157:158:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):805 -> b
+    159:160:void processSynthesizedJava8UtilityClasses(java.util.concurrent.ExecutorService):453:454 -> b
+    159:160:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):806 -> b
+    161:162:void synthesizeRetargetClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):460:461 -> b
+    161:162:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):807 -> b
+    163:164:void synthesizeEnumUnboxingUtilityMethods(java.util.concurrent.ExecutorService):473:474 -> b
+    163:164:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):808 -> b
+    165:165:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):810:810 -> b
+    166:170: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):990:994 -> b
+    166:170:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):812 -> b
+    171:171:com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses.empty():31:31 -> b
+    171:171: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):994 -> b
+    171:171:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):812 -> b
+    172:174: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):994:996 -> b
+    172:174:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):812 -> b
+    175:175:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):814:814 -> b
+    176:177:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):1002:1003 -> b
+    176:177:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):815 -> b
+    178:181:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):817:820 -> b
+    182:203:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):819:840 -> b
+    204:211:com.android.tools.r8.graph.DexType computeOutlineClassType():1045:1052 -> b
+    204:211:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):840 -> b
+    212:257:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):840:885 -> b
+    258:261:boolean checkLegacySyntheticsAreInBuilder(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication$Builder):893:896 -> b
+    258:261:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):886 -> b
+    262:262:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):887:887 -> b
+    263:266:void lambda$optimize$8(com.android.tools.r8.ir.code.IRCode):846:849 -> b
+    267:267:void lambda$optimize$8(com.android.tools.r8.ir.code.IRCode):848:848 -> b
+    268:268:void waveStart(com.android.tools.r8.utils.collections.ProgramMethodSet):901:901 -> b
+    269:269:void processSynthesizedServiceLoaderMethods(com.android.tools.r8.graph.DexProgramClass,java.util.concurrent.ExecutorService):963:963 -> b
+    270:270:void lambda$processMethodsConcurrently$13(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId):1092:1092 -> b
+    271:280: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):1118:1127 -> b
+    281:294:boolean desugar(com.android.tools.r8.graph.ProgramMethod):1189:1202 -> b
+    295:299: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):1744:1748 -> b
+    300:304:boolean lambda$workaroundForwardingInitializerBug$19(com.android.tools.r8.ir.code.Instruction):1888:1892 -> b
+    305:306:void printPhase(java.lang.String):2042:2043 -> b
+    1:1:boolean enableTwrCloseResourceDesugaring():386:386 -> c
+    2:3:void lambda$computeReachabilitySensitivity$10(com.android.tools.r8.graph.DexProgramClass):931:932 -> c
+    4:8:void forEachSynthesizedServiceLoaderMethod(com.android.tools.r8.graph.ProgramMethod):970:974 -> c
+    9:9:void forEachSynthesizedServiceLoaderMethod(com.android.tools.r8.graph.ProgramMethod):973:973 -> 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):1144:1145 -> 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):1143:1143 -> c
+    13:13:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1917:1917 -> c
+    14:14:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatLinkedListBug():1828:1828 -> c
+    14:14:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1917 -> c
+    15:26:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1920:1931 -> 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):1977 -> c
+    27:27:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1932 -> c
+    28:29:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1978:1979 -> c
+    28:29:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1932 -> c
+    30:30:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1935:1935 -> c
+    31:31:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1984:1984 -> c
+    31:31:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1936 -> 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):1984 -> c
+    32:32:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1936 -> c
+    33:33:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1985:1985 -> c
+    33:33:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1936 -> c
+    34:35:boolean isFallthoughTarget(com.android.tools.r8.ir.code.BasicBlock):1989:1990 -> c
+    34:35:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1939 -> c
+    36:37:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1942:1943 -> c
+    38:42:boolean isAliasOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1963:1967 -> c
+    38:42:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1944 -> c
+    43:48:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1945:1950 -> 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):1999:2010 -> c
+    49:60:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1951 -> c
+    1:5:void optimizeSynthesizedMethod(com.android.tools.r8.graph.ProgramMethod):1075:1079 -> d
+    6:6:java.util.List getOptimizationsForPostIRProcessing():1109:1109 -> d
+    7:7:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1866:1866 -> d
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.canHaveForwardingInitInliningBug():1865:1865 -> d
+    8:8:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1866 -> d
+    9:25:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1870:1886 -> 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):2016:2028 -> d
+    26:38:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1897 -> d
+    1:1:boolean isInWave():926:926 -> e
+    1:1:com.android.tools.r8.graph.AppInfoWithClassHierarchy lambda$desugar$15():1197:1197 -> f
+com.android.tools.r8.ir.conversion.IRConverter$1 -> com.android.tools.r8.ir.conversion.g$a:
+    int[] $SwitchMap$com$android$tools$r8$utils$OffOrAuto -> a
+    1:1:void <clinit>():390:390 -> <clinit>
+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
     com.android.tools.r8.utils.InternalOptions options -> e
@@ -36621,7 +36567,7 @@
     2:2:com.android.tools.r8.ir.code.Value access$100(com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):108:108 -> a
     3:7:com.android.tools.r8.ir.code.Value makeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):123:127 -> a
     8:9:com.android.tools.r8.ir.code.Value makeOutValue(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField):133:134 -> a
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():49:49 -> a
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():46:46 -> a
     10:10:com.android.tools.r8.ir.code.Value makeOutValue(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField):135 -> a
     11:12:com.android.tools.r8.ir.code.Value makeOutValue(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField):135:136 -> a
     13:23:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):144:154 -> a
@@ -36665,7 +36611,10 @@
     1262:1262:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
     1262:1262:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):338 -> a
     1263:1271:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):338:346 -> a
-    1272:1278:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):345:351 -> a
+    1272:1276:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):345:349 -> a
+    1277:1277:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    1277:1277:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):351 -> a
+    1278:1278:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):351:351 -> a
     1279:1309:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):350:380 -> a
     1310:1655:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):165:510 -> a
     1656:1662:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):508:514 -> a
@@ -36698,21 +36647,24 @@
     2380:2380:com.android.tools.r8.ir.code.Instruction lambda$rewrite$7(com.android.tools.r8.ir.code.InvokeMultiNewArray,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):553:553 -> a
     2381:2381:com.android.tools.r8.ir.code.Instruction lambda$rewrite$8(com.android.tools.r8.ir.code.InvokeNewArray,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):563:563 -> a
     2382:2382:com.android.tools.r8.ir.code.Instruction lambda$rewrite$10(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):581:581 -> a
-    2383:2388:com.android.tools.r8.graph.DexField rewriteFieldReference(com.android.tools.r8.graph.GraphLens$FieldLookupResult,com.android.tools.r8.graph.ProgramMethod):684:689 -> a
-    2389:2389: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
-    2389:2389:com.android.tools.r8.graph.DexField rewriteFieldReference(com.android.tools.r8.graph.GraphLens$FieldLookupResult,com.android.tools.r8.graph.ProgramMethod):689 -> a
-    2390:2392:com.android.tools.r8.graph.DexField rewriteFieldReference(com.android.tools.r8.graph.GraphLens$FieldLookupResult,com.android.tools.r8.graph.ProgramMethod):689:691 -> a
-    2393:2398:com.android.tools.r8.graph.DexField rewriteFieldReference(com.android.tools.r8.graph.GraphLens$FieldLookupResult,com.android.tools.r8.graph.ProgramMethod):690:695 -> a
-    2399:2400: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):706:707 -> a
-    2401:2411:boolean defaultValueHasChanged(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):720:730 -> a
-    2401:2411: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):708 -> a
-    2412:2413: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):709:710 -> a
-    2414:2417:com.android.tools.r8.ir.analysis.type.TypeElement defaultValueLatticeElement(com.android.tools.r8.graph.DexType):735:738 -> a
-    2414:2417: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):712 -> a
-    2418:2420: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):711:713 -> a
+    2383:2384:com.android.tools.r8.graph.DexField rewriteFieldReference(com.android.tools.r8.graph.GraphLens$FieldLookupResult,com.android.tools.r8.graph.ProgramMethod):684:685 -> a
+    2385:2385:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    2385:2385:com.android.tools.r8.graph.DexField rewriteFieldReference(com.android.tools.r8.graph.GraphLens$FieldLookupResult,com.android.tools.r8.graph.ProgramMethod):685 -> a
+    2386:2389:com.android.tools.r8.graph.DexField rewriteFieldReference(com.android.tools.r8.graph.GraphLens$FieldLookupResult,com.android.tools.r8.graph.ProgramMethod):686:689 -> a
+    2390:2390: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
+    2390:2390:com.android.tools.r8.graph.DexField rewriteFieldReference(com.android.tools.r8.graph.GraphLens$FieldLookupResult,com.android.tools.r8.graph.ProgramMethod):689 -> a
+    2391:2393:com.android.tools.r8.graph.DexField rewriteFieldReference(com.android.tools.r8.graph.GraphLens$FieldLookupResult,com.android.tools.r8.graph.ProgramMethod):689:691 -> a
+    2394:2399:com.android.tools.r8.graph.DexField rewriteFieldReference(com.android.tools.r8.graph.GraphLens$FieldLookupResult,com.android.tools.r8.graph.ProgramMethod):690:695 -> a
+    2400:2401: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):706:707 -> a
+    2402:2412:boolean defaultValueHasChanged(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):720:730 -> a
+    2402:2412: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):708 -> a
+    2413:2414: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):709:710 -> a
+    2415:2418:com.android.tools.r8.ir.analysis.type.TypeElement defaultValueLatticeElement(com.android.tools.r8.graph.DexType):735:738 -> a
+    2415:2418: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):712 -> a
+    2419:2421: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):711:713 -> a
     1:1:com.android.tools.r8.ir.code.Instruction lambda$rewrite$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):534:534 -> b
     1:1:com.android.tools.r8.ir.code.Instruction lambda$rewrite$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):572:572 -> c
-com.android.tools.r8.ir.conversion.LensCodeRewriter$InstructionReplacer -> com.android.tools.r8.ir.conversion.l:
+com.android.tools.r8.ir.conversion.LensCodeRewriter$InstructionReplacer -> com.android.tools.r8.ir.conversion.h:
     com.android.tools.r8.ir.code.Instruction current -> c
     java.util.Set affectedPhis -> e
     com.android.tools.r8.ir.conversion.LensCodeRewriter this$0 -> f
@@ -36732,7 +36684,7 @@
     18:18:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):847 -> a
     19:21:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):847:849 -> a
     22:22:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):845:845 -> a
-com.android.tools.r8.ir.conversion.LensCodeRewriterUtils -> com.android.tools.r8.internal.mo:
+com.android.tools.r8.ir.conversion.LensCodeRewriterUtils -> com.android.tools.r8.internal.rn:
     com.android.tools.r8.graph.GraphLens graphLens -> d
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
@@ -36778,12 +36730,12 @@
     30:35:java.util.List com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.rewriteBootstrapArguments(java.util.List,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):165:170 -> b
     30:35:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):87 -> b
     36:39:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):88:91 -> b
-com.android.tools.r8.ir.conversion.LibraryDesugaredChecker -> com.android.tools.r8.ir.conversion.o:
+com.android.tools.r8.ir.conversion.LibraryDesugaredChecker -> com.android.tools.r8.ir.conversion.k:
     com.android.tools.r8.graph.DexString jDollarDescriptorPrefix -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:3:void <init>(com.android.tools.r8.graph.AppView):25:27 -> <init>
     1:4:boolean isClassLibraryDesugared(com.android.tools.r8.graph.DexProgramClass):31:34 -> a
-com.android.tools.r8.ir.conversion.LibraryDesugaredChecker$IsLibraryDesugaredTracer -> com.android.tools.r8.ir.conversion.n:
+com.android.tools.r8.ir.conversion.LibraryDesugaredChecker$IsLibraryDesugaredTracer -> com.android.tools.r8.ir.conversion.j:
     com.android.tools.r8.graph.DexString jDollarDescriptorPrefix -> c
     com.android.tools.r8.graph.AppView appView -> d
     boolean isLibraryDesugared -> f
@@ -36804,7 +36756,7 @@
     26:26:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):125:125 -> a
     27:27:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod,boolean):140:140 -> a
     28:28:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):150:150 -> a
-    29:29:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():164:164 -> a
+    29:29:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():158:158 -> a
     29:29:void registerField(com.android.tools.r8.graph.DexEncodedField):97 -> a
     30:30:void registerField(com.android.tools.r8.graph.DexEncodedField):97:97 -> a
     1:1:void run():53:53 -> b
@@ -36829,10 +36781,10 @@
     1:2:void registerType(com.android.tools.r8.graph.DexType):80:81 -> g
     3:3:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):170:170 -> g
     1:1:void registerField(com.android.tools.r8.graph.DexField):85:85 -> i
-    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():49:49 -> i
+    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():46:46 -> i
     2:2:void registerField(com.android.tools.r8.graph.DexField):86 -> i
     3:3:void registerField(com.android.tools.r8.graph.DexField):86:86 -> i
-com.android.tools.r8.ir.conversion.MethodOptimizationFeedback -> com.android.tools.r8.internal.Zq:
+com.android.tools.r8.ir.conversion.MethodOptimizationFeedback -> com.android.tools.r8.internal.Yp:
     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
@@ -36855,18 +36807,24 @@
     void methodReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.DexEncodedMethod) -> e
     void classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod) -> f
     void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod) -> g
-com.android.tools.r8.ir.conversion.MethodProcessingId -> com.android.tools.r8.ir.conversion.p:
+com.android.tools.r8.ir.conversion.MethodProcessingId -> com.android.tools.r8.ir.conversion.l:
     int secondaryId -> b
     int primaryId -> a
     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:1:java.lang.String getFullyQualifiedId():42:42 -> a
-    1:1:java.lang.String getFullyQualifiedIdAndIncrement():29 -> a
-    2:2:java.lang.String getFullyQualifiedIdAndIncrement():30:30 -> a
-    1:1:int getPrimaryId():46:46 -> b
-com.android.tools.r8.ir.conversion.MethodProcessingId$1 -> com.android.tools.r8.ir.conversion.p$a:
-com.android.tools.r8.ir.conversion.MethodProcessingId$Factory -> com.android.tools.r8.ir.conversion.p$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.l$a:
+com.android.tools.r8.ir.conversion.MethodProcessingId$Factory -> com.android.tools.r8.ir.conversion.l$b:
     java.util.function.BiConsumer consumer -> a
     int nextId -> b
     1:1:void <init>():55:55 -> <init>
@@ -36874,7 +36832,7 @@
     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.q:
+com.android.tools.r8.ir.conversion.MethodProcessingId$Factory$ReservedMethodProcessingIds -> com.android.tools.r8.ir.conversion.m:
     com.android.tools.r8.ir.conversion.MethodProcessingId$Factory this$0 -> e
     com.android.tools.r8.utils.collections.ProgramMethodSet seen -> d
     boolean $assertionsDisabled -> a
@@ -36884,52 +36842,58 @@
     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.r:
+com.android.tools.r8.ir.conversion.MethodProcessor -> com.android.tools.r8.ir.conversion.n:
     com.android.tools.r8.utils.collections.SortedProgramMethodSet waveExtension -> b
     com.android.tools.r8.utils.collections.SortedProgramMethodSet wave -> a
-    1:4:void <init>():9:12 -> <init>
-    1:1:boolean isProcessedConcurrently(com.android.tools.r8.graph.ProgramMethod):25:25 -> a
-    2:2:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():29:29 -> a
-    2:2:com.android.tools.r8.ir.conversion.CallSiteInformation getCallSiteInformation():21 -> a
-    boolean isPrimaryMethodProcessor() -> b
-    1:1:void scheduleMethodForProcessingAfterCurrentWave(com.android.tools.r8.graph.ProgramMethod):29:29 -> b
+    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:5:void prepareForWaveExtensionProcessing():33:37 -> c
-com.android.tools.r8.ir.conversion.NeedsIRDesugarUseRegistry -> com.android.tools.r8.ir.conversion.s:
+    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.n$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>():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.o:
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter interfaceMethodRewriter -> g
     com.android.tools.r8.graph.AppView appView -> d
     com.android.tools.r8.ir.desugar.BackportedMethodRewriter backportedMethodRewriter -> e
     com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter desugaredLibraryRetargeter -> f
-    boolean needsDesugaring -> c
+    boolean needsDesugarging -> c
     com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter desugaredLibraryAPIConverter -> h
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.BackportedMethodRewriter,com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter):41:41 -> <init>
-    2:20:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.BackportedMethodRewriter,com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter):28:46 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.BackportedMethodRewriter,com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter):34:34 -> <init>
+    2:20:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.BackportedMethodRewriter,com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter):21:39 -> <init>
     void registerInstanceFieldRead(com.android.tools.r8.graph.DexField) -> a
-    1:1:boolean needsDesugaring():50:50 -> a
-    2:4:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):72:74 -> a
-    5:8:void registerInterfaceMethodRewriting(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):91:94 -> a
-    9:11:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod,boolean):133:135 -> a
-    12:13:void registerCallSite(com.android.tools.r8.graph.DexCallSite):140:141 -> a
-    1:4:void registerLibraryRetargeting(com.android.tools.r8.graph.DexMethod,boolean):107:110 -> b
-    5:7:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):125:127 -> b
+    1:1:boolean needsDesugaring():43:43 -> a
+    2:4:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):65:67 -> a
+    5:7:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod,boolean):121:123 -> a
+    8:9:void registerCallSite(com.android.tools.r8.graph.DexCallSite):128:129 -> a
+    1:4:void registerInterfaceMethodRewriting(com.android.tools.r8.graph.DexMethod,boolean):77:80 -> b
+    5:7:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):113:115 -> b
     void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField) -> c
-    1:4:void registerInitClass(com.android.tools.r8.graph.DexType):55:58 -> c
-    5:7:void registerTwrCloseResourceRewriting(com.android.tools.r8.graph.DexMethod):78:80 -> c
-    5:7:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):116 -> c
-    8:9:void registerBackportedMethodRewriting(com.android.tools.r8.graph.DexMethod):85:86 -> c
-    8:9:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):117 -> c
-    10:12:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):118:120 -> c
+    1:4:void registerInitClass(com.android.tools.r8.graph.DexType):48:51 -> c
+    5:8:void registerLibraryRetargeting(com.android.tools.r8.graph.DexMethod,boolean):93:96 -> c
+    9:10:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):102:103 -> c
+    11:12:void registerBackportedMethodRewriting(com.android.tools.r8.graph.DexMethod):71:72 -> c
+    11:12:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):105 -> c
+    13:15:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):106:108 -> c
     void registerInstanceOf(com.android.tools.r8.graph.DexType) -> d
-    1:3:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):146:148 -> d
+    1:3:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):134:136 -> 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):85:86 -> e
-    1:2:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):64 -> e
-    3:5:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):65:67 -> 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 registerTypeReference(com.android.tools.r8.graph.DexType) -> f
-    1:4:void registerDesugaredLibraryAPIConverter(com.android.tools.r8.graph.DexMethod):99:102 -> f
+    1:4:void registerDesugaredLibraryAPIConverter(com.android.tools.r8.graph.DexMethod):85:88 -> f
     void registerStaticFieldWrite(com.android.tools.r8.graph.DexField) -> g
-com.android.tools.r8.ir.conversion.OneTimeMethodProcessor -> com.android.tools.r8.ir.conversion.t:
+com.android.tools.r8.ir.conversion.OneTimeMethodProcessor -> com.android.tools.r8.ir.conversion.p:
     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
@@ -36947,11 +36911,12 @@
     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 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):57:63 -> a
-    19:25:void forEachWaveWithExtension(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):71:77 -> 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):75:75 -> 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.u:
+com.android.tools.r8.ir.conversion.PartialCallGraphBuilder -> com.android.tools.r8.ir.conversion.q:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.utils.collections.ProgramMethodSet seeds -> g
     1:1:void <clinit>():14:14 -> <clinit>
@@ -36960,7 +36925,7 @@
     2:2:void populateGraph(java.util.concurrent.ExecutorService):26:26 -> a
     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.w:
+com.android.tools.r8.ir.conversion.PostMethodProcessor -> com.android.tools.r8.ir.conversion.s:
     java.util.Collection defaultCodeOptimizations -> e
     java.util.Deque waves -> g
     com.android.tools.r8.graph.AppView appView -> d
@@ -36971,44 +36936,44 @@
     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):36:36 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.AppView,java.util.Collection,java.util.Map,com.android.tools.r8.ir.conversion.CallGraph):48:48 -> <init>
     3:13:void <init>(com.android.tools.r8.graph.AppView,java.util.Collection,java.util.Map,com.android.tools.r8.ir.conversion.CallGraph):42:52 -> <init>
-    1:1:java.util.Deque createWaves(com.android.tools.r8.ir.conversion.CallGraph):147:147 -> a
+    1:1:java.util.Deque createWaves(com.android.tools.r8.ir.conversion.CallGraph):154:154 -> a
     2:2:boolean com.android.tools.r8.ir.conversion.CallGraph.isEmpty():276:276 -> a
-    2:2:java.util.Deque createWaves(com.android.tools.r8.ir.conversion.CallGraph):149 -> a
-    3:6:java.util.Deque createWaves(com.android.tools.r8.ir.conversion.CallGraph):150:153 -> a
-    7:26:void forEachWaveWithExtension(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):171:190 -> a
-    27:31:void lambda$forEachWaveWithExtension$1(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessingId$Factory$ReservedMethodProcessingIds,com.android.tools.r8.graph.ProgramMethod,int):181:185 -> 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):201:212 -> a
-    32:43:void lambda$forEachWaveWithExtension$1(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessingId$Factory$ReservedMethodProcessingIds,com.android.tools.r8.graph.ProgramMethod,int):184 -> a
-    1:2:boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod):57:58 -> c
-    3:8:void prepareForWaveExtensionProcessing():161:166 -> c
-    1:2:void lambda$prepareForWaveExtensionProcessing$0(com.android.tools.r8.graph.ProgramMethod):163:164 -> d
-com.android.tools.r8.ir.conversion.PostMethodProcessor$1 -> com.android.tools.r8.ir.conversion.v:
-com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder -> com.android.tools.r8.ir.conversion.w$a:
+    2:2:java.util.Deque createWaves(com.android.tools.r8.ir.conversion.CallGraph):156 -> a
+    3:6:java.util.Deque createWaves(com.android.tools.r8.ir.conversion.CallGraph):157:160 -> a
+    7:26:void forEachWaveWithExtension(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):174:193 -> 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):184:188 -> 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):204:215 -> 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):187 -> a
+    1:1:com.android.tools.r8.ir.conversion.MethodProcessor$Phase getPhase():57:57 -> b
+    2:3:void scheduleMethodForProcessingAfterCurrentWave(com.android.tools.r8.graph.ProgramMethod):168:169 -> b
+    1:2:boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod):62:63 -> c
+com.android.tools.r8.ir.conversion.PostMethodProcessor$1 -> com.android.tools.r8.ir.conversion.r:
+com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder -> com.android.tools.r8.ir.conversion.s$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):69:69 -> <init>
-    2:7:void <init>(java.util.Collection):65:70 -> <init>
-    1:9:void put(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.Collection):75:83 -> a
-    10:14:void put(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.Collection):82:86 -> a
-    15:15:java.util.Collection lambda$put$0(com.android.tools.r8.graph.DexMethod):85:85 -> a
-    16:16:void put(com.android.tools.r8.utils.collections.ProgramMethodSet):91:91 -> a
-    17:21:void put(com.android.tools.r8.ir.conversion.PostOptimization):96:100 -> a
-    22:29:void rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):107:114 -> a
-    30:30:void lambda$rewrittenWithLens$1(java.util.Map,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexMethod,java.util.Collection):112:112 -> a
-    31:31:void lambda$rewrittenWithLens$1(java.util.Map,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexMethod,java.util.Collection):111:111 -> a
-    32:35:com.android.tools.r8.ir.conversion.PostMethodProcessor build(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):120:123 -> a
-    36:36:void put(com.android.tools.r8.utils.collections.ProgramMethodSet):91:91 -> a
-    36:36:com.android.tools.r8.ir.conversion.PostMethodProcessor build(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):131 -> a
-    37:45:com.android.tools.r8.ir.conversion.PostMethodProcessor build(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):133:141 -> a
-    46:46:void lambda$build$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexMethod):125:125 -> a
-    47:47:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
-    47:47:void lambda$build$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexMethod):125 -> a
-    48:51:void lambda$build$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexMethod):125:128 -> a
-com.android.tools.r8.ir.conversion.PostOptimization -> com.android.tools.r8.internal.rv:
+    1:1:void <init>(java.util.Collection):74:74 -> <init>
+    2:7:void <init>(java.util.Collection):70:75 -> <init>
+    1:9:void put(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.Collection):80:88 -> a
+    10:14:void put(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.Collection):87:91 -> a
+    15:15:java.util.Collection lambda$put$0(com.android.tools.r8.graph.DexEncodedMethod):90:90 -> a
+    16:16:void put(com.android.tools.r8.utils.collections.ProgramMethodSet):96:96 -> a
+    17:21:void put(com.android.tools.r8.ir.conversion.PostOptimization):101:105 -> a
+    22:31:void rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):112:121 -> a
+    32:32: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):118:118 -> a
+    33:33: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):117:117 -> a
+    34:37:com.android.tools.r8.ir.conversion.PostMethodProcessor build(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):127:130 -> a
+    38:38:void put(com.android.tools.r8.utils.collections.ProgramMethodSet):96:96 -> a
+    38:38: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
+    39:47: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
+    48:48:void lambda$build$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexMethod):132:132 -> a
+    49:49:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
+    49:49: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
+    50:53: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
+com.android.tools.r8.ir.conversion.PostOptimization -> com.android.tools.r8.internal.ku:
     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.x:
+com.android.tools.r8.ir.conversion.PrimaryMethodProcessor -> com.android.tools.r8.ir.conversion.t:
     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
@@ -37024,14 +36989,14 @@
     6:27: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
     28:29: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
     30:31: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
-    32:33:int com.android.tools.r8.utils.ThreadUtils.getNumberOfThreads(java.util.concurrent.ExecutorService):186:187 -> a
+    32:33:int com.android.tools.r8.utils.ThreadUtils.getNumberOfThreads(java.util.concurrent.ExecutorService):180:181 -> a
     32:33: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
     34:57: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
-    boolean isPrimaryMethodProcessor() -> b
+    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.x$a:
+com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveStartAction -> com.android.tools.r8.ir.conversion.t$a:
     void notifyWaveStart(com.android.tools.r8.utils.collections.ProgramMethodSet) -> a
-com.android.tools.r8.ir.conversion.SourceCode -> com.android.tools.r8.internal.zC:
+com.android.tools.r8.ir.conversion.SourceCode -> com.android.tools.r8.internal.kB:
     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 buildPostlude(com.android.tools.r8.ir.conversion.IRBuilder) -> a
@@ -37055,11 +37020,9 @@
     int instructionOffset(int) -> e
     boolean verifyRegister(int) -> f
     int instructionIndex(int) -> g
-com.android.tools.r8.ir.conversion.StringSwitchConverter -> com.android.tools.r8.internal.KD:
-    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.CD:
-com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping -> com.android.tools.r8.internal.ED:
+com.android.tools.r8.ir.conversion.StringSwitchConverter -> com.android.tools.r8.internal.yC:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$1 -> com.android.tools.r8.internal.qC:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping -> com.android.tools.r8.internal.sC:
     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
@@ -37070,7 +37033,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.DD:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping$Builder -> com.android.tools.r8.internal.rC:
     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
@@ -37090,7 +37053,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.GD:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo -> com.android.tools.r8.internal.uC:
     java.util.Map mapping -> c
     com.android.tools.r8.ir.code.Value value -> d
     com.android.tools.r8.ir.code.BasicBlock insertionBlock -> b
@@ -37102,7 +37065,7 @@
     31:31:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> 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):312 -> 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.FD:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo$Builder -> com.android.tools.r8.internal.tC:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():198:198 -> <clinit>
@@ -37119,7 +37082,7 @@
     21:21: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):615:615 -> a
     21:21:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo build(com.android.tools.r8.ir.code.BasicBlock):221 -> a
     22:46: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.ID:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping -> com.android.tools.r8.internal.wC:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap mapping -> d
     com.android.tools.r8.ir.code.Value stringHashValue -> c
     boolean $assertionsDisabled -> a
@@ -37130,7 +37093,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.HD:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping$Builder -> com.android.tools.r8.internal.vC:
     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
@@ -37183,7 +37146,7 @@
     28:30:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.startOfGotoChain():1506:1508 -> b
     28:30: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
     31:31: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.JD:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils -> com.android.tools.r8.internal.xC:
     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
@@ -37193,7 +37156,7 @@
     16:17:com.android.tools.r8.ir.code.Value getStringHashValueFromJump(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):793 -> a
     18:23:com.android.tools.r8.ir.code.Value getStringHashValueFromIf(com.android.tools.r8.ir.code.If,com.android.tools.r8.graph.DexItemFactory):799:804 -> a
     24:26:boolean isSameStringHashValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):830:832 -> a
-com.android.tools.r8.ir.conversion.StringSwitchRemover -> com.android.tools.r8.ir.conversion.C:
+com.android.tools.r8.ir.conversion.StringSwitchRemover -> com.android.tools.r8.ir.conversion.y:
     com.android.tools.r8.ir.analysis.type.ClassTypeElement stringType -> d
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.naming.IdentifierNameStringMarker identifierNameStringMarker -> c
@@ -37210,8 +37173,8 @@
     23:23:void run(com.android.tools.r8.ir.code.IRCode):87:87 -> b
     24:44:void run(com.android.tools.r8.ir.code.IRCode):83:103 -> b
     1:1:com.android.tools.r8.graph.AppView access$500(com.android.tools.r8.ir.conversion.StringSwitchRemover):48:48 -> c
-com.android.tools.r8.ir.conversion.StringSwitchRemover$1 -> com.android.tools.r8.ir.conversion.y:
-com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleEqualityBasedStringSwitchRemover -> com.android.tools.r8.ir.conversion.z:
+com.android.tools.r8.ir.conversion.StringSwitchRemover$1 -> com.android.tools.r8.ir.conversion.u:
+com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleEqualityBasedStringSwitchRemover -> com.android.tools.r8.ir.conversion.v:
     com.android.tools.r8.ir.code.BasicBlock fallthroughBlock -> h
     com.android.tools.r8.ir.code.BasicBlock block -> g
     com.android.tools.r8.ir.conversion.StringSwitchRemover this$0 -> j
@@ -37222,11 +37185,11 @@
     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:33:void removeStringSwitch():208:238 -> a
-    34:34:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1159:1159 -> a
+    34:34:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1154:1154 -> 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():1159:1159 -> a
+    44:44:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1154:1154 -> a
     44:44:void removeStringSwitch():248 -> a
     45:47:void removeStringSwitch():248:250 -> a
     48:59:void removeStringSwitch():247:258 -> a
@@ -37239,7 +37202,7 @@
     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):312 -> 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.A:
+com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleHashBasedStringSwitchRemover -> com.android.tools.r8.ir.conversion.w:
     com.android.tools.r8.ir.code.BasicBlock hashSwitchFallthroughBlock -> h
     com.android.tools.r8.ir.code.BasicBlock hashSwitchBlock -> g
     com.android.tools.r8.ir.conversion.StringSwitchRemover this$0 -> m
@@ -37254,7 +37217,7 @@
     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:21: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):1155:1155 -> a
+    21:21: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):1150:1150 -> a
     21:21:void removeStringSwitch():332 -> a
     22:33:void removeStringSwitch():333:344 -> a
     34:68:void createHashSwitchTargets(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value):409:443 -> a
@@ -37276,9 +37239,9 @@
     133:141:void removeStringSwitch():389 -> a
     142:144:void removeStringSwitch():390:392 -> a
     1:1:int getAndIncrementNextBlockNumber():299:299 -> b
-    2:2:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1159:1159 -> b
+    2:2:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1154:1154 -> b
     2:2:int getAndIncrementNextBlockNumber():299 -> b
-com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleStringSwitchRemover -> com.android.tools.r8.ir.conversion.B:
+com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleStringSwitchRemover -> com.android.tools.r8.ir.conversion.x:
     java.util.ListIterator blockIterator -> b
     java.util.Set newBlocksWithStrings -> c
     com.android.tools.r8.ir.code.Value stringValue -> e
@@ -37287,24 +37250,27 @@
     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.mE:
+com.android.tools.r8.ir.conversion.SwitchPayloadResolver -> com.android.tools.r8.internal.ZC:
     java.util.Map unresolvedPayload -> b
     java.util.Map payloadToData -> c
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():16:16 -> <clinit>
     1:17:void <init>():16:32 -> <init>
-    1:6:void addPayloadUser(com.android.tools.r8.code.Instruction):35:40 -> a
-    7:21:void resolve(com.android.tools.r8.code.SwitchPayload):45:59 -> a
-    22:22:int[] absoluteTargets(int):68:68 -> a
-    23:23:void clear():84:84 -> a
-    1:1:int[] getKeys(int):72:72 -> b
-com.android.tools.r8.ir.conversion.SwitchPayloadResolver$PayloadData -> com.android.tools.r8.internal.mE$a:
+    1:15:void resolve(com.android.tools.r8.code.SwitchPayload):45:59 -> a
+    16:17:int[] absoluteTargets(com.android.tools.r8.code.Instruction):63:64 -> a
+    18:18:int[] com.android.tools.r8.ir.conversion.SwitchPayloadResolver.absoluteTargets(int):68:68 -> a
+    18:18:int[] absoluteTargets(com.android.tools.r8.code.Instruction):64 -> a
+    19:19:int[] absoluteTargets(int):68:68 -> a
+    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.YC:
     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.zF:
+com.android.tools.r8.ir.conversion.TypeConstraintResolver -> com.android.tools.r8.internal.OE:
     com.android.tools.r8.ir.conversion.IRBuilder builder -> c
     java.util.Map unificationParents -> d
     com.android.tools.r8.graph.AppView appView -> b
@@ -37379,100 +37345,106 @@
     165:177:boolean verifyNoConstrainedUses(com.android.tools.r8.ir.code.Value,java.util.Set):216:228 -> a
     178:187:boolean verifyNoConstrainedUses(com.android.tools.r8.ir.code.Value,java.util.Set):226:235 -> a
     188:190:com.android.tools.r8.ir.code.Value canonical(com.android.tools.r8.ir.code.Value):273:275 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter -> com.android.tools.r8.internal.W1:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter -> com.android.tools.r8.internal.R1:
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Queue synthesizedMethods -> e
     com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RewritableMethods rewritableMethods -> c
     boolean $assertionsDisabled -> a
     boolean enabled -> d
-    1:1:void <clinit>():59:59 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):67:67 -> <init>
-    2:14:void <init>(com.android.tools.r8.graph.AppView):65:77 -> <init>
-    1:17:java.util.List generateListOfBackportedMethods(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):86:102 -> a
-    18:18:void registerAssumedLibraryTypes(com.android.tools.r8.utils.InternalOptions):109:109 -> a
+    1:1:void <clinit>():56:56 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):64:64 -> <init>
+    2:14:void <init>(com.android.tools.r8.graph.AppView):62:74 -> <init>
+    1:17:java.util.List generateListOfBackportedMethods(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):83:99 -> a
+    18:18:void registerAssumedLibraryTypes(com.android.tools.r8.utils.InternalOptions):106:106 -> a
     19:71:void com.android.tools.r8.ir.desugar.backports.BackportedMethods.registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):57:109 -> a
-    19:71:void registerAssumedLibraryTypes(com.android.tools.r8.utils.InternalOptions):109 -> a
-    72:72:boolean desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):113:113 -> a
-    73:84:boolean desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.Consumer):118:129 -> a
-    85:118:boolean desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.Consumer):125:158 -> a
-    119:121:java.lang.String lambda$desugar$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.IntBox):138:140 -> a
-    122:125:void processSynthesizedClasses(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):167:170 -> a
-    126:135:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):175:184 -> a
-    136:136:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():408:408 -> a
-    136:136:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):184 -> a
-    137:151:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):184:198 -> a
-    1:1:boolean needsDesugaring(com.android.tools.r8.graph.DexMethod):81:81 -> b
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$FullMethodInvokeRewriter -> com.android.tools.r8.internal.W1$a:
-    1:1:void <init>():1480:1480 -> <init>
-    1:1:com.android.tools.r8.cf.code.CfInstruction rewriteSingle(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):1484:1484 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$InvokeRewriter -> com.android.tools.r8.internal.W1$b:
+    19:71:void registerAssumedLibraryTypes(com.android.tools.r8.utils.InternalOptions):106 -> a
+    72:72:boolean desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):110:110 -> a
+    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():93:93 -> 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():1461:1461 -> a
+    85:85:com.android.tools.r8.position.MethodPosition com.android.tools.r8.graph.ProgramMethod.getPosition():93 -> 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():415:415 -> 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
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$FullMethodInvokeRewriter -> com.android.tools.r8.internal.R1$a:
+    1:1:void <init>():1467:1467 -> <init>
+    1:1:com.android.tools.r8.cf.code.CfInstruction rewriteSingle(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):1471:1471 -> a
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$InvokeRewriter -> com.android.tools.r8.internal.R1$b:
     com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriter -> b
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter):1371:1372 -> <init>
-    1:1:void rewriteInvoke(com.android.tools.r8.cf.code.CfInvoke,java.util.ListIterator,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.Consumer,java.util.function.Supplier):1383:1383 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator -> com.android.tools.r8.internal.W1$c:
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter):1361:1362 -> <init>
+    1:1:void rewriteInvoke(com.android.tools.r8.cf.code.CfInvoke,java.util.ListIterator,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.Consumer):1372:1372 -> a
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator -> com.android.tools.r8.internal.R1$c:
     com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory factory -> b
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory):1393:1393 -> <init>
-    2:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory,java.lang.String):1397:1398 -> <init>
-    1:4:void rewriteInvoke(com.android.tools.r8.cf.code.CfInvoke,java.util.ListIterator,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.Consumer,java.util.function.Supplier):1410:1413 -> a
-    5:9:com.android.tools.r8.graph.ProgramMethod getSyntheticMethod(com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier,com.android.tools.r8.graph.AppInfoWithClassHierarchy):1421:1425 -> a
-    10:10:com.android.tools.r8.graph.ProgramMethod getSyntheticMethod(com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier,com.android.tools.r8.graph.AppInfoWithClassHierarchy):1422:1422 -> a
-    11:13:void lambda$getSyntheticMethod$1(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1428:1430 -> a
-    14:14:com.android.tools.r8.graph.Code lambda$getSyntheticMethod$0(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexMethod):1431:1431 -> a
-    15:15:com.android.tools.r8.graph.Code com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator.generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1440:1440 -> a
-    15:15:com.android.tools.r8.graph.Code lambda$getSyntheticMethod$0(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexMethod):1431 -> a
-    16:16:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1436:1436 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter -> com.android.tools.r8.internal.W1$d:
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory):1382:1382 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory,java.lang.String):1386:1387 -> <init>
+    1:4:void rewriteInvoke(com.android.tools.r8.cf.code.CfInvoke,java.util.ListIterator,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.Consumer):1398:1401 -> a
+    5:8:com.android.tools.r8.graph.ProgramMethod getSyntheticMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):1407:1410 -> a
+    9:9:com.android.tools.r8.graph.ProgramMethod getSyntheticMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):1408:1408 -> a
+    10:12:void lambda$getSyntheticMethod$1(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1413:1415 -> a
+    13:17:void lambda$getSyntheticMethod$1(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1414:1418 -> a
+    18:18:com.android.tools.r8.graph.Code lambda$getSyntheticMethod$0(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexMethod):1419:1419 -> a
+    19:19:com.android.tools.r8.graph.Code com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator.generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1427:1427 -> a
+    19:19:com.android.tools.r8.graph.Code lambda$getSyntheticMethod$0(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexMethod):1419 -> a
+    20:20:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1423:1423 -> a
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter -> com.android.tools.r8.internal.R1$d:
     com.android.tools.r8.cf.code.CfInstruction rewriteSingle(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory) -> a
-    1:2:void rewrite(com.android.tools.r8.cf.code.CfInvoke,java.util.ListIterator,com.android.tools.r8.graph.DexItemFactory):1475:1476 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider -> com.android.tools.r8.internal.W1$e:
+    1:2:void rewrite(com.android.tools.r8.cf.code.CfInvoke,java.util.ListIterator,com.android.tools.r8.graph.DexItemFactory):1462:1463 -> a
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider -> com.android.tools.r8.internal.R1$e:
     com.android.tools.r8.graph.DexMethod method -> a
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod):1353:1354 -> <init>
-    void rewriteInvoke(com.android.tools.r8.cf.code.CfInvoke,java.util.ListIterator,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.Consumer,java.util.function.Supplier) -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RewritableMethods -> com.android.tools.r8.internal.W1$f:
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod):1344:1345 -> <init>
+    void rewriteInvoke(com.android.tools.r8.cf.code.CfInvoke,java.util.ListIterator,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.Consumer) -> a
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RewritableMethods -> com.android.tools.r8.internal.R1$f:
     java.util.Map rewritable -> c
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():203:203 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):210:210 -> <init>
-    2:44:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):208:250 -> <init>
-    1:1:boolean isEmpty():254:254 -> a
-    2:2:void visit(java.util.function.Consumer):258:258 -> a
-    3:133:void initializeAndroidKMethodProviders(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.AppView):263:393 -> a
-    134:134:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$0(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):964:964 -> a
-    135:156:void addProvider(com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider):1320:1341 -> a
-    157:157:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getProvider(com.android.tools.r8.graph.DexMethod):1345:1345 -> a
-    1:339:void initializeAndroidNMethodProviders(com.android.tools.r8.graph.DexItemFactory):399:737 -> b
-    340:340:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$1(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):985:985 -> b
+    1:1:void <clinit>():194:194 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):201:201 -> <init>
+    2:44:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):199:241 -> <init>
+    1:1:boolean isEmpty():245:245 -> a
+    2:2:void visit(java.util.function.Consumer):249:249 -> a
+    3:133:void initializeAndroidKMethodProviders(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.AppView):254:384 -> a
+    134:134:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$0(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):955:955 -> a
+    135:156:void addProvider(com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider):1311:1332 -> a
+    157:157:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getProvider(com.android.tools.r8.graph.DexMethod):1336:1336 -> a
+    1:339:void initializeAndroidNMethodProviders(com.android.tools.r8.graph.DexItemFactory):390:728 -> b
+    340:340:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$1(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):976:976 -> b
     1:6:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateMapOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):74:79 -> c
-    1:6:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1005 -> c
+    1:6:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):996 -> c
     7:40:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateMapOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):77:110 -> c
-    7:40:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1005 -> c
+    7:40:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):996 -> c
     41:41:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateMapOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):105:105 -> c
-    41:41:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1005 -> c
+    41:41:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):996 -> c
     42:60:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateMapOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):102:120 -> c
-    42:60:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1005 -> c
-    61:219:void initializeAndroidOMethodProviders(com.android.tools.r8.graph.DexItemFactory):744:902 -> c
-    1:48:void initializeAndroidRMethodProviders(com.android.tools.r8.graph.DexItemFactory):914:961 -> d
-    49:73:void initializeAndroidRMethodProviders(com.android.tools.r8.graph.DexItemFactory):958:982 -> d
-    74:97:void initializeAndroidRMethodProviders(com.android.tools.r8.graph.DexItemFactory):979:1002 -> d
-    98:116:void initializeAndroidRMethodProviders(com.android.tools.r8.graph.DexItemFactory):999:1017 -> d
-    1:29:void initializeJava10MethodProviders(com.android.tools.r8.graph.DexItemFactory):1086:1114 -> e
-    1:23:void initializeJava10OptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1255:1277 -> f
-    1:61:void initializeJava11MethodProviders(com.android.tools.r8.graph.DexItemFactory):1121:1181 -> g
-    1:20:void initializeJava11OptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1283:1302 -> h
-    1:60:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1022:1081 -> i
-    1:61:void initializeJava9OptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1188:1248 -> j
-    1:7:void initializeStreamMethodProviders(com.android.tools.r8.graph.DexItemFactory):1309:1315 -> k
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$StatifyingMethodGenerator -> com.android.tools.r8.internal.W1$g:
+    42:60:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):996 -> c
+    61:219:void initializeAndroidOMethodProviders(com.android.tools.r8.graph.DexItemFactory):735:893 -> c
+    1:48:void initializeAndroidRMethodProviders(com.android.tools.r8.graph.DexItemFactory):905:952 -> d
+    49:73:void initializeAndroidRMethodProviders(com.android.tools.r8.graph.DexItemFactory):949:973 -> d
+    74:97:void initializeAndroidRMethodProviders(com.android.tools.r8.graph.DexItemFactory):970:993 -> d
+    98:116:void initializeAndroidRMethodProviders(com.android.tools.r8.graph.DexItemFactory):990:1008 -> d
+    1:29:void initializeJava10MethodProviders(com.android.tools.r8.graph.DexItemFactory):1077:1105 -> e
+    1:23:void initializeJava10OptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1246:1268 -> f
+    1:61:void initializeJava11MethodProviders(com.android.tools.r8.graph.DexItemFactory):1112:1172 -> g
+    1:20:void initializeJava11OptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1274:1293 -> h
+    1:60:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1013:1072 -> i
+    1:61:void initializeJava9OptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1179:1239 -> j
+    1:7:void initializeStreamMethodProviders(com.android.tools.r8.graph.DexItemFactory):1300:1306 -> k
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$StatifyingMethodGenerator -> com.android.tools.r8.internal.R1$g:
     com.android.tools.r8.graph.DexType receiverType -> c
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory,java.lang.String,com.android.tools.r8.graph.DexType):1453:1454 -> <init>
-    1:1:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1459:1459 -> a
-    2:2:com.android.tools.r8.graph.DexProto com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator.getProto(com.android.tools.r8.graph.DexItemFactory):1436:1436 -> a
-    2:2:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1459 -> a
-    3:3:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1459:1459 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory -> com.android.tools.r8.internal.W1$h:
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory,java.lang.String,com.android.tools.r8.graph.DexType):1440:1441 -> <init>
+    1:1:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1446:1446 -> a
+    2:2:com.android.tools.r8.graph.DexProto com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator.getProto(com.android.tools.r8.graph.DexItemFactory):1423:1423 -> a
+    2:2:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1446 -> a
+    3:3:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1446:1446 -> a
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory -> com.android.tools.r8.internal.R1$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.H6:
+com.android.tools.r8.ir.desugar.ClassProcessor -> com.android.tools.r8.internal.s6:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.utils.MethodSignatureEquivalence equivalence -> f
@@ -37492,145 +37464,165 @@
     4:10:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures getDefaultMethods(com.android.tools.r8.graph.DexClass):383:389 -> a
     11:11:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures.create(java.util.Set):65:65 -> a
     11:11:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures getDefaultMethods(com.android.tools.r8.graph.DexClass):389 -> a
-    12:20:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.com.google.common.collect.ImmutableSet):427:435 -> a
+    12:18:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.com.google.common.collect.ImmutableSet):427:433 -> a
+    19:19:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    19:19:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.com.google.common.collect.ImmutableSet):433 -> a
+    20:20:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.com.google.common.collect.ImmutableSet):435:435 -> a
     21:21:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
     21:21:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.com.google.common.collect.ImmutableSet):435 -> a
     22:24:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.com.google.common.collect.ImmutableSet):435:435 -> a
-    26:46:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.com.google.common.collect.ImmutableSet):437:457 -> a
-    47:47:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getSuperType():658:658 -> a
-    47:47:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.com.google.common.collect.ImmutableSet):457 -> a
-    48:58:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.com.google.common.collect.ImmutableSet):457:467 -> a
-    59:82:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.com.google.common.collect.ImmutableSet):466:489 -> a
-    83:92:void lambda$duplicateEmulatedInterfaces$1(java.util.List,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):475:484 -> a
-    93:97:void lambda$duplicateEmulatedInterfaces$1(java.util.List,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):478:482 -> a
-    98:98:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    98:98:void lambda$duplicateEmulatedInterfaces$1(java.util.List,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):482 -> a
-    99:99:void lambda$duplicateEmulatedInterfaces$1(java.util.List,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):482:482 -> a
-    100:106: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):516:522 -> a
-    107:115:void com.android.tools.r8.ir.desugar.ClassProcessor.resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):541:549 -> a
-    107:115: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):520 -> a
-    116:116:boolean com.android.tools.r8.graph.ResolutionResult.isIncompatibleClassChangeErrorResult():0:0 -> a
-    116:116:void com.android.tools.r8.ir.desugar.ClassProcessor.resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):549 -> a
-    116:116: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):520 -> a
-    117:121:void com.android.tools.r8.ir.desugar.ClassProcessor.resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):550:554 -> a
-    117:121: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):520 -> a
-    122:122:void com.android.tools.r8.ir.desugar.ClassProcessor.resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):553:553 -> a
-    122:122: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):520 -> a
-    123:123:boolean com.android.tools.r8.ir.desugar.ClassProcessor.needsLibraryInfo():338:338 -> a
-    123:123:boolean com.android.tools.r8.ir.desugar.ClassProcessor.dontRewrite(com.android.tools.r8.graph.DexClassAndMethod):601 -> a
-    123:123:void com.android.tools.r8.ir.desugar.ClassProcessor.resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):559 -> a
-    123:123: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):520 -> a
-    124:124:boolean com.android.tools.r8.ir.desugar.ClassProcessor.dontRewrite(com.android.tools.r8.graph.DexClassAndMethod):602:602 -> a
-    124:124:void com.android.tools.r8.ir.desugar.ClassProcessor.resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):559 -> a
+    26:32:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.com.google.common.collect.ImmutableSet):437:443 -> a
+    33:33:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    33:33:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.com.google.common.collect.ImmutableSet):443 -> a
+    34:38:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.com.google.common.collect.ImmutableSet):447:451 -> a
+    39:39:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    39:39:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.com.google.common.collect.ImmutableSet):451 -> a
+    40:40:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.com.google.common.collect.ImmutableSet):453:453 -> a
+    41:41:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    41:41:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.com.google.common.collect.ImmutableSet):453 -> a
+    42:44:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.com.google.common.collect.ImmutableSet):455:457 -> a
+    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getSuperType():640:640 -> a
+    45:45:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.com.google.common.collect.ImmutableSet):457 -> a
+    46:46:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    46:46:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.com.google.common.collect.ImmutableSet):457 -> a
+    47:52:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.com.google.common.collect.ImmutableSet):462:467 -> a
+    53:76:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.com.google.common.collect.ImmutableSet):466:489 -> a
+    77:86:void lambda$duplicateEmulatedInterfaces$1(java.util.List,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):475:484 -> a
+    87:87:void lambda$duplicateEmulatedInterfaces$1(java.util.List,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):478:478 -> a
+    88:88:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexType.getDescriptor():83:83 -> a
+    88:88:void lambda$duplicateEmulatedInterfaces$1(java.util.List,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):480 -> a
+    89:91:void lambda$duplicateEmulatedInterfaces$1(java.util.List,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):480:482 -> a
+    92:92:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexType.getDescriptor():83:83 -> a
+    92:92:void lambda$duplicateEmulatedInterfaces$1(java.util.List,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):482 -> a
+    93:93:void lambda$duplicateEmulatedInterfaces$1(java.util.List,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):482:482 -> a
+    94:94:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    94:94:void lambda$duplicateEmulatedInterfaces$1(java.util.List,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):482 -> a
+    95:95:void lambda$duplicateEmulatedInterfaces$1(java.util.List,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):482:482 -> a
+    96:102: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):516:522 -> a
+    103:111:void com.android.tools.r8.ir.desugar.ClassProcessor.resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):541:549 -> a
+    103:111: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):520 -> a
+    112:112:boolean com.android.tools.r8.graph.ResolutionResult.isIncompatibleClassChangeErrorResult():0:0 -> a
+    112:112:void com.android.tools.r8.ir.desugar.ClassProcessor.resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):549 -> a
+    112:112: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):520 -> a
+    113:117:void com.android.tools.r8.ir.desugar.ClassProcessor.resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):550:554 -> a
+    113:117: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):520 -> a
+    118:118:void com.android.tools.r8.ir.desugar.ClassProcessor.resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):553:553 -> a
+    118:118: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):520 -> a
+    119:119:boolean com.android.tools.r8.ir.desugar.ClassProcessor.needsLibraryInfo():338:338 -> a
+    119:119:boolean com.android.tools.r8.ir.desugar.ClassProcessor.dontRewrite(com.android.tools.r8.graph.DexClassAndMethod):601 -> a
+    119:119:void com.android.tools.r8.ir.desugar.ClassProcessor.resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):559 -> a
+    119:119: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):520 -> a
+    120:120:boolean com.android.tools.r8.ir.desugar.ClassProcessor.dontRewrite(com.android.tools.r8.graph.DexClassAndMethod):602:602 -> a
+    120:120:void com.android.tools.r8.ir.desugar.ClassProcessor.resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):559 -> a
+    120:120: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):520 -> a
+    121:121:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    121:121:boolean com.android.tools.r8.ir.desugar.ClassProcessor.dontRewrite(com.android.tools.r8.graph.DexClassAndMethod):602 -> a
+    121:121:void com.android.tools.r8.ir.desugar.ClassProcessor.resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):559 -> a
+    121:121: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):520 -> a
+    122:123:boolean com.android.tools.r8.ir.desugar.ClassProcessor.dontRewrite(com.android.tools.r8.graph.DexClassAndMethod):602:603 -> a
+    122:123:void com.android.tools.r8.ir.desugar.ClassProcessor.resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):559 -> a
+    122:123: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):520 -> a
+    124:124:boolean com.android.tools.r8.graph.DexClassAndMethod.isDefaultMethod():31:31 -> a
+    124:124:void com.android.tools.r8.ir.desugar.ClassProcessor.resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):564 -> a
     124:124: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):520 -> a
-    125:125:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    125:125:boolean com.android.tools.r8.ir.desugar.ClassProcessor.dontRewrite(com.android.tools.r8.graph.DexClassAndMethod):602 -> a
-    125:125:void com.android.tools.r8.ir.desugar.ClassProcessor.resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):559 -> a
+    125:125:void com.android.tools.r8.ir.desugar.ClassProcessor.resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):565:565 -> a
     125:125: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):520 -> a
-    126:127:boolean com.android.tools.r8.ir.desugar.ClassProcessor.dontRewrite(com.android.tools.r8.graph.DexClassAndMethod):602:603 -> a
-    126: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.Consumer):559 -> a
-    126: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):520 -> a
-    128:128:boolean com.android.tools.r8.graph.DexClassAndMethod.isDefaultMethod():33:33 -> a
-    128:128:void com.android.tools.r8.ir.desugar.ClassProcessor.resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):564 -> a
-    128:128: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):520 -> a
-    129:129:void com.android.tools.r8.ir.desugar.ClassProcessor.resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):565:565 -> a
-    129:129: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):520 -> a
-    130:130:boolean com.android.tools.r8.graph.DexClassAndMethod.isLibraryMethod():0:0 -> a
-    130:130:void com.android.tools.r8.ir.desugar.ClassProcessor.resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):570 -> a
-    130:130: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):520 -> a
-    131:135:void com.android.tools.r8.ir.desugar.ClassProcessor.resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):570:574 -> a
-    131:135: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):520 -> a
-    136:136:boolean com.android.tools.r8.ir.desugar.ClassProcessor.isRetargetMethod(com.android.tools.r8.graph.LibraryMethod):594:594 -> a
-    136:136:void com.android.tools.r8.ir.desugar.ClassProcessor.resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):575 -> a
-    136:136: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):520 -> a
-    137:137:boolean com.android.tools.r8.ir.desugar.ClassProcessor.needsLibraryInfo():338:338 -> a
-    137:137:boolean com.android.tools.r8.ir.desugar.ClassProcessor.isRetargetMethod(com.android.tools.r8.graph.LibraryMethod):594 -> a
-    137:137:void com.android.tools.r8.ir.desugar.ClassProcessor.resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):575 -> a
-    137:137: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):520 -> a
-    138:141:boolean com.android.tools.r8.ir.desugar.ClassProcessor.isRetargetMethod(com.android.tools.r8.graph.LibraryMethod):594:597 -> a
-    138:141:void com.android.tools.r8.ir.desugar.ClassProcessor.resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):575 -> a
-    138:141: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):520 -> a
-    142:154:void com.android.tools.r8.ir.desugar.ClassProcessor.resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):576:588 -> a
-    142:154: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):520 -> a
-    155:156:void lambda$resolveForwardingMethods$2(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.DexClassAndMethod):524:525 -> a
-    157:180:void com.android.tools.r8.ir.desugar.ClassProcessor.addForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass):637:660 -> a
-    157:180:void lambda$resolveForwardingMethods$2(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.DexClassAndMethod):526 -> a
-    181:181:void com.android.tools.r8.ir.desugar.ClassProcessor.addForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass):643:643 -> a
-    181:181:void lambda$resolveForwardingMethods$2(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.DexClassAndMethod):526 -> a
-    182:182:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():650:650 -> a
-    182:182:void com.android.tools.r8.ir.desugar.ClassProcessor.addForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass):646 -> a
-    182:182:void lambda$resolveForwardingMethods$2(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.DexClassAndMethod):526 -> a
-    183:184:void com.android.tools.r8.ir.desugar.ClassProcessor.addForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass):646:647 -> a
-    183:184:void lambda$resolveForwardingMethods$2(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.DexClassAndMethod):526 -> a
-    185:187:void addSyntheticMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):609:611 -> a
-    188:188:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$addSyntheticMethod$3(com.android.tools.r8.graph.DexProgramClass):610:610 -> a
-    189:199:void addICCEThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):615:625 -> a
-    200:200: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):296:296 -> a
-    200:200: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):276 -> a
-    200:200:void addICCEThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):625 -> a
-    201:201:void addICCEThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):631:631 -> a
-    202:202:com.android.tools.r8.ir.conversion.SourceCode lambda$addICCEThrowingMethod$4(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):628:628 -> a
-    203:208:com.android.tools.r8.graph.DexClass definitionOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):667:672 -> a
-    209:210:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo visitClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):684:685 -> a
-    211:211:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    211:211:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo visitClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):685 -> a
-    212:214:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo visitClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):686:688 -> a
-    215:216:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):694:695 -> a
-    215:216:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$5(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):688 -> a
-    217:218:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.visitClassInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):679:680 -> a
-    217:218:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):695 -> a
-    217:218:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$5(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):688 -> a
-    219:223:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):696:700 -> a
-    219:223:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$5(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):688 -> a
-    224:224:boolean com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo.isEmpty():134:134 -> a
-    224:224:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):700 -> a
-    224:224:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$5(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):688 -> a
-    225:227:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):700:702 -> a
-    225:227:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$5(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):688 -> a
-    228:233:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo):402:407 -> a
-    228:233:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):704 -> a
-    228:233:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$5(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):688 -> a
-    234:241:boolean com.android.tools.r8.ir.desugar.ClassProcessor.shouldResolveForwardingMethodsForEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$EmulatedInterfaceInfo):496:503 -> a
-    234:241:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo):407 -> a
-    234:241:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):704 -> a
-    234:241:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$5(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):688 -> a
-    242:242:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    242:242:boolean com.android.tools.r8.ir.desugar.ClassProcessor.shouldResolveForwardingMethodsForEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$EmulatedInterfaceInfo):503 -> a
-    242:242:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo):407 -> a
-    242:242:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):704 -> a
-    242:242:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$5(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):688 -> a
-    243:244:boolean com.android.tools.r8.ir.desugar.ClassProcessor.shouldResolveForwardingMethodsForEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$EmulatedInterfaceInfo):503:504 -> a
-    243:244:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo):407 -> a
-    243:244:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):704 -> a
-    243:244:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$5(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):688 -> a
-    245:245:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo.emulatedInterfaceSignaturesToForward():182:182 -> a
-    245:245:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo):412 -> a
-    245:245:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):704 -> a
-    245:245:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$5(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):688 -> a
-    246:248:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures.withoutAll(com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):91:93 -> a
-    246:248:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo.emulatedInterfaceSignaturesToForward():182 -> a
-    246:248:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo):412 -> a
-    246:248:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):704 -> a
-    246:248:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$5(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):688 -> a
-    249:255:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo):409:415 -> a
-    249:255:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):704 -> a
-    249:255:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$5(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):688 -> a
-    256:258:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo.create(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):128:130 -> a
-    256:258:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo):415 -> a
-    256:258:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):704 -> a
-    256:258:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$5(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):688 -> a
-    259:259:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo):418:418 -> a
-    259:259:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):704 -> a
-    259:259:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$5(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):688 -> a
-    260:260:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo):417:417 -> a
-    260:260:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):704 -> a
-    260:260:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$5(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):688 -> a
-    261:263:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo.create(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):128:130 -> a
-    261:263:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo):417 -> a
-    261:263:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):704 -> a
-    261:263:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$5(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):688 -> a
-    264:268:com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo visitLibraryClassInfo(com.android.tools.r8.graph.DexType):709:713 -> a
-    269:272:com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):724:727 -> a
+    126:126:boolean com.android.tools.r8.graph.DexClassAndMethod.isLibraryMethod():0:0 -> a
+    126: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.Consumer):570 -> a
+    126: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):520 -> a
+    127:131:void com.android.tools.r8.ir.desugar.ClassProcessor.resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):570:574 -> a
+    127:131: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):520 -> a
+    132:132:boolean com.android.tools.r8.ir.desugar.ClassProcessor.isRetargetMethod(com.android.tools.r8.graph.LibraryMethod):594:594 -> a
+    132:132:void com.android.tools.r8.ir.desugar.ClassProcessor.resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):575 -> a
+    132:132: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):520 -> a
+    133:133:boolean com.android.tools.r8.ir.desugar.ClassProcessor.needsLibraryInfo():338:338 -> a
+    133:133:boolean com.android.tools.r8.ir.desugar.ClassProcessor.isRetargetMethod(com.android.tools.r8.graph.LibraryMethod):594 -> a
+    133:133:void com.android.tools.r8.ir.desugar.ClassProcessor.resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):575 -> a
+    133:133: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):520 -> a
+    134:137:boolean com.android.tools.r8.ir.desugar.ClassProcessor.isRetargetMethod(com.android.tools.r8.graph.LibraryMethod):594:597 -> a
+    134:137:void com.android.tools.r8.ir.desugar.ClassProcessor.resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):575 -> a
+    134:137: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):520 -> a
+    138:150:void com.android.tools.r8.ir.desugar.ClassProcessor.resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):576:588 -> a
+    138:150: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):520 -> a
+    151:152:void lambda$resolveForwardingMethods$2(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.DexClassAndMethod):524:525 -> a
+    153:176:void com.android.tools.r8.ir.desugar.ClassProcessor.addForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass):637:660 -> a
+    153:176:void lambda$resolveForwardingMethods$2(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.DexClassAndMethod):526 -> a
+    177:177:void com.android.tools.r8.ir.desugar.ClassProcessor.addForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass):643:643 -> a
+    177:177:void lambda$resolveForwardingMethods$2(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.DexClassAndMethod):526 -> a
+    178:178:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():632:632 -> a
+    178:178:void com.android.tools.r8.ir.desugar.ClassProcessor.addForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass):646 -> a
+    178:178:void lambda$resolveForwardingMethods$2(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.DexClassAndMethod):526 -> a
+    179:180:void com.android.tools.r8.ir.desugar.ClassProcessor.addForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass):646:647 -> a
+    179:180:void lambda$resolveForwardingMethods$2(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.DexClassAndMethod):526 -> a
+    181:183:void addSyntheticMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):609:611 -> a
+    184:184:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$addSyntheticMethod$3(com.android.tools.r8.graph.DexProgramClass):610:610 -> a
+    185:195:void addICCEThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):615:625 -> a
+    196:196: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):297:297 -> a
+    196:196: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):277 -> a
+    196:196:void addICCEThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):625 -> a
+    197:197:void addICCEThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):631:631 -> a
+    198:198:com.android.tools.r8.ir.conversion.SourceCode lambda$addICCEThrowingMethod$4(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):628:628 -> a
+    199:204:com.android.tools.r8.graph.DexClass definitionOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):667:672 -> a
+    205:206:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo visitClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):684:685 -> a
+    207:207:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    207:207:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo visitClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):685 -> a
+    208:210:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo visitClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):686:688 -> a
+    211:212:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):694:695 -> a
+    211:212:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$5(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):688 -> a
+    213:214:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.visitClassInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):679:680 -> a
+    213:214:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):695 -> a
+    213:214:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$5(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):688 -> a
+    215:219:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):696:700 -> a
+    215:219:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$5(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):688 -> a
+    220:220:boolean com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo.isEmpty():134:134 -> a
+    220:220:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):700 -> a
+    220:220:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$5(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):688 -> a
+    221:223:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):700:702 -> a
+    221:223:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$5(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):688 -> a
+    224:229:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo):402:407 -> a
+    224:229:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):704 -> a
+    224:229:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$5(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):688 -> a
+    230:237:boolean com.android.tools.r8.ir.desugar.ClassProcessor.shouldResolveForwardingMethodsForEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$EmulatedInterfaceInfo):496:503 -> a
+    230:237:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo):407 -> a
+    230:237:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):704 -> a
+    230:237:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$5(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):688 -> a
+    238:238:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    238:238:boolean com.android.tools.r8.ir.desugar.ClassProcessor.shouldResolveForwardingMethodsForEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$EmulatedInterfaceInfo):503 -> a
+    238:238:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo):407 -> a
+    238:238:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):704 -> a
+    238:238:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$5(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):688 -> a
+    239:240:boolean com.android.tools.r8.ir.desugar.ClassProcessor.shouldResolveForwardingMethodsForEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$EmulatedInterfaceInfo):503:504 -> a
+    239:240:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo):407 -> a
+    239:240:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):704 -> a
+    239:240:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$5(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):688 -> a
+    241:241:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo.emulatedInterfaceSignaturesToForward():182:182 -> a
+    241:241:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo):412 -> a
+    241:241:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):704 -> a
+    241:241:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$5(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):688 -> a
+    242:244:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures.withoutAll(com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):91:93 -> a
+    242:244:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo.emulatedInterfaceSignaturesToForward():182 -> a
+    242:244:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo):412 -> a
+    242:244:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):704 -> a
+    242:244:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$5(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):688 -> a
+    245:251:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo):409:415 -> a
+    245:251:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):704 -> a
+    245:251:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$5(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):688 -> a
+    252:254:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo.create(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):128:130 -> a
+    252:254:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo):415 -> a
+    252:254:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):704 -> a
+    252:254:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$5(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):688 -> a
+    255:255:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo):418:418 -> a
+    255:255:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):704 -> a
+    255:255:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$5(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):688 -> a
+    256:256:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo):417:417 -> a
+    256:256:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):704 -> a
+    256:256:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$5(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):688 -> a
+    257:259:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo.create(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):128:130 -> a
+    257:259:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo):417 -> a
+    257:259:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):704 -> a
+    257:259:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$5(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):688 -> a
+    260:264:com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo visitLibraryClassInfo(com.android.tools.r8.graph.DexType):709:713 -> a
+    265:268:com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):724:727 -> a
     1:1:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> b
     1:1:com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo visitInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):738 -> b
     2:5:com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo visitInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):738:741 -> b
@@ -37667,8 +37659,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):363:365 -> 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):752 -> b
     34:36:com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo lambda$visitInterfaceInfo$6(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):741 -> b
-com.android.tools.r8.ir.desugar.ClassProcessor$1 -> com.android.tools.r8.internal.A6:
-com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo -> com.android.tools.r8.internal.B6:
+com.android.tools.r8.ir.desugar.ClassProcessor$1 -> com.android.tools.r8.internal.l6:
+com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo -> com.android.tools.r8.internal.m6:
     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
@@ -37680,7 +37672,7 @@
     2:3:boolean isTargetedByForwards(com.android.tools.r8.graph.DexClassAndMethod):138 -> a
     4:8:boolean isTargetedByForwards(com.android.tools.r8.graph.DexClassAndMethod):138:142 -> a
     9:9:boolean lambda$isTargetedByForwards$0(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexEncodedMethod):141:141 -> a
-com.android.tools.r8.ir.desugar.ClassProcessor$EmulatedInterfaceInfo -> com.android.tools.r8.internal.C6:
+com.android.tools.r8.ir.desugar.ClassProcessor$EmulatedInterfaceInfo -> com.android.tools.r8.internal.n6:
     com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures signatures -> c
     boolean $assertionsDisabled -> b
     com.android.tools.r8.ir.desugar.ClassProcessor$EmulatedInterfaceInfo EMPTY -> a
@@ -37693,14 +37685,15 @@
     13:13:boolean com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures.isEmpty():87:87 -> a
     13:13:boolean isEmpty():242 -> a
     14:15:boolean isEmpty():242:243 -> a
-com.android.tools.r8.ir.desugar.ClassProcessor$LibraryReportingContext -> com.android.tools.r8.internal.D6:
+com.android.tools.r8.ir.desugar.ClassProcessor$LibraryReportingContext -> com.android.tools.r8.internal.o6:
     com.android.tools.r8.ir.desugar.ClassProcessor$LibraryReportingContext LIBRARY_CONTEXT -> c
     1:1:void <clinit>():278:278 -> <clinit>
     1:1:void <init>():281:281 -> <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 definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):291:291 -> a
-com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures -> com.android.tools.r8.internal.E6:
+    1:1:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):291 -> a
+com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures -> com.android.tools.r8.internal.p6:
     com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures EMPTY -> a
     java.util.Set signatures -> b
     1:1:void <clinit>():62:62 -> <clinit>
@@ -37710,14 +37703,14 @@
     2:2:boolean com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures.isEmpty():87:87 -> a
     2:2:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures merge(com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):78 -> a
     3:5:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures merge(com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):81:83 -> a
-com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext -> com.android.tools.r8.internal.F6:
+com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext -> com.android.tools.r8.internal.q6:
     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):253:255 -> <init>
     1:5:com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext forClass(com.android.tools.r8.graph.DexClass):259:263 -> a
     6:6:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):267:267 -> a
     7:7:void reportMissingType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter):271:271 -> a
-com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo -> com.android.tools.r8.internal.G6:
+com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo -> com.android.tools.r8.internal.r6:
     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
@@ -37732,7 +37725,7 @@
     14:14:boolean isEmpty():186 -> a
     15:15:boolean isEmpty():186:186 -> a
     16:20:com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo withEmulatedInterfaceInfo(com.android.tools.r8.ir.desugar.ClassProcessor$EmulatedInterfaceInfo):199:203 -> a
-com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer -> com.android.tools.r8.internal.F8:
+com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer -> com.android.tools.r8.internal.g8:
     com.android.tools.r8.graph.DexItemFactory factory -> d
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
@@ -37755,7 +37748,7 @@
     36:36:void updateClass(com.android.tools.r8.graph.DexClass,java.util.List,java.util.List):99 -> a
     37:41:void updateClass(com.android.tools.r8.graph.DexClass,java.util.List,java.util.List):98:102 -> a
     42:42:void buildCovariantReturnTypeMethodsForClass(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.List):112:112 -> a
-    43:43:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):249:249 -> a
+    43:43:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):199:199 -> a
     43:43:void buildCovariantReturnTypeMethodsForClass(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.List):112 -> a
     44:45:void lambda$buildCovariantReturnTypeMethodsForClass$1(java.util.List,java.util.List,com.android.tools.r8.graph.ProgramMethod):114:115 -> a
     46:46:void com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.buildCovariantReturnTypeMethodsForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.List):135:135 -> a
@@ -37773,8 +37766,8 @@
     84:84:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.keepIf(java.util.function.Predicate):181:181 -> a
     84:84:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):173 -> a
     85:87:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):173:175 -> 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):296:296 -> 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):276 -> 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):297:297 -> 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):277 -> a
     88:88:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):175 -> a
     89:90:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):178:179 -> a
     91:91:boolean lambda$buildCovariantReturnTypeMethod$2(com.android.tools.r8.graph.DexAnnotation):173:173 -> a
@@ -37809,19 +37802,63 @@
     178:178:boolean com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):264:264 -> a
     178:178: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.DefaultMethodsHelper -> com.android.tools.r8.internal.l9:
+com.android.tools.r8.ir.desugar.D8NestBasedAccessDesugaring -> com.android.tools.r8.internal.i8:
+    java.util.Map metNestHosts -> i
+    boolean $assertionsDisabled -> h
+    1:1:void <clinit>():44:44 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):51:51 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.AppView):48:48 -> <init>
+    1:1:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
+    1:1:boolean shouldProcessClassInNest(com.android.tools.r8.graph.DexClass,java.util.List):161 -> a
+    2:22:void rewriteNestBasedAccesses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):55:75 -> a
+    23:23:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
+    23:23:void rewriteNestBasedAccesses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):75 -> a
+    24:24:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    24:24:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89 -> a
+    24:24:void rewriteNestBasedAccesses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):75 -> a
+    25:36:void rewriteNestBasedAccesses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):76:87 -> a
+    37:37: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
+    37:37:void rewriteNestBasedAccesses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):87 -> a
+    38:42:void rewriteNestBasedAccesses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):86:90 -> a
+    43:52:void rewriteNestBasedAccesses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):89:98 -> a
+    53:53:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
+    53:53:void rewriteNestBasedAccesses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):98 -> a
+    54:54:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    54:54:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89 -> a
+    54:54:void rewriteNestBasedAccesses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):98 -> a
+    55:56:void rewriteNestBasedAccesses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):99:100 -> a
+    57:57:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
+    57:57:void rewriteNestBasedAccesses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):101 -> a
+    58:58:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    58:58:void rewriteNestBasedAccesses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):101 -> a
+    59:62:void rewriteNestBasedAccesses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):106:109 -> a
+    63:63:void rewriteNestBasedAccesses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):108:108 -> a
+    64:66:void rewriteNestBasedAccesses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):102:104 -> a
+    67:67:void rewriteNestBasedAccesses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):103:103 -> a
+    68:69:void addDeferredBridges(java.util.Collection):132:133 -> a
+    70:70:void desugarNestBasedAccess(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):149:149 -> a
+    71:75:void com.android.tools.r8.ir.desugar.D8NestBasedAccessDesugaring.processNestsConcurrently(java.util.concurrent.ExecutorService):118:122 -> a
+    71:75:void desugarNestBasedAccess(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):152 -> a
+    76:78:void com.android.tools.r8.ir.desugar.D8NestBasedAccessDesugaring.addDeferredBridges():126:128 -> a
+    76:78:void desugarNestBasedAccess(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):153 -> a
+    79:79:void desugarNestBasedAccess(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):154:154 -> a
+    80:84:void com.android.tools.r8.ir.desugar.D8NestBasedAccessDesugaring.optimizeDeferredBridgesConcurrently(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):139:143 -> a
+    80:84:void desugarNestBasedAccess(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):155 -> a
+    85:85: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.J8:
     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:6:void hideMatches(com.android.tools.r8.graph.DexMethod):65:68 -> a
-    7:7:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):217:217 -> a
+    7:7:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):212:212 -> a
     7:7:void hideMatches(com.android.tools.r8.graph.DexMethod):68 -> a
     8:9:void hideMatches(com.android.tools.r8.graph.DexMethod):69:70 -> a
     10:10:void addDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):76:76 -> a
     11:13: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.k9:
-com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection -> com.android.tools.r8.internal.l9$a:
+com.android.tools.r8.ir.desugar.DefaultMethodsHelper$1 -> com.android.tools.r8.internal.I8:
+com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection -> com.android.tools.r8.internal.J8$a:
     java.util.List live -> b
     com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection EMPTY -> a
     java.util.List hidden -> c
@@ -37831,7 +37868,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.A9:
+com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter -> com.android.tools.r8.internal.X8:
     com.android.tools.r8.graph.DexItemFactory factory -> d
     java.util.Set trackedCallBackAPIs -> i
     com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer wrapperSynthesizor -> f
@@ -37902,7 +37939,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():408:408 -> a
+    163:163:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():415:415 -> 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
@@ -37912,7 +37949,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():408:408 -> a
+    209:209:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():415:415 -> 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
@@ -37925,43 +37962,45 @@
     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:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> b
-    6:6:boolean shouldRewriteInvoke(com.android.tools.r8.graph.DexMethod):155 -> b
-    7:7:boolean shouldRewriteInvoke(com.android.tools.r8.graph.DexMethod):158:158 -> b
-    8:24:boolean overridesLibraryMethod(com.android.tools.r8.graph.ProgramMethod):198:214 -> b
-    25:25:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> b
-    25:25:boolean overridesLibraryMethod(com.android.tools.r8.graph.ProgramMethod):216 -> b
-    26:26:boolean overridesLibraryMethod(com.android.tools.r8.graph.ProgramMethod):216:216 -> b
-    27:27:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():408:408 -> b
-    27:27:boolean overridesLibraryMethod(com.android.tools.r8.graph.ProgramMethod):216 -> b
-    28:34:boolean com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter.shouldGenerateCallbacksForEmulateInterfaceAPIs(com.android.tools.r8.graph.DexClass):235:241 -> b
-    28:34:boolean overridesLibraryMethod(com.android.tools.r8.graph.ProgramMethod):219 -> b
-    35:38:boolean overridesLibraryMethod(com.android.tools.r8.graph.ProgramMethod):222:225 -> b
-    39:57:com.android.tools.r8.utils.collections.SortedProgramMethodSet generateCallbackMethods():313:331 -> b
+    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> 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):273:273 -> 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():415:415 -> 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
+    34:37:boolean overridesLibraryMethod(com.android.tools.r8.graph.ProgramMethod):222:225 -> b
+    38:56:com.android.tools.r8.utils.collections.SortedProgramMethodSet generateCallbackMethods():313:331 -> b
     1:2:void registerCallbackIfRequired(com.android.tools.r8.graph.ProgramMethod):162:163 -> c
     3:7:void com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter.registerCallback(com.android.tools.r8.graph.ProgramMethod):250:254 -> c
     3:7:void registerCallbackIfRequired(com.android.tools.r8.graph.ProgramMethod):163 -> c
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():408:408 -> c
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():415:415 -> c
     8:8:void com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter.registerCallback(com.android.tools.r8.graph.ProgramMethod):254 -> c
     8:8:void registerCallbackIfRequired(com.android.tools.r8.graph.ProgramMethod):163 -> c
     9:12:void com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter.registerCallback(com.android.tools.r8.graph.ProgramMethod):258:261 -> c
     9:12: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.getProto():388:388 -> d
+    8:8:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.proto():415:415 -> d
     8:8:boolean shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):181 -> d
-    9:9:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexMethod.getProto():62:62 -> d
-    9:9:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.getProto():388 -> d
-    9:9:boolean shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):181 -> d
-    10:19:boolean shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):181:190 -> d
-    20:20:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():408:408 -> d
-    20:20:boolean shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):190 -> d
-    21:21:boolean shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):193:193 -> d
-com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter$Mode -> com.android.tools.r8.internal.A9$a:
+    9:18:boolean shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):181:190 -> d
+    19:19:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():415:415 -> 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.X8$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.B9:
+com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration -> com.android.tools.r8.internal.Y8:
     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
@@ -38006,8 +38045,8 @@
     1:1:java.lang.String getSynthesizedLibraryClassesPackagePrefix():153:153 -> m
     1:1:java.util.Set getWrapperConversions():203:203 -> n
     1:1:boolean isLibraryCompilation():149:149 -> o
-com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$1 -> com.android.tools.r8.internal.B9$a:
-com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder -> com.android.tools.r8.internal.B9$b:
+com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$1 -> com.android.tools.r8.internal.Y8$a:
+com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder -> com.android.tools.r8.internal.Y8$b:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     java.lang.String synthesizedLibraryClassesPackagePrefix -> g
     java.util.List extraKeepRules -> q
@@ -38080,7 +38119,7 @@
     5:5:int sharpIndex(java.lang.String,java.lang.String):371 -> f
     6:6:int sharpIndex(java.lang.String,java.lang.String):371:371 -> f
     7:7:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):378:378 -> f
-com.android.tools.r8.ir.desugar.DesugaredLibraryConfigurationParser -> com.android.tools.r8.internal.C9:
+com.android.tools.r8.ir.desugar.DesugaredLibraryConfigurationParser -> com.android.tools.r8.internal.Z8:
     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
@@ -38117,240 +38156,250 @@
     126:140:void parseFlagsList(com.android.tools.r8.com.google.gson.JsonArray):174 -> a
     141:153:void com.android.tools.r8.ir.desugar.DesugaredLibraryConfigurationParser.parseFlags(com.android.tools.r8.com.google.gson.JsonObject):210:222 -> a
     141:153:void parseFlagsList(com.android.tools.r8.com.google.gson.JsonArray):174 -> a
-com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter -> com.android.tools.r8.internal.I9:
-    java.lang.String packageAndClassDescriptorPrefix -> f
+com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter -> com.android.tools.r8.internal.f9:
     java.util.Map retargetLibraryMember -> c
     java.util.Map nonFinalHolderRewrites -> d
     com.android.tools.r8.utils.collections.DexClassAndMethodSet emulatedDispatchMethods -> e
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():66:66 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):83:83 -> <init>
-    2:19:void <init>(com.android.tools.r8.graph.AppView):73:90 -> <init>
+    1:1:void <clinit>():65:65 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):79:79 -> <init>
+    2:15:void <init>(com.android.tools.r8.graph.AppView):71:84 -> <init>
     com.android.tools.r8.graph.DexApplication lambda$amendLibraryWithRetargetedMembers$0(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DexApplication) -> a
-    1:1:com.android.tools.r8.graph.AppView access$200(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter):66:66 -> a
-    2:7:boolean isRetargetType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):94:99 -> a
-    8:8:boolean isRetargetType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):98:98 -> a
-    9:24:void amendLibraryWithRetargetedMembers(com.android.tools.r8.graph.AppView):117:132 -> a
-    25:30:java.util.Map synthesizeLibraryClassesForRetargetedMembers(com.android.tools.r8.graph.AppView,java.util.Map):138:143 -> a
-    31:41:com.android.tools.r8.graph.DexLibraryClass lambda$synthesizeLibraryClassesForRetargetedMembers$1(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):149:159 -> a
-    42:42:java.util.List com.android.tools.r8.graph.NestMemberClassAttribute.emptyList():28:28 -> a
-    42:42:com.android.tools.r8.graph.DexLibraryClass lambda$synthesizeLibraryClassesForRetargetedMembers$1(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):159 -> a
-    43:44:com.android.tools.r8.graph.DexLibraryClass lambda$synthesizeLibraryClassesForRetargetedMembers$1(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):160:161 -> a
-    45:45:java.util.List com.android.tools.r8.graph.InnerClassAttribute.emptyList() -> a
-    45:45:com.android.tools.r8.graph.DexLibraryClass lambda$synthesizeLibraryClassesForRetargetedMembers$1(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):161 -> a
-    46:52:com.android.tools.r8.graph.DexLibraryClass lambda$synthesizeLibraryClassesForRetargetedMembers$1(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):162:168 -> a
-    53:58:java.util.Map synthesizedMembersForRetargetClasses(com.android.tools.r8.graph.AppView,java.util.Map,java.util.Map):179:184 -> a
-    59:66:void lambda$synthesizedMembersForRetargetClasses$4(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):186:193 -> a
-    67:67:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):283:283 -> a
-    67:67:void lambda$synthesizedMembersForRetargetClasses$4(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):193 -> a
-    68:68:void lambda$synthesizedMembersForRetargetClasses$4(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):194:194 -> a
-    69:71: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):274:274 -> a
-    69:71:void lambda$synthesizedMembersForRetargetClasses$4(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):195 -> a
-    72:83:void lambda$synthesizedMembersForRetargetClasses$4(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):197:208 -> a
-    84:84: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):276:276 -> a
-    84:84:void lambda$synthesizedMembersForRetargetClasses$4(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):208 -> a
-    85:85:void lambda$synthesizedMembersForRetargetClasses$4(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):201:201 -> a
-    86:86:boolean lambda$synthesizedMembersForRetargetClasses$2(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):192:192 -> a
-    87:87:java.util.Set lambda$synthesizedMembersForRetargetClasses$3(com.android.tools.r8.graph.DexLibraryClass):200:200 -> a
-    88:115:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.synthesizeClassWithUniqueMethod(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,java.lang.String,com.android.tools.r8.graph.AppView):233:260 -> a
-    88:115:void access$900(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,java.lang.String,com.android.tools.r8.graph.AppView):66 -> a
-    116:119:com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier getChecksumSupplier(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):264:267 -> a
-    120:120:long lambda$getChecksumSupplier$5(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):267:267 -> a
-    121:121:void visit(java.util.function.Consumer):272:272 -> a
-    122:122:void desugar(com.android.tools.r8.ir.code.IRCode):276:276 -> a
-    123:123:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1030:1030 -> a
-    123:123:void desugar(com.android.tools.r8.ir.code.IRCode):280 -> a
-    124:134:void desugar(com.android.tools.r8.ir.code.IRCode):281:291 -> a
-    135:135:boolean com.android.tools.r8.ir.code.Instruction.isInvokeSuper():0:0 -> a
-    135:135:void desugar(com.android.tools.r8.ir.code.IRCode):298 -> a
-    136:140:void desugar(com.android.tools.r8.ir.code.IRCode):298:302 -> a
-    141:141:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):552:552 -> a
-    141:141:void desugar(com.android.tools.r8.ir.code.IRCode):302 -> a
-    142:147:void desugar(com.android.tools.r8.ir.code.IRCode):304:309 -> a
-    148:148:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
-    148:148:void desugar(com.android.tools.r8.ir.code.IRCode):308 -> a
-    149:150:void desugar(com.android.tools.r8.ir.code.IRCode):315:316 -> a
-    151:151:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
-    151:151:void desugar(com.android.tools.r8.ir.code.IRCode):315 -> a
-    152:159:com.android.tools.r8.graph.DexMethod getRetargetedMethod(com.android.tools.r8.graph.DexMethod,boolean):321:328 -> a
-    160:161:com.android.tools.r8.graph.ResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveMethod(com.android.tools.r8.graph.DexMethod,boolean):599:600 -> a
-    160:161:com.android.tools.r8.graph.DexMethod getRetargetedMethod(com.android.tools.r8.graph.DexMethod,boolean):328 -> a
-    162:167:com.android.tools.r8.graph.DexMethod getRetargetedMethod(com.android.tools.r8.graph.DexMethod,boolean):329:334 -> a
-    168:174:com.android.tools.r8.graph.DexMethod getRetargetLibraryMember(com.android.tools.r8.graph.DexMethod):340:346 -> a
-    175:175:void synthesizeRetargetClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):478:478 -> a
-    176:176:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):676:676 -> a
-    176:176:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):66 -> a
-    177:177:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
-    177:177:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):680 -> a
-    177:177:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):66 -> a
-    178:181:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):684:687 -> a
-    178:181:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):66 -> a
-    182:182:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():650:650 -> a
-    182:182:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):689 -> a
-    182:182:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):66 -> a
-    183:183:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):689:689 -> a
-    183:183:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):66 -> a
-    184:184:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):688:688 -> a
-    184:184:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):66 -> a
-    185:185:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):684:684 -> a
-    185:185:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):66 -> a
-    186:186:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.dispatchHolderTypeFor(com.android.tools.r8.graph.DexClassAndMethod):701:701 -> a
-    186:186:com.android.tools.r8.graph.DexType access$400(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexClassAndMethod):66 -> a
-    187:188:java.lang.String getRetargetPackageAndClassPrefixDescriptor(com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration):706:707 -> a
-    189:192:com.android.tools.r8.graph.DexType dispatchTypeFor(com.android.tools.r8.graph.DexClassAndMethod,java.lang.String):713:716 -> a
-    193:193:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():43:43 -> a
-    193:193:com.android.tools.r8.graph.DexType dispatchTypeFor(com.android.tools.r8.graph.DexClassAndMethod,java.lang.String):718 -> a
-    194:198:com.android.tools.r8.graph.DexType dispatchTypeFor(com.android.tools.r8.graph.DexClassAndMethod,java.lang.String):718:722 -> a
-    1:1:java.util.Map access$300(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter):66:66 -> b
-    2:5:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppView):104:107 -> b
-    6:11:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.warnMissingRetargetCoreLibraryMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):218:223 -> b
-    6:11:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppView):109 -> b
-    12:17:boolean matchesNonFinalHolderRewrite(com.android.tools.r8.graph.DexMethod):350:355 -> b
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.dispatchInterfaceTypeFor(com.android.tools.r8.graph.DexClassAndMethod):697:697 -> b
-    18:18:com.android.tools.r8.graph.DexType access$700(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexClassAndMethod):66 -> b
-    1:1:java.util.Map access$500(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter):66:66 -> c
-    1:1:com.android.tools.r8.utils.collections.DexClassAndMethodSet access$600(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter):66:66 -> d
-com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$1 -> com.android.tools.r8.internal.F9:
-com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer -> com.android.tools.r8.internal.G9:
+    1:1:com.android.tools.r8.graph.AppView access$200(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter):65:65 -> a
+    2:17:void amendLibraryWithRetargetedMembers(com.android.tools.r8.graph.AppView):102:117 -> a
+    18:21:java.util.Map synthesizeLibraryClassesForRetargetedMembers(com.android.tools.r8.graph.AppView,java.util.Map):123:126 -> a
+    22:22:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    22:22:java.util.Map synthesizeLibraryClassesForRetargetedMembers(com.android.tools.r8.graph.AppView,java.util.Map):127 -> a
+    23:23:java.util.Map synthesizeLibraryClassesForRetargetedMembers(com.android.tools.r8.graph.AppView,java.util.Map):128:128 -> a
+    24:34:com.android.tools.r8.graph.DexLibraryClass lambda$synthesizeLibraryClassesForRetargetedMembers$1(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):134:144 -> a
+    35:35:java.util.List com.android.tools.r8.graph.NestMemberClassAttribute.emptyList():21:21 -> a
+    35:35:com.android.tools.r8.graph.DexLibraryClass lambda$synthesizeLibraryClassesForRetargetedMembers$1(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):144 -> a
+    36:37:com.android.tools.r8.graph.DexLibraryClass lambda$synthesizeLibraryClassesForRetargetedMembers$1(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):145:146 -> a
+    38:38:java.util.List com.android.tools.r8.graph.InnerClassAttribute.emptyList():45:45 -> a
+    38:38:com.android.tools.r8.graph.DexLibraryClass lambda$synthesizeLibraryClassesForRetargetedMembers$1(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):146 -> a
+    39:45:com.android.tools.r8.graph.DexLibraryClass lambda$synthesizeLibraryClassesForRetargetedMembers$1(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):147:153 -> a
+    46:51:java.util.Map synthesizedMembersForRetargetClasses(com.android.tools.r8.graph.AppView,java.util.Map,java.util.Map):164:169 -> a
+    52:52:boolean lambda$synthesizedMembersForRetargetClasses$2(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):177:177 -> a
+    53:53:java.util.Set lambda$synthesizedMembersForRetargetClasses$3(com.android.tools.r8.graph.DexLibraryClass):185:185 -> a
+    54:81:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.synthesizeClassWithUniqueMethod(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,java.lang.String,com.android.tools.r8.graph.AppView):218:245 -> a
+    54:81:void access$900(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,java.lang.String,com.android.tools.r8.graph.AppView):65 -> a
+    82:85:com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier getChecksumSupplier(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):249:252 -> a
+    86:86:long lambda$getChecksumSupplier$5(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):252:252 -> a
+    87:87:void visit(java.util.function.Consumer):257:257 -> a
+    88:88:void desugar(com.android.tools.r8.ir.code.IRCode):261:261 -> a
+    89:89:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1025:1025 -> a
+    89:89:void desugar(com.android.tools.r8.ir.code.IRCode):265 -> a
+    90:100:void desugar(com.android.tools.r8.ir.code.IRCode):266:276 -> a
+    101:101:boolean com.android.tools.r8.ir.code.Instruction.isInvokeSuper():0:0 -> a
+    101:101:void desugar(com.android.tools.r8.ir.code.IRCode):283 -> a
+    102:106:void desugar(com.android.tools.r8.ir.code.IRCode):283:287 -> a
+    107:107:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):502:502 -> a
+    107:107:void desugar(com.android.tools.r8.ir.code.IRCode):287 -> a
+    108:113:void desugar(com.android.tools.r8.ir.code.IRCode):289:294 -> a
+    114:114:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
+    114:114:void desugar(com.android.tools.r8.ir.code.IRCode):293 -> a
+    115:116:void desugar(com.android.tools.r8.ir.code.IRCode):300:301 -> a
+    117:117:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
+    117:117:void desugar(com.android.tools.r8.ir.code.IRCode):300 -> a
+    118:118:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    118:118:void lambda$synthesizedMembersForRetargetClasses$4(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):171 -> a
+    119:125:void lambda$synthesizedMembersForRetargetClasses$4(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):172:178 -> a
+    126:126:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):278:278 -> a
+    126:126:void lambda$synthesizedMembersForRetargetClasses$4(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):178 -> a
+    127:127:void lambda$synthesizedMembersForRetargetClasses$4(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:179 -> a
+    128:130: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
+    128:130:void lambda$synthesizedMembersForRetargetClasses$4(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):180 -> a
+    131:142:void lambda$synthesizedMembersForRetargetClasses$4(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):182:193 -> a
+    143:143: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):277:277 -> a
+    143:143:void lambda$synthesizedMembersForRetargetClasses$4(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):193 -> a
+    144:144:void lambda$synthesizedMembersForRetargetClasses$4(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):186:186 -> a
+    145:152:com.android.tools.r8.graph.DexMethod getRetargetedMethod(com.android.tools.r8.graph.DexMethod,boolean):306:313 -> a
+    153:154:com.android.tools.r8.graph.ResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveMethod(com.android.tools.r8.graph.DexMethod,boolean):549:550 -> a
+    153:154:com.android.tools.r8.graph.DexMethod getRetargetedMethod(com.android.tools.r8.graph.DexMethod,boolean):313 -> a
+    155:160:com.android.tools.r8.graph.DexMethod getRetargetedMethod(com.android.tools.r8.graph.DexMethod,boolean):314:319 -> a
+    161:167:com.android.tools.r8.graph.DexMethod getRetargetLibraryMember(com.android.tools.r8.graph.DexMethod):325:331 -> a
+    168:168:void synthesizeRetargetClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):445:445 -> a
+    169:169:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):643:643 -> a
+    169:169:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):65 -> a
+    170:170:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    170:170:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):643 -> a
+    170:170:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):65 -> a
+    171:171:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
+    171:171:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):647 -> a
+    171:171:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):65 -> a
+    172:175:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):651:654 -> a
+    172:175:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):65 -> a
+    176:176:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():632:632 -> a
+    176:176:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):656 -> a
+    176:176:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):65 -> a
+    177:177:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):656:656 -> a
+    177:177:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):65 -> a
+    178:178:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):655:655 -> a
+    178:178:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):65 -> a
+    179:179:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):651:651 -> a
+    179:179:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):65 -> a
+    180:180:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.dispatchHolderTypeFor(com.android.tools.r8.graph.DexClassAndMethod):668:668 -> a
+    180:180:com.android.tools.r8.graph.DexType access$400(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexClassAndMethod):65 -> a
+    181:189:com.android.tools.r8.graph.DexType dispatchTypeFor(com.android.tools.r8.graph.DexClassAndMethod,java.lang.String):672:680 -> a
+    190:190:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():43:43 -> a
+    190:190:com.android.tools.r8.graph.DexType dispatchTypeFor(com.android.tools.r8.graph.DexClassAndMethod,java.lang.String):682 -> a
+    191:195:com.android.tools.r8.graph.DexType dispatchTypeFor(com.android.tools.r8.graph.DexClassAndMethod,java.lang.String):682:686 -> a
+    1:1:java.util.Map access$300(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter):65:65 -> b
+    2:4:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppView):89:91 -> b
+    5:5:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> b
+    5:5:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppView):92 -> b
+    6:11:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.warnMissingRetargetCoreLibraryMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):203:208 -> b
+    6:11:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppView):94 -> b
+    12:17:boolean matchesNonFinalHolderRewrite(com.android.tools.r8.graph.DexMethod):335:340 -> b
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.dispatchInterfaceTypeFor(com.android.tools.r8.graph.DexClassAndMethod):664:664 -> b
+    18:18:com.android.tools.r8.graph.DexType access$700(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexClassAndMethod):65 -> b
+    1:1:java.util.Map access$500(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter):65:65 -> c
+    1:1:com.android.tools.r8.utils.collections.DexClassAndMethodSet access$600(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter):65:65 -> d
+com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$1 -> com.android.tools.r8.internal.c9:
+com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer -> com.android.tools.r8.internal.d9:
     com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter this$0 -> b
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():484:484 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter):484:484 -> <init>
-    1:1:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):489:489 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():408:408 -> a
-    2:2:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):489 -> a
-    3:3:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):583:583 -> a
-    3:3:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):490 -> a
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():408:408 -> a
-    4:4:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):583 -> a
-    4:4:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):490 -> a
-    5:19:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):583:597 -> a
-    5:19:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):490 -> a
-    20:27:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.generateInterfaceDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType):624:631 -> a
-    20:27:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):599 -> a
-    20:27:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):490 -> a
+    1:1:void <clinit>():451:451 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter):451:451 -> <init>
+    1:1:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):456:456 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():415:415 -> a
+    2:2:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):456 -> a
+    3:3:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):550:550 -> a
+    3:3:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):457 -> a
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():415:415 -> a
+    4:4:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):550 -> a
+    4:4:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):457 -> a
+    5:19:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):550:564 -> a
+    5:19:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):457 -> a
+    20:27:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.generateInterfaceDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType):591:598 -> a
+    20:27:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):566 -> a
+    20:27:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):457 -> a
     28:28:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():43:43 -> a
-    28:28:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.generateInterfaceDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType):632 -> a
-    28:28:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):599 -> a
-    28:28:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):490 -> a
-    29:38:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.generateInterfaceDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType):629:638 -> a
-    29:38:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):599 -> a
-    29:38:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):490 -> a
-    39:39: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):276:276 -> a
-    39:39:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.generateInterfaceDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType):638 -> a
-    39:39:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):599 -> a
-    39:39:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):490 -> a
-    40:47:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):600:600 -> a
-    40:47:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):490 -> a
-    55:56:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):608:609 -> a
-    55:56:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):490 -> a
-    57:65:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.generateHolderDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):654:662 -> a
-    57:65:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):610 -> a
-    57:65:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):490 -> a
+    28:28:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.generateInterfaceDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType):599 -> a
+    28:28:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):566 -> a
+    28:28:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):457 -> a
+    29:38:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.generateInterfaceDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType):596:605 -> a
+    29:38:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):566 -> a
+    29:38:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):457 -> a
+    39:39: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):277:277 -> a
+    39:39:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.generateInterfaceDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType):605 -> a
+    39:39:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):566 -> a
+    39:39:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):457 -> a
+    40:47:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):567:567 -> a
+    40:47:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):457 -> a
+    55:56:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):575:576 -> a
+    55:56:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):457 -> a
+    57:65:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.generateHolderDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):621:629 -> a
+    57:65:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):577 -> a
+    57:65:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):457 -> a
     66:66:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():43:43 -> a
-    66:66:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.generateHolderDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):663 -> a
-    66:66:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):610 -> a
-    66:66:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):490 -> a
-    67:74:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.generateHolderDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):663:670 -> a
-    67:74:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):610 -> a
-    67:74:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):490 -> a
-    75:75:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.generateHolderDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):664:664 -> a
-    75:75:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):610 -> a
-    75:75:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):490 -> a
-    76:83:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):611:611 -> a
-    76:83:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):490 -> a
-    84:84:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):492:492 -> a
-    85:85:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):498:498 -> a
-    86:86:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():408:408 -> a
-    86:86:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):498 -> a
-    87:87:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):498:498 -> a
+    66:66:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.generateHolderDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):630 -> a
+    66:66:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):577 -> a
+    66:66:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):457 -> a
+    67:74:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.generateHolderDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):630:637 -> a
+    67:74:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):577 -> a
+    67:74:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):457 -> a
+    75:75:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.generateHolderDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):631:631 -> a
+    75:75:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):577 -> a
+    75:75:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):457 -> a
+    76:83:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):578:578 -> a
+    76:83:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):457 -> a
+    84:84:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):459:459 -> a
+    85:85:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):465:465 -> a
+    86:86:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():415:415 -> a
+    86:86:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):465 -> a
+    87:87:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):465:465 -> a
     88:88:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():511:511 -> a
-    88:88:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):499 -> a
-    89:102:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):500:513 -> a
-    103:103:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    103:103:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):517 -> a
-    104:115:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):517:528 -> a
-    116:116: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):521:521 -> a
-    117:121:boolean com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.collections.DexClassAndMethodSet):534:538 -> a
-    117:121: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):521 -> a
-    122:122:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
-    122:122:boolean com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.collections.DexClassAndMethodSet):539 -> a
-    122:122: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):521 -> a
-    123:127:boolean com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.collections.DexClassAndMethodSet):542:546 -> a
-    123:127: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):521 -> a
-    128:128:boolean com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.collections.DexClassAndMethodSet):540:540 -> a
-    128:128: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):521 -> a
-    129:129: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):522:522 -> a
-    130:132:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.function.Consumer):559:561 -> a
-    130:132: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):522 -> a
-    133:135:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.function.Consumer):560:562 -> a
-    133:135: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):522 -> a
-    136:140:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.createForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass):575:579 -> a
-    136:140:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.function.Consumer):563 -> a
-    136:140: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):522 -> a
-    141:141:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.createForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass):578:578 -> a
-    141:141:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.function.Consumer):563 -> a
-    141: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):522 -> a
-    142:143:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.function.Consumer):564:565 -> a
-    142:143: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):522 -> a
-    144:144:void lambda$addInterfacesAndForwardingMethods$0(com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):523:523 -> a
-com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup -> com.android.tools.r8.internal.H9:
+    88:88:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):466 -> a
+    89:102:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):467:480 -> a
+    103:103:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    103:103:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):480 -> a
+    104:104:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    104:104:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):484 -> a
+    105:116:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):484:495 -> a
+    117:117: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):488:488 -> a
+    118:122:boolean com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.collections.DexClassAndMethodSet):501:505 -> a
+    118:122: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):488 -> a
+    123:123:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    123:123:boolean com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.collections.DexClassAndMethodSet):505 -> a
+    123:123: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):488 -> a
+    124:124:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
+    124:124:boolean com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.collections.DexClassAndMethodSet):506 -> a
+    124:124: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):488 -> a
+    125:129:boolean com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.collections.DexClassAndMethodSet):509:513 -> a
+    125:129: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):488 -> a
+    130:130:boolean com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.collections.DexClassAndMethodSet):507:507 -> a
+    130:130: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):488 -> a
+    131:131: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):489:489 -> a
+    132:134:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.function.Consumer):526:528 -> a
+    132:134: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):489 -> a
+    135:137:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.function.Consumer):527:529 -> a
+    135:137: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):489 -> a
+    138:142:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.createForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass):542:546 -> a
+    138:142:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.function.Consumer):530 -> a
+    138:142: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):489 -> a
+    143:143:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.createForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass):545:545 -> a
+    143:143:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.function.Consumer):530 -> a
+    143:143: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):489 -> a
+    144:145:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.function.Consumer):531:532 -> a
+    144:145: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):489 -> a
+    146:146:void lambda$addInterfacesAndForwardingMethods$0(com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):490:490 -> a
+com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup -> com.android.tools.r8.internal.e9:
     com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter this$0 -> b
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():362:362 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter):362:362 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$1):362:362 -> <init>
-    1:12:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():365:376 -> a
-    1:12:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):362 -> a
-    13:13:boolean com.android.tools.r8.graph.DexClass.isFinal():575:575 -> a
-    13:13:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():377 -> a
-    13:13:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):362 -> a
-    14:14:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():378:378 -> a
-    14:14:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):362 -> a
-    15:15:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():43:43 -> a
-    15:15:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():378 -> a
-    15:15:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):362 -> a
-    16:17:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():378:379 -> a
-    16:17:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):362 -> a
-    18:18:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():43:43 -> a
-    18:18:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():379 -> a
-    18:18:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):362 -> a
-    19:27:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():379:387 -> a
-    19:27:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):362 -> a
-    28:29:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.handleEmulateDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClassAndMethod):464:465 -> a
-    28:29:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():387 -> a
-    28:29:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):362 -> a
-    30:30:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():408:408 -> a
-    30:30:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.handleEmulateDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClassAndMethod):465 -> a
-    30:30:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():387 -> a
-    30:30:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):362 -> a
-    31:34:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.handleEmulateDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClassAndMethod):467:470 -> a
-    31:34:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():387 -> a
-    31:34:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):362 -> a
-    35:39:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():388:392 -> a
-    35:39:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):362 -> a
-    40:44:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.computeRetargetMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType):447:451 -> a
-    40:44:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():392 -> a
-    40:44:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):362 -> a
-    45:45:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():43:43 -> a
-    45:45:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.computeRetargetMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType):452 -> a
-    45:45:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():392 -> a
-    45:45:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):362 -> a
-    46:46:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.computeRetargetMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType):452:452 -> a
-    46:46:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():392 -> a
-    46:46:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):362 -> a
-    47:62:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():392:407 -> a
-    47:62:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):362 -> a
-    63:67:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():406:410 -> a
-    63:67:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):362 -> a
-    68:70:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():409:411 -> a
-    68:70:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):362 -> a
-    71:89:boolean isEmulatedInterfaceDispatch(com.android.tools.r8.graph.DexClassAndMethod):417:435 -> a
-    90:92:void lambda$isEmulatedInterfaceDispatch$0(com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexType):437:439 -> a
-    93:96:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):456:459 -> a
-    97:97:boolean lambda$findMethodsWithName$1(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):458:458 -> a
-com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer -> com.android.tools.r8.internal.J9:
+    1:1:void <clinit>():347:347 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter):347:347 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$1):347:347 -> <init>
+    1:5:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():350:354 -> a
+    1:5:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):347 -> a
+    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    6:6:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():354 -> a
+    6:6:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):347 -> a
+    7:12:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():356:361 -> a
+    7:12:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):347 -> a
+    13:13:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():43:43 -> a
+    13:13:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():361 -> a
+    13:13:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):347 -> a
+    14:15:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():361:362 -> a
+    14:15:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):347 -> a
+    16:16:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():43:43 -> a
+    16:16:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():362 -> a
+    16:16:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):347 -> a
+    17:25:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():362:370 -> a
+    17:25:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):347 -> a
+    26:27:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.handleEmulateDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClassAndMethod):431:432 -> a
+    26:27:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():370 -> a
+    26:27:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):347 -> a
+    28:28:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():415:415 -> a
+    28:28:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.handleEmulateDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClassAndMethod):432 -> a
+    28:28:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():370 -> a
+    28:28:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):347 -> a
+    29:32:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.handleEmulateDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClassAndMethod):434:437 -> a
+    29:32:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():370 -> a
+    29:32:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):347 -> a
+    33:37:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():371:375 -> a
+    33:37:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):347 -> a
+    38:42:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.computeRetargetMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType):414:418 -> a
+    38:42:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():375 -> a
+    38:42:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):347 -> a
+    43:43:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName() -> a
+    43:43:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.computeRetargetMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType):419 -> a
+    43:43:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():375 -> a
+    43:43:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):347 -> a
+    44:44:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.computeRetargetMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType):419:419 -> a
+    44:44:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():375 -> a
+    44:44:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):347 -> a
+    45:45:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():375:375 -> a
+    45:45:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):347 -> a
+    46:64:boolean isEmulatedInterfaceDispatch(com.android.tools.r8.graph.DexClassAndMethod):384:402 -> a
+    65:65:void lambda$isEmulatedInterfaceDispatch$0(com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexType):404:404 -> a
+    66:66:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    66:66:void lambda$isEmulatedInterfaceDispatch$0(com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexType):404 -> a
+    67:67:void lambda$isEmulatedInterfaceDispatch$0(com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexType):406:406 -> a
+    68:71:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):423:426 -> a
+    72:72:boolean lambda$findMethodsWithName$1(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):425:425 -> a
+com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer -> com.android.tools.r8.internal.g9:
     java.util.Set invalidWrappers -> g
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.graph.DexString dexWrapperPrefixDexString -> d
@@ -38371,163 +38420,189 @@
     6:6: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
     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):156:156 -> 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):166 -> a
-    10: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):167:168 -> 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):168 -> a
-    13:13:com.android.tools.r8.graph.DexType lambda$getWrapper$0(com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):167:167 -> a
-    14:32:com.android.tools.r8.graph.DexClass synthesizeWrapper(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedField):221:239 -> a
-    33:36:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.synthesizeConstructor(com.android.tools.r8.graph.DexField):442:445 -> a
-    33:36:com.android.tools.r8.graph.DexClass synthesizeWrapper(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedField):242 -> a
-    37:45:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.synthesizeConstructor(com.android.tools.r8.graph.DexField):443:451 -> a
-    37:45:com.android.tools.r8.graph.DexClass synthesizeWrapper(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedField):242 -> a
-    46:52:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,int,boolean,com.android.tools.r8.graph.Code):456:462 -> a
-    46:52:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.synthesizeConstructor(com.android.tools.r8.graph.DexField):447 -> a
-    46:52:com.android.tools.r8.graph.DexClass synthesizeWrapper(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedField):242 -> a
-    53:53: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):296:296 -> a
-    53:53: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):276 -> a
-    53:53:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,int,boolean,com.android.tools.r8.graph.Code):462 -> a
-    53:53:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.synthesizeConstructor(com.android.tools.r8.graph.DexField):447 -> a
-    53:53:com.android.tools.r8.graph.DexClass synthesizeWrapper(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedField):242 -> a
-    54:56:com.android.tools.r8.graph.DexClass synthesizeWrapper(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedField):242:244 -> a
-    57:57:com.android.tools.r8.graph.DexClass synthesizeWrapper(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedField):225:225 -> a
-    58:58:java.lang.String lambda$reportFinalMethodsInWrapper$1(com.android.tools.r8.graph.DexMethod):354:354 -> a
-    59:59:java.lang.String[] lambda$reportFinalMethodsInWrapper$2(int):354:354 -> a
-    60:69:void reportFinalMethodsInWrapper(java.util.Set):354:363 -> a
-    70:70:void reportFinalMethodsInWrapper(java.util.Set):358:358 -> a
-    71:86: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):369:384 -> a
-    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,com.android.tools.r8.cf.CfVersion):296:296 -> a
-    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):276 -> 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):384 -> a
-    88:112:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):390:414 -> a
-    113:113:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():408:408 -> a
-    113:113:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):414 -> a
-    114:122:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):414:422 -> a
-    123:123: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):429:429 -> a
-    123:123:com.android.tools.r8.graph.DexEncodedField synthesizeWrappedValueEncodedField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):433 -> a
-    124:126:com.android.tools.r8.graph.DexEncodedField synthesizeWrappedValueEncodedField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):436:438 -> a
-    127:127: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):80:80 -> a
-    127:127:com.android.tools.r8.graph.DexEncodedField synthesizeWrappedValueEncodedField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):438 -> a
-    128:128:void finalizeWrappersForL8(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):470:470 -> a
-    129:133:void com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.registerAndProcessWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,java.util.Collection):538:542 -> a
-    129:133:void finalizeWrappersForL8(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):471 -> a
-    134:144:java.util.List synthesizeWrappers():475:485 -> a
-    145:152:java.util.List synthesizeWrappers():483:490 -> a
-    153:154:void lambda$synthesizeWrappers$3(java.util.Map,java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):487:488 -> a
-    155:158:void synthesizeWrappersForClasspath(java.util.Map,java.util.function.Consumer):497:497 -> a
-    159:161:void lambda$synthesizeWrappersForClasspath$4(java.util.Map,java.util.function.Consumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):501:503 -> a
-    162:167:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):511:516 -> a
-    168:169: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):189:190 -> a
-    168:169:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):516 -> a
-    170:170:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.vivifiedTypeFor(com.android.tools.r8.graph.DexType):184:184 -> a
-    170:170: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
-    170:170:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):516 -> a
-    171: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):304:319 -> a
-    171: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):195 -> a
-    171:186:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):516 -> a
-    187:187:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():408:408 -> 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):319 -> 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):195 -> a
-    187:187:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):516 -> a
-    188:192: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):319:323 -> a
-    188:192: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):195 -> a
-    188:192:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):516 -> a
-    193:193: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):322:322 -> a
-    193:193: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):195 -> a
-    193:193:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):516 -> a
-    194:194:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():493:493 -> a
-    194:194: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):325 -> a
-    194:194: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):195 -> a
-    194:194:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):516 -> a
-    195:206: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):326:337 -> a
-    195:206: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):195 -> a
-    195:206:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):516 -> a
-    207:212:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.finalizeWrapperMethods(java.util.List,java.util.Set):344:349 -> a
-    207:212: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):339 -> a
-    207:212: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):195 -> a
-    207:212:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):516 -> a
-    213:214:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.generateTypeConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):546:547 -> a
-    213:214: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):196 -> a
-    213:214:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):516 -> a
-    215:215:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.vivifiedTypeFor(com.android.tools.r8.graph.DexType):184:184 -> a
-    215:215:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.generateTypeConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):552 -> a
-    215:215: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):196 -> a
-    215:215:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):516 -> a
-    216:216:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.vivifiedTypeFor(com.android.tools.r8.graph.DexType):184:184 -> a
-    216:216:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.generateTypeConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):553 -> a
-    216:216: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):196 -> a
-    216:216:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):516 -> a
-    217:217:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.generateTypeConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):553:553 -> a
-    217:217: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):196 -> a
-    217:217:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):516 -> a
-    218:218:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.generateTypeConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):548:548 -> 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):167:167 -> a
+    11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> 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):168 -> 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):168:168 -> a
+    13:13:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
+    13:13:com.android.tools.r8.graph.DexType lambda$getWrapper$0(com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):168 -> a
+    14:14:com.android.tools.r8.graph.DexType lambda$getWrapper$0(com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):167:167 -> a
+    15:33:com.android.tools.r8.graph.DexClass synthesizeWrapper(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedField):221:239 -> a
+    34:37:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.synthesizeConstructor(com.android.tools.r8.graph.DexField):442:445 -> a
+    34:37:com.android.tools.r8.graph.DexClass synthesizeWrapper(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedField):242 -> a
+    38:46:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.synthesizeConstructor(com.android.tools.r8.graph.DexField):443:451 -> a
+    38:46:com.android.tools.r8.graph.DexClass synthesizeWrapper(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedField):242 -> a
+    47:53:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,int,boolean,com.android.tools.r8.graph.Code):456:462 -> a
+    47:53:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.synthesizeConstructor(com.android.tools.r8.graph.DexField):447 -> a
+    47:53:com.android.tools.r8.graph.DexClass synthesizeWrapper(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedField):242 -> a
+    54:54: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):297:297 -> a
+    54:54: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):277 -> a
+    54:54:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,int,boolean,com.android.tools.r8.graph.Code):462 -> a
+    54:54:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.synthesizeConstructor(com.android.tools.r8.graph.DexField):447 -> a
+    54:54:com.android.tools.r8.graph.DexClass synthesizeWrapper(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedField):242 -> a
+    55:57:com.android.tools.r8.graph.DexClass synthesizeWrapper(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedField):242:244 -> a
+    58:58:com.android.tools.r8.graph.DexClass synthesizeWrapper(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedField):225:225 -> a
+    59:59:java.lang.String lambda$reportFinalMethodsInWrapper$1(com.android.tools.r8.graph.DexMethod):354:354 -> a
+    60:60:java.lang.String[] lambda$reportFinalMethodsInWrapper$2(int):354:354 -> a
+    61:70:void reportFinalMethodsInWrapper(java.util.Set):354:363 -> a
+    71:71:void reportFinalMethodsInWrapper(java.util.Set):358:358 -> a
+    72: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):369:384 -> 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):297:297 -> 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):277 -> a
+    88:88: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):384 -> a
+    89:111:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):390:412 -> a
+    112:112:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    112:112:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):412 -> a
+    113:113:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):414:414 -> a
+    114:114:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():415:415 -> a
+    114:114:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):414 -> a
+    115:121:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):414:420 -> a
+    122:122:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    122:122:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):420 -> a
+    123:124:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):421:422 -> a
+    125:125: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):429:429 -> a
+    125:125:com.android.tools.r8.graph.DexEncodedField synthesizeWrappedValueEncodedField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):433 -> a
+    126:128:com.android.tools.r8.graph.DexEncodedField synthesizeWrappedValueEncodedField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):436:438 -> a
+    129:129: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):74:74 -> a
+    129:129:com.android.tools.r8.graph.DexEncodedField synthesizeWrappedValueEncodedField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):438 -> a
+    130:130:void finalizeWrappersForL8(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):470:470 -> a
+    131:135:void com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.registerAndProcessWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,java.util.Collection):538:542 -> a
+    131:135:void finalizeWrappersForL8(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):471 -> a
+    136:146:java.util.List synthesizeWrappers():475:485 -> a
+    147:154:java.util.List synthesizeWrappers():483:490 -> a
+    155:156:void lambda$synthesizeWrappers$3(java.util.Map,java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):487:488 -> a
+    157:160:void synthesizeWrappersForClasspath(java.util.Map,java.util.function.Consumer):497:497 -> a
+    161:163:void lambda$synthesizeWrappersForClasspath$4(java.util.Map,java.util.function.Consumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):501:503 -> a
+    164:169:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):511:516 -> a
+    170:171: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):189:190 -> a
+    170:171:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):516 -> a
+    172:172:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.vivifiedTypeFor(com.android.tools.r8.graph.DexType):184:184 -> a
+    172:172: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:172:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):516 -> a
+    173: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):304:318 -> a
+    173: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):195 -> a
+    173:187:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):516 -> a
+    188:188:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> 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):318 -> 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):195 -> a
+    188:188:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):516 -> 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):319:319 -> 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):195 -> a
+    189:189:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):516 -> a
+    190:190:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():415:415 -> a
+    190:190: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):319 -> a
+    190:190: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):195 -> a
+    190:190:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):516 -> a
+    191: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):319:323 -> a
+    191: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):195 -> a
+    191:195:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):516 -> 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):322:322 -> 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):195 -> a
+    196:196:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):516 -> a
+    197:197:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():502:502 -> a
+    197:197: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):325 -> a
+    197:197: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):195 -> a
+    197:197:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):516 -> a
+    198:209: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):326:337 -> a
+    198:209: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):195 -> a
+    198:209:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):516 -> a
+    210:215:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.finalizeWrapperMethods(java.util.List,java.util.Set):344:349 -> a
+    210:215: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):339 -> a
+    210:215: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):195 -> a
+    210:215:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):516 -> a
+    216:217:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.generateTypeConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):546:547 -> a
+    216:217: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):196 -> a
+    216:217:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):516 -> a
+    218:218:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.vivifiedTypeFor(com.android.tools.r8.graph.DexType):184:184 -> a
+    218:218:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.generateTypeConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):552 -> a
     218:218: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):196 -> a
     218:218:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):516 -> a
-    219:219: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):191:191 -> a
+    219:219:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.vivifiedTypeFor(com.android.tools.r8.graph.DexType):184:184 -> a
+    219:219:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.generateTypeConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):553 -> a
+    219:219: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):196 -> a
     219:219:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):516 -> a
-    220:228:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):517:525 -> a
-    229:229: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):202:202 -> a
-    229:229:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):524 -> a
-    230:230:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.vivifiedTypeFor(com.android.tools.r8.graph.DexType):184:184 -> a
-    230:230: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):204 -> a
-    230:230:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):524 -> a
-    231:231: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):204:204 -> a
-    231:231:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):524 -> a
-    232:252: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):250:270 -> a
-    232:252: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):209 -> a
-    232:252:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):524 -> a
-    253:264: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):266:277 -> a
-    253:264: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):209 -> a
-    253:264:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):524 -> a
-    265:265: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):276:276 -> a
-    265:265: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):209 -> a
-    265:265:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):524 -> a
-    266:266:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():493:493 -> a
-    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):281 -> 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):209 -> a
-    266:266:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):524 -> a
-    267:282: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):282:297 -> a
-    267:282: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):209 -> a
-    267:282:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):524 -> a
-    283:288:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.finalizeWrapperMethods(java.util.List,java.util.Set):344:349 -> a
-    283:288: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):299 -> a
-    283:288: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):209 -> a
-    283:288:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):524 -> a
-    289:290:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.generateVivifiedTypeConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):558:559 -> a
-    289:290: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):210 -> a
-    289:290:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):524 -> a
-    291:291:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.vivifiedTypeFor(com.android.tools.r8.graph.DexType):184:184 -> a
-    291:291:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.generateVivifiedTypeConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):563 -> a
-    291:291: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):210 -> a
-    291:291:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):524 -> a
-    292:292:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.generateVivifiedTypeConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):565:565 -> a
-    292:292: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):210 -> a
-    292:292:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):524 -> a
-    293:293:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.generateVivifiedTypeConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):560:560 -> a
+    220:220:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.generateTypeConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):553:553 -> a
+    220:220: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):196 -> a
+    220:220:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):516 -> a
+    221:221:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.generateTypeConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):548:548 -> a
+    221:221: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):196 -> a
+    221:221:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):516 -> a
+    222:222: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):191:191 -> a
+    222:222:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):516 -> a
+    223:231:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):517:525 -> a
+    232:232: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):202:202 -> a
+    232:232:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):524 -> a
+    233:233:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.vivifiedTypeFor(com.android.tools.r8.graph.DexType):184:184 -> a
+    233:233: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):204 -> a
+    233:233:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):524 -> a
+    234:234: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):204:204 -> a
+    234:234:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):524 -> a
+    235: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):250:263 -> a
+    235: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):209 -> a
+    235:248:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):524 -> a
+    249:249:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    249:249: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):263 -> a
+    249:249: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):209 -> a
+    249:249:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):524 -> a
+    250:255: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):266:266 -> a
+    250:255: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):209 -> a
+    250:255:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):524 -> a
+    262: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):273:277 -> a
+    262: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):209 -> a
+    262:266:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):524 -> 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):276:276 -> 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):209 -> a
+    267:267:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):524 -> a
+    268:268:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():502:502 -> a
+    268:268: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):281 -> a
+    268:268: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):209 -> a
+    268:268:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):524 -> a
+    269:284: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):282:297 -> a
+    269:284: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):209 -> a
+    269:284:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):524 -> a
+    285:290:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.finalizeWrapperMethods(java.util.List,java.util.Set):344:349 -> a
+    285:290: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):299 -> a
+    285:290: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):209 -> a
+    285:290:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):524 -> a
+    291:292:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.generateVivifiedTypeConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):558:559 -> a
+    291:292: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):210 -> a
+    291:292:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):524 -> a
+    293:293:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.vivifiedTypeFor(com.android.tools.r8.graph.DexType):184:184 -> a
+    293:293:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.generateVivifiedTypeConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):563 -> a
     293:293: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):210 -> a
     293:293:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):524 -> a
-    294:294: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):205:205 -> a
+    294:294:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.generateVivifiedTypeConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):565:565 -> a
+    294:294: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):210 -> a
     294:294:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):524 -> a
-    295:295:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):526:526 -> a
-    296:298:com.android.tools.r8.graph.DexEncodedMethod synthesizeConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):574:576 -> a
-    299:319:com.android.tools.r8.graph.DexEncodedMethod synthesizeConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):575:595 -> a
-    320:326:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,int,boolean,com.android.tools.r8.graph.Code):456:462 -> a
-    320:326:com.android.tools.r8.graph.DexEncodedMethod synthesizeConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):597 -> a
-    327:327: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):296:296 -> a
-    327:327: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):276 -> a
-    327:327:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,int,boolean,com.android.tools.r8.graph.Code):462 -> a
-    327:327:com.android.tools.r8.graph.DexEncodedMethod synthesizeConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):597 -> a
+    295:295:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.generateVivifiedTypeConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):560:560 -> a
+    295:295: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):210 -> a
+    295:295:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):524 -> a
+    296:296: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):205:205 -> a
+    296:296:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):524 -> a
+    297:297:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):526:526 -> a
+    298:300:com.android.tools.r8.graph.DexEncodedMethod synthesizeConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):574:576 -> a
+    301:321:com.android.tools.r8.graph.DexEncodedMethod synthesizeConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):575:595 -> a
+    322:328:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,int,boolean,com.android.tools.r8.graph.Code):456:462 -> a
+    322:328:com.android.tools.r8.graph.DexEncodedMethod synthesizeConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):597 -> a
+    329:329: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):297:297 -> a
+    329:329: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):277 -> a
+    329:329:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,int,boolean,com.android.tools.r8.graph.Code):462 -> a
+    329:329:com.android.tools.r8.graph.DexEncodedMethod synthesizeConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):597 -> a
     1:2:com.android.tools.r8.graph.DexType getTypeWrapper(com.android.tools.r8.graph.DexType):145:146 -> b
     3:3:com.android.tools.r8.graph.DexField wrappedValueField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):429:429 -> b
-    1:4:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):175:178 -> c
+    1:1:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):175:175 -> c
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> c
+    2:2:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):175 -> c
+    3:4:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):177:178 -> c
     5:5:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> c
     5:5:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):178 -> c
     6:6:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):178:178 -> c
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():408:408 -> c
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():415:415 -> c
     7:7:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):178 -> c
     8:9:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):178:179 -> c
     1:2:com.android.tools.r8.graph.DexType getVivifiedTypeWrapper(com.android.tools.r8.graph.DexType):151:152 -> d
     1:1:boolean hasSynthesized(com.android.tools.r8.graph.DexType):136:136 -> e
-com.android.tools.r8.ir.desugar.InterfaceMethodRewriter -> com.android.tools.r8.internal.Wh:
+com.android.tools.r8.ir.desugar.InterfaceMethodRewriter -> com.android.tools.r8.internal.ih:
     com.android.tools.r8.ir.conversion.IRConverter converter -> d
     java.util.Set emulatedMethods -> h
     com.android.tools.r8.utils.collections.SortedProgramMethodSet synthesizedMethods -> i
@@ -38538,386 +38613,452 @@
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
     java.util.Map emulatedInterfaces -> g
-    1:1:void <clinit>():127:127 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):164:164 -> <init>
-    2:32:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):141:171 -> <init>
-    1:5:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):175:179 -> a
-    6:6:void lambda$checkForAssumedLibraryTypes$0(java.util.function.BiConsumer,com.android.tools.r8.graph.DexString,java.util.Map):179:179 -> a
-    7:7:java.util.function.BiConsumer registerMapEntry(com.android.tools.r8.graph.AppInfo):183:183 -> 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):184:185 -> a
-    10:11:void registerType(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType):190:191 -> a
+    1:1:void <clinit>():110:110 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):147:147 -> <init>
+    2:32:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):124:154 -> <init>
+    1:5:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):158:162 -> a
+    6:6:void lambda$checkForAssumedLibraryTypes$0(java.util.function.BiConsumer,com.android.tools.r8.graph.DexString,java.util.Map):162:162 -> a
+    7:7:java.util.function.BiConsumer registerMapEntry(com.android.tools.r8.graph.AppInfo):166:166 -> 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):167:168 -> a
+    10:11:void registerType(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType):173:174 -> 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):192 -> a
-    13:14:void registerType(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType):192:193 -> a
-    15:18:void lambda$registerType$2(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexEncodedMethod):195:198 -> a
-    19:27:void initializeEmulatedInterfaceVariables():206:214 -> a
-    28:28:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):221:221 -> a
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):945:945 -> a
-    29:29:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):222 -> a
-    30:32:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):222:224 -> a
-    33:33:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):223:223 -> a
-    34:41:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):221:228 -> a
-    42:42:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):227:227 -> a
-    43:43:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):225:225 -> a
-    44:50:boolean needsRewriting(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.AppView):237:243 -> a
-    51:51:com.android.tools.r8.graph.DexType getEmulatedInterface(com.android.tools.r8.graph.DexType):247:247 -> a
-    52:56:void leavingStaticInvokeToInterface(com.android.tools.r8.graph.ProgramMethod):256:260 -> a
-    57:60:void leavingStaticInvokeToInterface(com.android.tools.r8.graph.ProgramMethod):259:262 -> a
-    61:96:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):270:305 -> a
-    97:98:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):525:526 -> a
-    97:98:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):305 -> a
-    99:99: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
-    99:99:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):526 -> a
-    99:99:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):305 -> a
-    100:104:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):531:535 -> a
-    100:104:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):305 -> a
-    105:105:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    105:105:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):535 -> a
-    105:105:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):305 -> a
-    106:107:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):545:546 -> a
-    106:107:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):305 -> a
-    108:109: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):1004:1005 -> a
-    108:109:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):546 -> a
-    108:109:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):305 -> a
-    110:112:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):547:549 -> a
-    110:112:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):305 -> a
-    113:113: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):1012:1012 -> a
-    113:113:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):549 -> a
-    113:113:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):305 -> a
-    114:115:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):550:551 -> a
-    114:115:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):305 -> a
-    116:126:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):547:557 -> a
-    116:126:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):305 -> a
-    127:127:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):552:552 -> a
-    127:127:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):557 -> a
-    127:127:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):305 -> a
-    128:130:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):558:560 -> a
-    128:130:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):305 -> a
-    131:131:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    131:131:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):560 -> a
-    131:131:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):305 -> a
-    132:138:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):560:566 -> a
-    132:138:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):305 -> a
-    139:153:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):562:576 -> a
-    139:153:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):305 -> a
-    154:154:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):552:552 -> a
-    154:154:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):576 -> a
-    154:154:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):305 -> a
-    155:155:boolean com.android.tools.r8.graph.DexClassAndMethod.isLibraryMethod():0:0 -> a
-    155:155:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):577 -> a
-    155:155:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):305 -> a
-    156:160:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):581:585 -> a
-    156:160:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):305 -> a
-    161:161:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):945:945 -> a
-    161:161:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):587 -> a
-    161:161:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):305 -> a
-    162:163:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):587:588 -> a
-    162:163:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):305 -> a
-    164:171:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):586:593 -> a
-    164:171:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):305 -> a
-    172:177:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):592:597 -> a
-    172:177:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):305 -> a
-    178:178:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):596:596 -> a
-    178:178:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):305 -> a
-    179:179:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):295:295 -> a
-    180:196:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):294:310 -> a
-    197:211:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeInterfaceOrInvokeVirtual(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.ir.code.InstructionListIterator):606:620 -> a
-    197:211:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):309 -> a
-    212:212:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    212:212:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeInterfaceOrInvokeVirtual(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.ir.code.InstructionListIterator):620 -> a
-    212:212:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):309 -> a
-    213:214:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeInterfaceOrInvokeVirtual(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.ir.code.InstructionListIterator):620:621 -> a
-    213:214:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):309 -> a
-    215:215:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():408:408 -> a
-    215:215:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeInterfaceOrInvokeVirtual(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.ir.code.InstructionListIterator):621 -> a
-    215:215:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):309 -> a
-    216:216:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeInterfaceOrInvokeVirtual(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.ir.code.InstructionListIterator):622:622 -> a
-    216:216:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):309 -> a
-    217:225: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):667:675 -> a
-    217:225:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeInterfaceOrInvokeVirtual(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.ir.code.InstructionListIterator):623 -> a
-    217:225:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):309 -> a
-    226:226: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):671:671 -> a
-    226:226:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeInterfaceOrInvokeVirtual(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.ir.code.InstructionListIterator):623 -> a
-    226:226:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):309 -> a
-    227:227:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):291:291 -> a
-    228:233:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):342:347 -> a
-    228:233:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):291 -> a
-    234:234:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramMethod):67:67 -> a
-    234:234:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):347 -> a
-    234:234:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):291 -> a
-    235:239:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):350:354 -> a
-    235:239:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):291 -> a
-    240:240:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    240:240:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):358 -> a
-    240:240:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):291 -> a
-    241:249:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):366:374 -> a
-    241:249:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):291 -> a
-    250:250:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):1029:1029 -> a
-    250:250:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):375 -> a
-    250:250:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):291 -> a
-    251:251: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):1025:1025 -> a
-    251:251:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):1029 -> a
-    251:251:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):375 -> a
-    251:251:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):291 -> a
-    252:254:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):376:378 -> a
-    252:254:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):291 -> a
-    255:273:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):372:390 -> a
-    255:273:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):291 -> a
-    274:282:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):386:394 -> a
-    274:282:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):291 -> a
-    283:287:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):359:363 -> a
-    283:287:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):291 -> a
-    288:288:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
-    288:288:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    288:288:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):363 -> a
-    288:288:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):291 -> a
-    289:289:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):363:363 -> a
-    289:289:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):291 -> a
-    290:290:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):288:288 -> a
-    291:294:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeCustom(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.graph.ProgramMethod):331:334 -> a
-    291:294:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):288 -> a
-    295:295:boolean com.android.tools.r8.graph.DexValue.isDexValueMethodHandle():0:0 -> a
-    295:295:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeCustom(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.graph.ProgramMethod):334 -> a
-    295:295:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):288 -> a
-    296:296:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeCustom(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.graph.ProgramMethod):335:335 -> a
-    296:296:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):288 -> a
-    297:300:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):319:322 -> a
-    301:301:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    301:301:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):322 -> a
-    302:305:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):322:325 -> a
-    306:313:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):408:415 -> a
-    314:314: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
-    314:314:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):415 -> a
-    315:324:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):420:429 -> a
-    325:325:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    325:325:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):680 -> a
-    325:325:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):434 -> a
-    326:326:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):680:680 -> a
-    326:326:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):434 -> a
-    327:338:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):445:456 -> a
-    339:356:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):454:471 -> a
-    357:384:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):469:496 -> a
-    385:403:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):492:510 -> a
-    404:404:com.android.tools.r8.ir.code.InvokeStatic$Builder com.android.tools.r8.ir.code.InvokeStatic.builder():47:47 -> a
-    404:404:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):510 -> a
-    405:414:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):511:520 -> a
-    415:415:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):519:519 -> a
-    416:419:void lambda$rewriteInvokeStatic$4(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):459:462 -> a
-    420:423:com.android.tools.r8.graph.Code lambda$rewriteInvokeStatic$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):464:467 -> a
-    424:424:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):684:684 -> a
-    425:425:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    425:425:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):684 -> a
-    426:426:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):684:684 -> a
-    427:427:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():408:408 -> a
-    427:427:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):684 -> a
-    428:432:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):684:688 -> a
-    433:451:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):749:767 -> a
-    452:554:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):797:899 -> a
-    555:571:void lambda$synthesizeEmulateInterfaceLibraryClass$5(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List,com.android.tools.r8.graph.ProgramMethod):802:818 -> a
-    572:572:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():43:43 -> a
-    572:572:void lambda$synthesizeEmulateInterfaceLibraryClass$5(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List,com.android.tools.r8.graph.ProgramMethod):819 -> a
-    573:575:void lambda$synthesizeEmulateInterfaceLibraryClass$5(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List,com.android.tools.r8.graph.ProgramMethod):820:822 -> a
-    576:584:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):774:782 -> a
-    576:584:void lambda$synthesizeEmulateInterfaceLibraryClass$5(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List,com.android.tools.r8.graph.ProgramMethod):822 -> a
-    585:590:void lambda$synthesizeEmulateInterfaceLibraryClass$5(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List,com.android.tools.r8.graph.ProgramMethod):823:828 -> a
-    591:591:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():43:43 -> a
-    591:591:void lambda$synthesizeEmulateInterfaceLibraryClass$5(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List,com.android.tools.r8.graph.ProgramMethod):830 -> a
-    592:592:void lambda$synthesizeEmulateInterfaceLibraryClass$5(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List,com.android.tools.r8.graph.ProgramMethod):826:826 -> a
-    593:614:void lambda$synthesizeEmulateInterfaceLibraryClass$5(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List,com.android.tools.r8.graph.ProgramMethod):823:844 -> a
-    615:615:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):945:945 -> a
-    615:615:void lambda$synthesizeEmulateInterfaceLibraryClass$5(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List,com.android.tools.r8.graph.ProgramMethod):848 -> a
-    616:617:void lambda$synthesizeEmulateInterfaceLibraryClass$5(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List,com.android.tools.r8.graph.ProgramMethod):848:849 -> a
-    618:618:void lambda$synthesizeEmulateInterfaceLibraryClass$5(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List,com.android.tools.r8.graph.ProgramMethod):847:847 -> a
-    619:633:void lambda$synthesizeEmulateInterfaceLibraryClass$5(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List,com.android.tools.r8.graph.ProgramMethod):844:858 -> a
-    634:634:void lambda$synthesizeEmulateInterfaceLibraryClass$5(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List,com.android.tools.r8.graph.ProgramMethod):856:856 -> a
-    635:635:void lambda$synthesizeEmulateInterfaceLibraryClass$5(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List,com.android.tools.r8.graph.ProgramMethod):855:855 -> a
-    636:645:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethodHandle):917:926 -> a
-    646:646:java.lang.String getCompanionClassDescriptor(java.lang.String):933:933 -> a
-    647:650:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):938:941 -> a
-    651:660:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):988:997 -> a
-    661:661:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):994:994 -> a
-    662:662:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1012:1012 -> a
-    663:664:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):1016:1017 -> a
-    665:665: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):1012:1012 -> a
-    665:665:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):1017 -> a
-    666:666:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):1018:1018 -> a
-    667:675:void recordCompanionClassReference(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod):1036:1044 -> a
-    676:678:com.android.tools.r8.graph.DexClasspathClass com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.synthesizeEmptyCompanionClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1057:1059 -> a
-    676:678:void recordCompanionClassReference(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod):1044 -> a
-    679:679:com.android.tools.r8.graph.DexClasspathClass com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.synthesizeEmptyCompanionClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1058:1058 -> a
-    679:679:void recordCompanionClassReference(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod):1044 -> a
-    680:680:void recordCompanionClassReference(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod):1049:1049 -> a
-    681:681:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
-    681:681:void recordCompanionClassReference(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod):1049 -> a
-    682:682:void recordCompanionClassReference(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod):1050:1050 -> a
-    683:694:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.synthetizeCompanionClassMethodIfNotPresent(com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.graph.DexMethod):1064:1075 -> a
-    683:694:void recordCompanionClassReference(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod):1050 -> a
-    695:695: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):296:296 -> a
-    695:695: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):276 -> a
-    695:695:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.synthetizeCompanionClassMethodIfNotPresent(com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.graph.DexMethod):1075 -> a
-    695:695:void recordCompanionClassReference(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod):1050 -> a
-    696:706:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.synthetizeCompanionClassMethodIfNotPresent(com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.graph.DexMethod):1068:1078 -> a
-    696:706:void recordCompanionClassReference(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod):1050 -> a
-    707:707:com.android.tools.r8.graph.DexEncodedMethod[] renameHolder(java.lang.Iterable,com.android.tools.r8.graph.DexType):1129:1129 -> a
-    708:710:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameHolder(java.util.List,com.android.tools.r8.graph.DexType):1133:1135 -> a
-    708:710:com.android.tools.r8.graph.DexEncodedMethod[] renameHolder(java.lang.Iterable,com.android.tools.r8.graph.DexType):1129 -> a
-    711:711:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1149:1149 -> a
-    712:712:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():408:408 -> a
-    712:712:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1149 -> a
-    713:728:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder) -> a
-    713:728:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1150 -> a
-    729:729:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):727:727 -> a
-    729:729:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1150 -> a
-    730:730:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1155:1155 -> a
-    731:734: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):1259:1262 -> a
-    731:734:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1155 -> a
-    735:736:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):1239:1240 -> a
-    735:736: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):1263 -> a
-    735:736:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1155 -> a
-    737:744: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):1264:1271 -> a
-    737:744:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1155 -> a
-    745:748:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.transformEmulatedInterfaces():1195:1198 -> a
-    745:748:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1156 -> a
-    749:767:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.transformEmulatedInterfaces(com.android.tools.r8.graph.DexProgramClass):1208:1226 -> a
-    749:767:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.transformEmulatedInterfaces():1198 -> a
-    749:767:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1156 -> a
-    768:772:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.transformEmulatedInterfaces(com.android.tools.r8.graph.DexProgramClass):1225:1229 -> a
-    768:772:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.transformEmulatedInterfaces():1198 -> a
-    768:772:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1156 -> a
-    773:776:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1162:1165 -> a
-    777:777:com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens.builder():523:523 -> a
-    777:777:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1165 -> a
-    778:778:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1166:1166 -> a
-    779:780: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):1248:1249 -> a
-    779:780:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1167 -> a
-    781:782:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):1239:1240 -> a
-    781:782: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):1250 -> a
-    781:782:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1167 -> a
-    783:786: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):1251:1254 -> a
-    783:786:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1167 -> a
-    787:803:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1168:1184 -> a
-    804:804:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():408:408 -> a
-    804:804:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1184 -> a
-    805:806:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():1084:1085 -> a
-    805:806:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1185 -> a
-    807:815:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):1097:1105 -> a
-    807:815:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():1086 -> a
-    807:815:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1185 -> a
-    816:819: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):1116:1119 -> a
-    816:819:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):1105 -> a
-    816:819:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():1086 -> a
-    816:819:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1185 -> a
-    820:822:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):1107:1109 -> a
-    820:822:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():1086 -> a
-    820:822:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1185 -> a
-    823:825:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():1087:1089 -> a
-    823:825:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1185 -> a
-    826:828:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1123:1125 -> a
-    826:828:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():1090 -> a
-    826:828:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1185 -> a
-    829:829:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1188:1188 -> a
-    830:831:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.clear():1233:1234 -> a
-    830:831:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1191 -> a
-    832:836:void lambda$desugarInterfaceMethods$6(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):1177:1181 -> a
-    837:851:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1275:1289 -> a
-    852:852:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1282:1282 -> a
-    853:859:void warnMissingType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):1315:1321 -> a
-    860:861:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1325:1326 -> a
-    862:862:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getInterfaceClassType(com.android.tools.r8.graph.DexType):964:964 -> a
-    862:862:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1327 -> a
-    863:864:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1329:1330 -> a
-    865:865:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():650:650 -> a
-    865:865:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1330 -> a
-    866:866: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):1337:1337 -> a
-    867:868: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):1350:1351 -> a
-    867:868: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):1341 -> a
-    869:872: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):1306:1309 -> a
-    869:872: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):1353 -> a
-    869:872: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):1341 -> a
-    873:875: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):1354:1356 -> a
-    873:875: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):1341 -> a
-    876:876:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    876:876:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):680 -> a
-    876:876: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):1362 -> a
-    876:876: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):1341 -> a
-    877:877:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):680:680 -> a
-    877:877: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):1362 -> a
-    877:877: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):1341 -> a
-    878:904: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):1367:1393 -> a
-    878:904: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):1341 -> a
-    905:905: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):1342:1342 -> a
-    906:908: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):1357:1359 -> a
-    906:908: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):1341 -> a
-    909:909:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    909:909: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):1359 -> a
-    909:909: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):1341 -> a
-    910:910: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):1359:1359 -> a
-    910:910: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):1341 -> a
-    911:911:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1398:1398 -> a
-    912:912:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    912:912:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1398 -> a
-    913:914:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1398:1399 -> a
-    915:915:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    915:915:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1399 -> a
-    916:917:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1399:1400 -> a
-    918:918:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():650:650 -> a
-    918:918:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1402 -> a
-    919:923:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1404:1408 -> a
-    924:924:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():650:650 -> a
-    924:924: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):1417 -> a
-    924:924:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1409 -> a
-    925:925: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):1419:1419 -> a
-    925:925:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1409 -> a
-    926:926:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():650:650 -> a
-    926:926: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):1417 -> a
-    926:926:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1406 -> a
-    927:927: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):1419:1419 -> a
-    927:927:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1406 -> a
-    1:27:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):630:656 -> b
-    28:28:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isEmulatedInterface(com.android.tools.r8.graph.DexType):233:233 -> b
-    28:28:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):656 -> b
-    29:29:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):657:657 -> b
-    30:31:boolean dontRewrite(com.android.tools.r8.graph.DexClassAndMethod):693:694 -> b
-    32:32:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():43:43 -> b
-    32:32:boolean dontRewrite(com.android.tools.r8.graph.DexClassAndMethod):695 -> b
-    33:33:boolean dontRewrite(com.android.tools.r8.graph.DexClassAndMethod):695:695 -> b
-    34:39:java.util.Map processEmulatedInterfaceHierarchy():735:740 -> b
-    40:41:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):910:911 -> b
-    42:42:java.lang.String com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getEmulateLibraryInterfaceClassDescriptor(java.lang.String):904:904 -> b
-    42:42:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):912 -> b
-    43:43:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):913:913 -> b
-    44:44:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):950:950 -> b
-    45:45:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1025:1025 -> b
-    46:49:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1306:1309 -> b
-    1:1:boolean isEmulatedInterface(com.android.tools.r8.graph.DexType):233:233 -> c
-    2:4:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod):789:791 -> c
-    5:5:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():43:43 -> c
-    5:5:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod):792 -> c
-    6:6:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod):789:789 -> c
-    7:7:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):969:969 -> c
-    8:8:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isCompanionClassType(com.android.tools.r8.graph.DexType):950:950 -> c
-    8:8:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):969 -> c
-    9:12:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):969:972 -> c
-    13:15:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):971:973 -> c
-    1:3:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):978:980 -> d
-    4:4:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):283:283 -> d
-    4:4:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):980 -> d
-    5:5:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):981:981 -> d
-    6:6:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1295:1295 -> d
-    7:7:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):34:34 -> d
-    7:7:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1295 -> d
-    8:9:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isTypeWrapper(com.android.tools.r8.graph.DexType):958:959 -> d
-    8:9:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1296 -> d
-    10:10:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isCompanionClassType(com.android.tools.r8.graph.DexType):950:950 -> d
-    10:10:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1297 -> d
-    11:14:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1297:1300 -> d
-    1:6:void warnMissingEmulatedInterface(com.android.tools.r8.graph.DexType):703:708 -> e
-com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor -> com.android.tools.r8.internal.Wh$a:
+    12:12:void registerType(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType):175 -> a
+    13:14:void registerType(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType):175:176 -> a
+    15:18:void lambda$registerType$2(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexEncodedMethod):178:181 -> a
+    19:23:void initializeEmulatedInterfaceVariables():189:193 -> a
+    24:24:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    24:24:void initializeEmulatedInterfaceVariables():193 -> a
+    25:26:void initializeEmulatedInterfaceVariables():196:197 -> a
+    27:27:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):204:204 -> a
+    28:28:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):867:867 -> a
+    28:28:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):205 -> a
+    29:31:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):205:207 -> a
+    32:32:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):206:206 -> a
+    33:40:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):204:211 -> a
+    41:41:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):210:210 -> a
+    42:42:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):208:208 -> a
+    43:43:boolean needsRewriting(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.AppView):221:221 -> a
+    44:44:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    44:44:boolean needsRewriting(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.AppView):223 -> a
+    45:50:boolean needsRewriting(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.AppView):224:229 -> a
+    51:51:com.android.tools.r8.graph.DexType getEmulatedInterface(com.android.tools.r8.graph.DexType):233:233 -> a
+    52:56:void leavingStaticInvokeToInterface(com.android.tools.r8.graph.ProgramMethod):242:246 -> a
+    57:60:void leavingStaticInvokeToInterface(com.android.tools.r8.graph.ProgramMethod):245:248 -> a
+    61:83:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):255:277 -> a
+    84:85:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):450:451 -> a
+    84:85:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):277 -> a
+    86:86: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
+    86:86:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):451 -> a
+    86:86:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):277 -> a
+    87:91:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):456:460 -> a
+    87:91:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):277 -> a
+    92:92:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    92:92:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):460 -> a
+    92:92:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):277 -> a
+    93:93:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):470:470 -> a
+    93:93:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):277 -> a
+    94:95: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):922:923 -> a
+    94:95:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):470 -> a
+    94:95:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):277 -> a
+    96:96:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):471:471 -> a
+    96:96:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):277 -> a
+    97:97:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):934:934 -> a
+    97:97:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):473 -> a
+    97:97:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):277 -> a
+    98:98: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):930:930 -> a
+    98:98:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):934 -> a
+    98:98:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):473 -> a
+    98:98:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):277 -> a
+    99:100:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):474:475 -> a
+    99:100:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):277 -> a
+    101:111:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):471:481 -> a
+    101:111:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):277 -> a
+    112:112:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):502:502 -> a
+    112:112:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):481 -> a
+    112:112:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):277 -> a
+    113:115:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):482:484 -> a
+    113:115:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):277 -> a
+    116:116:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    116:116:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):484 -> a
+    116:116:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):277 -> a
+    117:120:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):484:487 -> a
+    117:120:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):277 -> a
+    121:121: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):930:930 -> a
+    121:121:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):487 -> a
+    121:121:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):277 -> a
+    122:123:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):488:489 -> a
+    122:123:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):277 -> a
+    124:138:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):485:499 -> a
+    124:138:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):277 -> a
+    139:139:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):502:502 -> a
+    139:139:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):499 -> a
+    139:139:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):277 -> a
+    140:140:boolean com.android.tools.r8.graph.DexClassAndMethod.isLibraryMethod():0:0 -> a
+    140:140:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):500 -> a
+    140:140:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):277 -> a
+    141:146:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):504:509 -> a
+    141:146:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):277 -> a
+    147:149:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):508:510 -> a
+    147:149:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):277 -> a
+    150:150:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):867:867 -> a
+    150:150:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):512 -> a
+    150:150:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):277 -> a
+    151:152:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):512:513 -> a
+    151:152:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):277 -> a
+    153:159:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):511:517 -> a
+    153:159:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):277 -> a
+    160:164:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):516:520 -> a
+    160:164:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):277 -> a
+    165:165:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):519:519 -> a
+    165:165:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):277 -> a
+    166:174:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):274:282 -> a
+    175:189:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeInterfaceOrInvokeVirtual(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.ir.code.InstructionListIterator):529:543 -> a
+    175:189:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):281 -> a
+    190:190:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    190:190:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeInterfaceOrInvokeVirtual(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.ir.code.InstructionListIterator):543 -> a
+    190:190:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):281 -> a
+    191:192:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeInterfaceOrInvokeVirtual(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.ir.code.InstructionListIterator):543:544 -> a
+    191:192:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):281 -> a
+    193:193:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():415:415 -> a
+    193:193:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeInterfaceOrInvokeVirtual(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.ir.code.InstructionListIterator):544 -> a
+    193:193:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):281 -> a
+    194:194: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):589:589 -> a
+    194:194:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeInterfaceOrInvokeVirtual(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.ir.code.InstructionListIterator):545 -> a
+    194:194:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):281 -> a
+    195:195:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    195:195: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):590 -> a
+    195:195:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeInterfaceOrInvokeVirtual(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.ir.code.InstructionListIterator):545 -> a
+    195:195:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):281 -> a
+    196:203: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):590:597 -> a
+    196:203:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeInterfaceOrInvokeVirtual(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.ir.code.InstructionListIterator):545 -> a
+    196:203:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):281 -> a
+    204:204: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):593:593 -> a
+    204:204:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeInterfaceOrInvokeVirtual(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.ir.code.InstructionListIterator):545 -> a
+    204:204:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):281 -> a
+    205:205:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):271:271 -> a
+    206:211:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):306:311 -> a
+    206:211:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):271 -> a
+    212:212:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramMethod):67:67 -> a
+    212:212:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):311 -> a
+    212:212:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):271 -> a
+    213:217:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):314:318 -> a
+    213:217:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):271 -> a
+    218:218:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    218:218:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):322 -> a
+    218:218:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):271 -> a
+    219:226:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):330:337 -> a
+    219:226:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):271 -> a
+    227:227:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):948:948 -> a
+    227:227:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):338 -> a
+    227:227:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):271 -> a
+    228:228: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):944:944 -> a
+    228:228:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):948 -> a
+    228:228:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):338 -> a
+    228:228:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):271 -> a
+    229:229:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):934:934 -> a
+    229:229:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):339 -> a
+    229:229:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):271 -> a
+    230:230: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):930:930 -> a
+    230:230:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):934 -> a
+    230:230:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):339 -> a
+    230:230:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):271 -> a
+    231:232:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):340:341 -> a
+    231:232:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):271 -> a
+    233:250:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):335:352 -> a
+    233:250:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):271 -> a
+    251:259:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):348:356 -> a
+    251:259:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):271 -> a
+    260:264:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):323:327 -> a
+    260:264:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):271 -> a
+    265:265:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
+    265:265:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    265:265:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):327 -> a
+    265:265:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):271 -> a
+    266:266:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):327:327 -> a
+    266:266:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):271 -> a
+    267:267:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):268:268 -> a
+    268:271:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeCustom(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.graph.ProgramMethod):295:298 -> a
+    268:271:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):268 -> a
+    272:272:boolean com.android.tools.r8.graph.DexValue.isDexValueMethodHandle():0:0 -> a
+    272:272:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeCustom(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.graph.ProgramMethod):298 -> a
+    272:272:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):268 -> a
+    273:273:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteInvokeCustom(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.graph.ProgramMethod):299:299 -> a
+    273:273:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):268 -> a
+    274:280:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):363:369 -> a
+    281:281: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
+    281:281:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):369 -> a
+    282:291:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):374:383 -> a
+    292:292:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    292:292:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):602 -> a
+    292:292:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):388 -> a
+    293:293:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):602:602 -> a
+    293:293:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):388 -> a
+    294:304:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):399:409 -> a
+    305:325:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):408:428 -> a
+    326:340:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):426:440 -> a
+    341:341:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):900:900 -> a
+    341:341:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):442 -> a
+    342:342:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):867:867 -> a
+    342:342:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):900 -> a
+    342:342:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):442 -> a
+    343:343:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):900:900 -> a
+    343:343:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):442 -> a
+    344:345:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):443:444 -> a
+    346:346:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):440:440 -> a
+    347:350:void lambda$rewriteInvokeStatic$4(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):412:415 -> a
+    351:357:void lambda$rewriteInvokeStatic$4(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):414:420 -> a
+    358:361:com.android.tools.r8.graph.Code lambda$rewriteInvokeStatic$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):422:425 -> a
+    362:362:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):606:606 -> a
+    363:363:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    363:363:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):606 -> a
+    364:364:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):606:606 -> a
+    365:365:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():415:415 -> a
+    365:365:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):606 -> a
+    366:370:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):606:610 -> a
+    371:376:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):671:676 -> a
+    377:377:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    377:377:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):676 -> a
+    378:387:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):678:687 -> a
+    388:388:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    388:388:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):687 -> a
+    389:389:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):689:689 -> a
+    390:492:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):719:821 -> a
+    493:495:void lambda$synthesizeEmulateInterfaceLibraryClass$5(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List,com.android.tools.r8.graph.ProgramMethod):724:726 -> a
+    496:496:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):895:895 -> a
+    496:496:void lambda$synthesizeEmulateInterfaceLibraryClass$5(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List,com.android.tools.r8.graph.ProgramMethod):727 -> a
+    497:497:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):938:938 -> a
+    497:497:void lambda$synthesizeEmulateInterfaceLibraryClass$5(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List,com.android.tools.r8.graph.ProgramMethod):728 -> a
+    498:498: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):930:930 -> a
+    498:498:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):938 -> a
+    498:498:void lambda$synthesizeEmulateInterfaceLibraryClass$5(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List,com.android.tools.r8.graph.ProgramMethod):728 -> a
+    499:505:void lambda$synthesizeEmulateInterfaceLibraryClass$5(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List,com.android.tools.r8.graph.ProgramMethod):734:740 -> a
+    506:506:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():43:43 -> a
+    506:506:void lambda$synthesizeEmulateInterfaceLibraryClass$5(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List,com.android.tools.r8.graph.ProgramMethod):741 -> a
+    507:508:void lambda$synthesizeEmulateInterfaceLibraryClass$5(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List,com.android.tools.r8.graph.ProgramMethod):742:743 -> a
+    509:509:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    509:509:void lambda$synthesizeEmulateInterfaceLibraryClass$5(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List,com.android.tools.r8.graph.ProgramMethod):743 -> a
+    510:510:void lambda$synthesizeEmulateInterfaceLibraryClass$5(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List,com.android.tools.r8.graph.ProgramMethod):744:744 -> a
+    511:517:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):696:702 -> a
+    511:517:void lambda$synthesizeEmulateInterfaceLibraryClass$5(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List,com.android.tools.r8.graph.ProgramMethod):744 -> a
+    518:518:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    518:518:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):702 -> a
+    518:518:void lambda$synthesizeEmulateInterfaceLibraryClass$5(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List,com.android.tools.r8.graph.ProgramMethod):744 -> a
+    519:519:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):704:704 -> a
+    519:519:void lambda$synthesizeEmulateInterfaceLibraryClass$5(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List,com.android.tools.r8.graph.ProgramMethod):744 -> a
+    520:525:void lambda$synthesizeEmulateInterfaceLibraryClass$5(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List,com.android.tools.r8.graph.ProgramMethod):745:750 -> a
+    526:526:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():43:43 -> a
+    526:526:void lambda$synthesizeEmulateInterfaceLibraryClass$5(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List,com.android.tools.r8.graph.ProgramMethod):752 -> a
+    527:527:void lambda$synthesizeEmulateInterfaceLibraryClass$5(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List,com.android.tools.r8.graph.ProgramMethod):748:748 -> a
+    528:542:void lambda$synthesizeEmulateInterfaceLibraryClass$5(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List,com.android.tools.r8.graph.ProgramMethod):745:759 -> a
+    543:543:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    543:543:void lambda$synthesizeEmulateInterfaceLibraryClass$5(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List,com.android.tools.r8.graph.ProgramMethod):759 -> a
+    544:550:void lambda$synthesizeEmulateInterfaceLibraryClass$5(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List,com.android.tools.r8.graph.ProgramMethod):760:766 -> a
+    551:551:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):867:867 -> a
+    551:551:void lambda$synthesizeEmulateInterfaceLibraryClass$5(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List,com.android.tools.r8.graph.ProgramMethod):770 -> a
+    552:553:void lambda$synthesizeEmulateInterfaceLibraryClass$5(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List,com.android.tools.r8.graph.ProgramMethod):770:771 -> a
+    554:554:void lambda$synthesizeEmulateInterfaceLibraryClass$5(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List,com.android.tools.r8.graph.ProgramMethod):769:769 -> a
+    555:569:void lambda$synthesizeEmulateInterfaceLibraryClass$5(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List,com.android.tools.r8.graph.ProgramMethod):766:780 -> a
+    570:570:void lambda$synthesizeEmulateInterfaceLibraryClass$5(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List,com.android.tools.r8.graph.ProgramMethod):778:778 -> a
+    571:571:void lambda$synthesizeEmulateInterfaceLibraryClass$5(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List,com.android.tools.r8.graph.ProgramMethod):777:777 -> a
+    572:573:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethodHandle):839:840 -> a
+    574:574:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    574:574:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethodHandle):840 -> a
+    575:579:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethodHandle):844:848 -> a
+    580:580:java.lang.String getCompanionClassDescriptor(java.lang.String):855:855 -> a
+    581:584:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):860:863 -> a
+    585:594:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):906:915 -> a
+    595:595:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):912:912 -> a
+    596:596:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):930:930 -> a
+    597:597:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):934:934 -> a
+    598:598: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):930:930 -> a
+    598:598:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):934 -> a
+    599:599:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):938:938 -> a
+    600:600: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):930:930 -> a
+    600:600:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):938 -> a
+    601:601:com.android.tools.r8.graph.DexEncodedMethod[] renameHolder(java.lang.Iterable,com.android.tools.r8.graph.DexType):999:999 -> a
+    602:604:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameHolder(java.util.List,com.android.tools.r8.graph.DexType):1003:1005 -> a
+    602:604:com.android.tools.r8.graph.DexEncodedMethod[] renameHolder(java.lang.Iterable,com.android.tools.r8.graph.DexType):999 -> a
+    605:605:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1019:1019 -> a
+    606:606:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():415:415 -> a
+    606:606:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1019 -> a
+    607:622:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):635:650 -> a
+    607:622:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1020 -> a
+    623:623:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):649:649 -> a
+    623:623:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1020 -> a
+    624:624:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1025:1025 -> a
+    625:627: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):1129:1131 -> a
+    625:627:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1025 -> a
+    628:629:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):1109:1110 -> a
+    628:629: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):1132 -> a
+    628:629:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1025 -> a
+    630:637: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):1133:1140 -> a
+    630:637:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1025 -> a
+    638:639:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.transformEmulatedInterfaces():1065:1066 -> a
+    638:639:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1026 -> a
+    640:640:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    640:640:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.transformEmulatedInterfaces():1066 -> a
+    640:640:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1026 -> a
+    641:642:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.transformEmulatedInterfaces():1067:1068 -> a
+    641:642:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1026 -> a
+    643:661:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.transformEmulatedInterfaces(com.android.tools.r8.graph.DexProgramClass):1078:1096 -> a
+    643:661:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.transformEmulatedInterfaces():1068 -> a
+    643:661:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1026 -> a
+    662:666:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.transformEmulatedInterfaces(com.android.tools.r8.graph.DexProgramClass):1095:1099 -> a
+    662:666:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.transformEmulatedInterfaces():1068 -> a
+    662:666:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1026 -> a
+    667:670:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1032:1035 -> a
+    671:671:com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens.builder():516:516 -> a
+    671:671:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1035 -> a
+    672:672:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1036:1036 -> a
+    673:674: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):1118:1119 -> a
+    673:674:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1037 -> a
+    675:676:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):1109:1110 -> a
+    675:676: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):1120 -> a
+    675:676:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1037 -> a
+    677:680: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):1121:1124 -> a
+    677:680:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1037 -> a
+    681:697:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1038:1054 -> a
+    698:698:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():415:415 -> a
+    698:698:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1054 -> a
+    699:700:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():954:955 -> a
+    699:700:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1055 -> a
+    701:709:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):967:975 -> a
+    701:709:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():956 -> a
+    701:709:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1055 -> a
+    710:713: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):986:989 -> a
+    710:713:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):975 -> a
+    710:713:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():956 -> a
+    710:713:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1055 -> a
+    714:714:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):977:977 -> a
+    714:714:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():956 -> a
+    714:714:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1055 -> a
+    715:715:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    715:715:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):977 -> a
+    715:715:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():956 -> a
+    715:715:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1055 -> a
+    716:716:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):979:979 -> a
+    716:716:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():956 -> a
+    716:716:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1055 -> a
+    717:719:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():957:959 -> a
+    717:719:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1055 -> a
+    720:722:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):993:995 -> a
+    720:722:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():960 -> a
+    720:722:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1055 -> a
+    723:723:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1058:1058 -> a
+    724:725:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.clear():1103:1104 -> a
+    724:725:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1061 -> a
+    726:730:void lambda$desugarInterfaceMethods$6(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):1047:1051 -> a
+    731:745:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1144:1158 -> a
+    746:746:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1151:1151 -> a
+    747:747:boolean lambda$shouldIgnoreFromReports$7(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfiguration):1170:1170 -> a
+    748:754:void warnMissingType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):1187:1193 -> a
+    755:755: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):1209:1209 -> a
+    756:757: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):1222:1223 -> a
+    756:757: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):1213 -> a
+    758:758:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    758:758: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):1223 -> a
+    758:758: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):1213 -> a
+    759:762: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):1178:1181 -> a
+    759:762: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):1225 -> a
+    759:762: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):1213 -> a
+    763:765: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):1226:1228 -> a
+    763:765: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):1213 -> a
+    766:766:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    766:766:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):602 -> a
+    766:766: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):1234 -> a
+    766:766: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):1213 -> a
+    767:767:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):602:602 -> a
+    767:767: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):1234 -> a
+    767:767: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):1213 -> a
+    768:794: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):1239:1265 -> a
+    768:794: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):1213 -> a
+    795:795: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):1214:1214 -> a
+    796:798: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):1229:1231 -> a
+    796:798: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):1213 -> a
+    799:799:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    799:799: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):1231 -> a
+    799:799: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):1213 -> a
+    800:800: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):1231:1231 -> a
+    800:800: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):1213 -> a
+    801:801:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1270:1270 -> a
+    802:802:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    802:802:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1270 -> a
+    803:804:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1270:1271 -> a
+    805:805:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    805:805:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1271 -> a
+    806:807:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1271:1272 -> a
+    808:808:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():632:632 -> a
+    808:808:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1274 -> a
+    809:813:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1276:1280 -> a
+    814:814:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():632:632 -> a
+    814:814: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):1289 -> a
+    814:814:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1281 -> a
+    815:815: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):1291:1291 -> a
+    815:815:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1281 -> a
+    816:816:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():632:632 -> a
+    816:816: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):1289 -> a
+    816:816:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1278 -> a
+    817:817: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):1291:1291 -> a
+    817:817:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1278 -> a
+    1:2:boolean dontRewrite(com.android.tools.r8.graph.DexClassAndMethod):615:616 -> b
+    3:3:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():43:43 -> b
+    3:3:boolean dontRewrite(com.android.tools.r8.graph.DexClassAndMethod):617 -> b
+    4:4:boolean dontRewrite(com.android.tools.r8.graph.DexClassAndMethod):617:617 -> b
+    5:10:java.util.Map processEmulatedInterfaceHierarchy():657:662 -> b
+    11:12:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):832:833 -> b
+    13:13:java.lang.String com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getEmulateLibraryInterfaceClassDescriptor(java.lang.String):826:826 -> b
+    13:13:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):834 -> b
+    14:14:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):835:835 -> b
+    15:15:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):872:872 -> b
+    16:19:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1178:1181 -> b
+    20:21:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1197:1198 -> b
+    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getInterfaceClassType(com.android.tools.r8.graph.DexType):881:881 -> b
+    22:22:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1199 -> b
+    23:23:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1201:1201 -> b
+    24:24:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> b
+    24:24:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1201 -> b
+    25:25:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1202:1202 -> b
+    26:26:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():632:632 -> b
+    26:26:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1202 -> b
+    1:1:boolean isEmulatedInterface(com.android.tools.r8.graph.DexType):216:216 -> c
+    2:5:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):552:555 -> c
+    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> c
+    6:6:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):555 -> c
+    7:24:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):561:578 -> c
+    25:25:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isEmulatedInterface(com.android.tools.r8.graph.DexType):216:216 -> c
+    25:25:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):578 -> c
+    26:26:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):579:579 -> c
+    27:29:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod):711:713 -> c
+    30:30:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():43:43 -> c
+    30:30:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod):714 -> c
+    31:31:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod):711:711 -> c
+    32:32:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):886:886 -> c
+    33:33:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isCompanionClassType(com.android.tools.r8.graph.DexType):872:872 -> c
+    33:33:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):886 -> c
+    34:37:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):886:889 -> c
+    38:40:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):888:890 -> c
+    1:1:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):948:948 -> d
+    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):944:944 -> d
+    2:2:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):948 -> d
+    3:3:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1164:1164 -> d
+    4:4:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):34:34 -> d
+    4:4:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1164 -> d
+    5:5:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1165:1165 -> d
+    6:6:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isCompanionClassType(com.android.tools.r8.graph.DexType):872:872 -> d
+    6:6:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1166 -> d
+    7:10:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1166:1169 -> d
+    11:15:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1168:1172 -> d
+    1:6:void warnMissingEmulatedInterface(com.android.tools.r8.graph.DexType):625:630 -> e
+    7:7:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):900:900 -> e
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):867:867 -> e
+    8:8:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):900 -> e
+    9:9:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):900:900 -> e
+com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor -> com.android.tools.r8.internal.ih$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>():157:161 -> <clinit>
-    1:1:void <init>(java.lang.String,int):153:153 -> <init>
-com.android.tools.r8.ir.desugar.InterfaceMethodRewriterFixup -> com.android.tools.r8.internal.Xh:
+    1:5:void <clinit>():140:144 -> <clinit>
+    1:1:void <init>(java.lang.String,int):136:136 -> <init>
+com.android.tools.r8.ir.desugar.InterfaceMethodRewriterFixup -> com.android.tools.r8.internal.jh:
     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>
@@ -38927,14 +39068,14 @@
     16:22:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriterFixup.fixupDexMethodForEnclosingMethod(com.android.tools.r8.graph.DexMethod):56:62 -> a
     16:22:com.android.tools.r8.graph.EnclosingMethodAttribute com.android.tools.r8.ir.desugar.InterfaceMethodRewriterFixup.fixupEnclosingMethodAttribute(com.android.tools.r8.graph.EnclosingMethodAttribute):45 -> a
     16:22:void run():36 -> a
-    23:23:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):320:320 -> a
+    23:23:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):321:321 -> a
     23:23:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriterFixup.fixupDexMethodForEnclosingMethod(com.android.tools.r8.graph.DexMethod):62 -> a
     23:23:com.android.tools.r8.graph.EnclosingMethodAttribute com.android.tools.r8.ir.desugar.InterfaceMethodRewriterFixup.fixupEnclosingMethodAttribute(com.android.tools.r8.graph.EnclosingMethodAttribute):45 -> a
     23:23:void run():36 -> a
     24:24:com.android.tools.r8.graph.EnclosingMethodAttribute com.android.tools.r8.ir.desugar.InterfaceMethodRewriterFixup.fixupEnclosingMethodAttribute(com.android.tools.r8.graph.EnclosingMethodAttribute):47:47 -> a
     24:24:void run():36 -> a
     25:25:void run():35:35 -> a
-com.android.tools.r8.ir.desugar.InterfaceProcessor -> com.android.tools.r8.internal.Yh:
+com.android.tools.r8.ir.desugar.InterfaceProcessor -> com.android.tools.r8.internal.kh:
     java.util.Map syntheticClasses -> d
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter rewriter -> c
@@ -38949,21 +39090,21 @@
     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):945:945 -> a
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):867:867 -> 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):2333:2333 -> a
+    15:15:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createClinitMethod(com.android.tools.r8.graph.DexType):2314:2314 -> 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():164:164 -> a
+    17:17:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():158:158 -> 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
@@ -38973,146 +39114,152 @@
     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):296:296 -> 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):297:297 -> 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:40: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:225 -> a
-    37:40:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):97 -> a
-    41:52:boolean com.android.tools.r8.ir.desugar.InterfaceProcessor.canMoveToCompanionClass(com.android.tools.r8.graph.DexEncodedMethod):370:381 -> a
-    41:52: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 -> a
-    41:52:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):97 -> a
-    53:65: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:247 -> a
-    53:65:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):97 -> a
-    66: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):246:253 -> a
-    66: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:74: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):296:296 -> a
-    74:74: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):276 -> a
-    74:74: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 -> a
-    74:74:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):97 -> a
-    75:78: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):257:260 -> a
-    75:78:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):97 -> a
-    79: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):239:240 -> a
-    79: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.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
-    81:81:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> 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):240 -> 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:82: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):240:240 -> a
-    82:82:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):97 -> a
-    83:86: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:230 -> a
-    83:86:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):97 -> a
-    87:87:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
-    87:87:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    87:87: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):230 -> a
-    87:87:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):97 -> a
-    88:88: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):230:230 -> a
-    88:88:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):97 -> a
-    89:100:boolean com.android.tools.r8.ir.desugar.InterfaceProcessor.interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):400:411 -> a
-    89: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):264 -> a
-    89: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:103: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):390:392 -> a
-    101:103:boolean com.android.tools.r8.ir.desugar.InterfaceProcessor.interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):411 -> a
-    101:103: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):264 -> a
-    101:103:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):97 -> a
-    104:110:boolean com.android.tools.r8.ir.desugar.InterfaceProcessor.interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):412:418 -> a
-    104:110: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):264 -> a
-    104:110:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):97 -> a
-    111:117: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):265:271 -> a
-    111:117:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):97 -> a
-    118:137: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):280:299 -> a
-    118:137:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):101 -> a
-    138:141:boolean com.android.tools.r8.ir.desugar.InterfaceProcessor.isStaticMethod(com.android.tools.r8.graph.DexEncodedMethod):434:437 -> a
-    138:141: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):300 -> a
-    138:141:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):101 -> a
-    142:156: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):301:315 -> a
-    142:156:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):101 -> a
-    157:157: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):296:296 -> a
-    157:157: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):276 -> a
-    157:157: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):315 -> a
-    157:157:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):101 -> a
-    158:185: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):317:344 -> a
-    158:185:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):101 -> a
-    186:186: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):296:296 -> a
-    186:186: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):276 -> a
-    186: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):344 -> a
-    186: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: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):348:350 -> a
-    187: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:193: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):332:335 -> a
-    190:193:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):101 -> a
-    194:194:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
-    194:194:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    194:194: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):335 -> a
-    194:194:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):101 -> a
-    195:195: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):335:335 -> 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):363:374 -> 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:63: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:242 -> a
+    52:63:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):97 -> a
+    64:71: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):241:248 -> a
+    64:71:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):97 -> a
+    72:72: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):297:297 -> a
+    72:72: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):277 -> a
+    72: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):248 -> a
+    72: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:76: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):252:255 -> a
+    73:76:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):97 -> a
+    77:78: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
+    77:78:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):97 -> a
+    79:79:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
+    79:79:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    79: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):236 -> a
+    79: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.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
+    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:82: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
+    81:82:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):97 -> a
+    83:83:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
+    83:83:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    83: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):227 -> a
+    83: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.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
+    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:96:boolean com.android.tools.r8.ir.desugar.InterfaceProcessor.interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):393:404 -> a
+    85:96: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):259 -> a
+    85:96:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):97 -> a
+    97:99: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):383:385 -> a
+    97:99:boolean com.android.tools.r8.ir.desugar.InterfaceProcessor.interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):404 -> a
+    97:99: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):259 -> a
+    97:99:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):97 -> a
+    100:100:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    100: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):385 -> a
+    100:100:boolean com.android.tools.r8.ir.desugar.InterfaceProcessor.interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):404 -> a
+    100: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):259 -> a
+    100: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:107:boolean com.android.tools.r8.ir.desugar.InterfaceProcessor.interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):405:411 -> a
+    101:107: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):259 -> a
+    101:107:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):97 -> a
+    108:114: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:266 -> a
+    108:114:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):97 -> a
+    115:133: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):275:293 -> a
+    115:133:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):101 -> a
+    134:137:boolean com.android.tools.r8.ir.desugar.InterfaceProcessor.isStaticMethod(com.android.tools.r8.graph.DexEncodedMethod):427:430 -> a
+    134:137: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):294 -> a
+    134:137:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):101 -> a
+    138:152: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:309 -> a
+    138:152:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):101 -> a
+    153:153: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):297:297 -> a
+    153:153: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):277 -> a
+    153:153: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):309 -> a
+    153:153:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):101 -> a
+    154:180: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):311:337 -> a
+    154:180:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):101 -> a
+    181:181: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):297:297 -> a
+    181:181: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):277 -> a
+    181:181: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):337 -> a
+    181:181:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):101 -> a
+    182:184: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):341:343 -> a
+    182:184:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):101 -> a
+    185: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):325:328 -> a
+    185: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:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
+    189:189:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> 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):328 -> 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):328:328 -> 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:191:boolean com.android.tools.r8.ir.desugar.InterfaceProcessor.isStaticMethod(com.android.tools.r8.graph.DexEncodedMethod):428:428 -> a
+    191:191: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):294 -> a
+    191:191:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):101 -> a
+    192:194: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):346:348 -> a
+    192:194:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):101 -> a
+    195:195:void com.android.tools.r8.graph.MethodCollection.setSingleDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):296:296 -> a
+    195:195: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):348 -> a
     195:195:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):101 -> a
-    196:196:boolean com.android.tools.r8.ir.desugar.InterfaceProcessor.isStaticMethod(com.android.tools.r8.graph.DexEncodedMethod):435:435 -> a
-    196:196: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):300 -> a
+    196:196: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):350:350 -> a
     196:196:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):101 -> a
-    197:199: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):353:355 -> a
-    197:199:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):101 -> a
-    200:200:void com.android.tools.r8.graph.MethodCollection.setSingleDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):296:296 -> a
-    200:200: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):355 -> a
-    200:200:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):101 -> a
-    201:201: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):357:357 -> a
-    201:201:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):101 -> a
-    202:216:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):103:117 -> a
-    217:217:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):945:945 -> a
-    217:217:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):117 -> a
-    218:242:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):118:142 -> a
-    243:243:boolean lambda$hasStaticMethodThatTriggersNonTrivialClassInitializer$0(com.android.tools.r8.graph.DexEncodedMethod):164:164 -> a
-    244:252:com.android.tools.r8.graph.DexEncodedField createStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):177:185 -> a
-    253:253:com.android.tools.r8.graph.FieldAccessFlags$Builder com.android.tools.r8.graph.FieldAccessFlags.builder():48:48 -> a
-    253:253:com.android.tools.r8.graph.DexEncodedField createStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):185 -> a
-    254:256:com.android.tools.r8.graph.DexEncodedField createStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):185:187 -> a
-    257:257: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):80:80 -> a
-    257:257:com.android.tools.r8.graph.DexEncodedField createStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):187 -> a
-    258:258:boolean lambda$createStaticClinitFieldToTriggerInterfaceInitialization$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField):182:182 -> a
-    259:263:void addSuperTypes(com.android.tools.r8.graph.DexClass,java.util.Deque):425:429 -> a
+    197:211:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):103:117 -> a
+    212:212:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):867:867 -> a
+    212:212:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):117 -> a
+    213:237:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):118:142 -> a
+    238:238:boolean lambda$hasStaticMethodThatTriggersNonTrivialClassInitializer$0(com.android.tools.r8.graph.DexEncodedMethod):164:164 -> a
+    239:247:com.android.tools.r8.graph.DexEncodedField createStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):177:185 -> a
+    248:248:com.android.tools.r8.graph.FieldAccessFlags$Builder com.android.tools.r8.graph.FieldAccessFlags.builder():48:48 -> a
+    248:248:com.android.tools.r8.graph.DexEncodedField createStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):185 -> a
+    249:251:com.android.tools.r8.graph.DexEncodedField createStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):185:187 -> a
+    252:252: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):74:74 -> a
+    252:252:com.android.tools.r8.graph.DexEncodedField createStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):187 -> a
+    253:253:boolean lambda$createStaticClinitFieldToTriggerInterfaceInitialization$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField):182:182 -> a
+    254:258:void addSuperTypes(com.android.tools.r8.graph.DexClass,java.util.Deque):418:422 -> 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):301:301 -> b
+    2:2:java.lang.Iterable com.android.tools.r8.graph.DexClass.staticFields(java.util.function.Predicate):292:292 -> 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):362:366 -> c
+    1:5:com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier getChecksumSupplier(com.android.tools.r8.graph.DexProgramClass):355:359 -> 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.Yh$a:
+com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens -> com.android.tools.r8.internal.kh$a:
     com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap extraOriginalMethodSignatures -> m
     boolean $assertionsDisabled -> l
-    1:1:void <clinit>():442:442 -> <clinit>
-    1:8:void <init>(java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory):455:462 -> <init>
+    1:1:void <clinit>():435:435 -> <clinit>
+    1:8:void <init>(java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory):448:455 -> <init>
     com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens asInterfaceProcessorLens() -> a
-    1:1:com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens find(com.android.tools.r8.graph.GraphLens):466:466 -> a
+    1:1:com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens find(com.android.tools.r8.graph.GraphLens):459:459 -> a
     2:2:boolean com.android.tools.r8.graph.GraphLens.isInterfaceProcessorLens():0:0 -> a
-    2:2:com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens find(com.android.tools.r8.graph.GraphLens):466 -> a
-    3:11:com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens find(com.android.tools.r8.graph.GraphLens):467:475 -> 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):519:519 -> b
-    1:1:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):507:507 -> f
+    2:2:com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens find(com.android.tools.r8.graph.GraphLens):459 -> a
+    3:11:com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens find(com.android.tools.r8.graph.GraphLens):460:468 -> 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):512:512 -> b
+    1:1:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):500:500 -> f
     2:2:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap.getRepresentativeValueOrDefault(java.lang.Object,java.lang.Object):27:27 -> f
-    2:2:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):508 -> f
-    3:3:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):508:508 -> f
+    2:2:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):501 -> f
+    3:3:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):501:501 -> f
     4:4:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap.getRepresentativeValueOrDefault(java.lang.Object,java.lang.Object):27:27 -> f
-    4:4:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):507 -> f
-    5:5:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):507:507 -> f
-    1:1:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):513:513 -> g
+    4:4:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):500 -> f
+    5:5:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):500:500 -> f
+    1:1:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):506:506 -> g
     2:2:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap.getRepresentativeKeyOrDefault(java.lang.Object,java.lang.Object):20:20 -> g
-    2:2:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):514 -> g
-    3:3:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):514:514 -> g
+    2:2:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):507 -> g
+    3:3:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):507:507 -> g
     4:4:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap.getRepresentativeKeyOrDefault(java.lang.Object,java.lang.Object):20:20 -> g
-    4:4:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):513 -> g
-    5:5:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):513:513 -> g
-    1:1:com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap getExtraOriginalMethodSignatures():487:487 -> l
-    1:3:void toggleMappingToExtraMethods():480:482 -> m
-com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder -> com.android.tools.r8.internal.Yh$a$a:
+    4:4:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):506 -> g
+    5:5:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):506:506 -> g
+    1:1:com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap getExtraOriginalMethodSignatures():480:480 -> l
+    1:3:void toggleMappingToExtraMethods():473:475 -> m
+com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder -> com.android.tools.r8.internal.kh$a$a:
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap extraOriginalMethodSignatures -> f
     boolean $assertionsDisabled -> e
-    1:1:void <clinit>():526:526 -> <clinit>
-    1:3:void <init>():526:528 -> <init>
-    1:6:com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens):540:545 -> a
-    1:3:void recordCodeMovedToCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):532:534 -> b
-com.android.tools.r8.ir.desugar.InvokeSpecialBridgeSynthesizer -> com.android.tools.r8.internal.Ci:
+    1:1:void <clinit>():519:519 -> <clinit>
+    1:3:void <init>():519:521 -> <init>
+    1:1:com.android.tools.r8.graph.GraphLens build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens):519:519 -> a
+    1:6:com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens):533:538 -> b
+    1:3:void recordCodeMovedToCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):525:527 -> c
+com.android.tools.r8.ir.desugar.InvokeSpecialBridgeSynthesizer -> com.android.tools.r8.internal.Nh:
     java.util.Map bridges -> c
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set seenBridges -> d
@@ -39124,16 +39271,19 @@
     5:5:com.android.tools.r8.graph.DexMethod registerBridgeForMethod(com.android.tools.r8.graph.DexEncodedMethod):48:48 -> a
     6:13:void insertBridgesForD8(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):75:82 -> a
     14:16:void lambda$insertBridgesForD8$2(com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):78:80 -> a
-    17:20:com.android.tools.r8.graph.ProgramMethod getVirtualMethod(com.android.tools.r8.graph.DexMethod):86:89 -> a
-    21:34:com.android.tools.r8.graph.ProgramMethod insertBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):93:106 -> a
-    35:35:com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis getEnqueuerInvokeAnalysis():110:110 -> a
+    17:17:com.android.tools.r8.graph.ProgramMethod getVirtualMethod(com.android.tools.r8.graph.DexMethod):86:86 -> a
+    18:18:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    18:18:com.android.tools.r8.graph.ProgramMethod getVirtualMethod(com.android.tools.r8.graph.DexMethod):86 -> a
+    19:22:com.android.tools.r8.graph.ProgramMethod getVirtualMethod(com.android.tools.r8.graph.DexMethod):86:89 -> a
+    23:36:com.android.tools.r8.graph.ProgramMethod insertBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):93:106 -> a
+    37:37:com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis getEnqueuerInvokeAnalysis():110:110 -> a
     1:5:com.android.tools.r8.graph.DexMethod lambda$registerBridgeForMethod$0(com.android.tools.r8.graph.DexMethod):51:55 -> b
-    6:6: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):287:287 -> b
+    6:6: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):282:282 -> b
     6:6:com.android.tools.r8.graph.DexMethod lambda$registerBridgeForMethod$0(com.android.tools.r8.graph.DexMethod):51 -> b
     7:8:com.android.tools.r8.utils.collections.SortedProgramMethodSet insertBridgesForR8():61:62 -> b
     9:10:void lambda$insertBridgesForR8$1(com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):64:65 -> b
-com.android.tools.r8.ir.desugar.InvokeSpecialBridgeSynthesizer$1 -> com.android.tools.r8.internal.Ai:
-com.android.tools.r8.ir.desugar.InvokeSpecialBridgeSynthesizer$InvokeSpecialBridgeAnalysis -> com.android.tools.r8.internal.Bi:
+com.android.tools.r8.ir.desugar.InvokeSpecialBridgeSynthesizer$1 -> com.android.tools.r8.internal.Lh:
+com.android.tools.r8.ir.desugar.InvokeSpecialBridgeSynthesizer$InvokeSpecialBridgeAnalysis -> com.android.tools.r8.internal.Mh:
     com.android.tools.r8.ir.desugar.InvokeSpecialBridgeSynthesizer this$0 -> a
     1:1:void <init>(com.android.tools.r8.ir.desugar.InvokeSpecialBridgeSynthesizer):113:113 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.desugar.InvokeSpecialBridgeSynthesizer,com.android.tools.r8.ir.desugar.InvokeSpecialBridgeSynthesizer$1):113:113 -> <init>
@@ -39142,9 +39292,7 @@
     void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod) -> c
     1:7:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):120:126 -> d
     void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod) -> e
-com.android.tools.r8.ir.desugar.LambdaClass -> com.android.tools.r8.internal.Dn:
-    com.android.tools.r8.graph.DexField lambdaField -> i
-    com.android.tools.r8.graph.DexProgramClass clazz -> k
+com.android.tools.r8.ir.desugar.LambdaClass -> com.android.tools.r8.internal.Im:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> a
     com.android.tools.r8.graph.AppView appView -> c
     com.android.tools.r8.ir.desugar.LambdaRewriter rewriter -> d
@@ -39152,177 +39300,190 @@
     com.android.tools.r8.graph.DexMethod classConstructor -> h
     com.android.tools.r8.graph.DexMethod constructor -> g
     com.android.tools.r8.ir.desugar.LambdaClass$Target target -> j
+    java.util.Collection synthesizedFrom -> l
+    com.android.tools.r8.graph.DexField lambdaField -> i
+    java.util.function.Supplier lazyDexClass -> m
     boolean $assertionsDisabled -> b
+    java.util.concurrent.atomic.AtomicBoolean addToMainDexList -> k
     com.android.tools.r8.graph.DexType type -> e
-    1:3:void <clinit>():58:60 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.LambdaDescriptor):79:79 -> <init>
-    2:33:void <init>(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.LambdaDescriptor):72:103 -> <init>
-    1:4:void setClass(com.android.tools.r8.graph.DexProgramClass):112:115 -> a
-    5:5:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):119:119 -> a
-    6:19:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeStaticFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):238:251 -> a
-    6:19:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):120 -> a
-    20:20: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):80:80 -> a
-    20:20:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeStaticFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):251 -> a
-    20:20:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):120 -> a
-    21:21:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeStaticFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):242:242 -> a
-    21:21:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):120 -> a
-    22:22:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeStaticFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):241:241 -> a
-    22:22:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):120 -> a
-    23:35:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeInstanceFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):218:230 -> a
-    23:35:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
-    36:36: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):80:80 -> a
-    36:36:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeInstanceFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):230 -> a
-    36:36:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
-    37:45:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeInstanceFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):225:233 -> a
-    37:45:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
-    46:60:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):182:196 -> a
-    46:60:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):122 -> a
-    61:69:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode.build(com.android.tools.r8.ir.desugar.LambdaClass):26:34 -> a
-    61:69:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):196 -> a
-    61:69:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):122 -> a
-    70:94:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode.build(com.android.tools.r8.ir.desugar.LambdaClass):31:55 -> a
-    70:94:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):196 -> a
-    70:94:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):122 -> a
-    95:95: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):296:296 -> a
-    95:95: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):276 -> a
-    95:95:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):196 -> a
-    95:95:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):122 -> a
-    96:118:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):186:208 -> a
-    96:118:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):122 -> a
-    119:130:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.LambdaClassConstructorSourceCode.build(com.android.tools.r8.ir.desugar.LambdaClass):24:35 -> a
-    119:130:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):209 -> a
-    119:130:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):122 -> a
-    131:131: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):296:296 -> a
-    131:131: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):276 -> a
-    131:131:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):209 -> a
-    131:131:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):122 -> a
-    132:144:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):201:213 -> a
-    132:144:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):122 -> a
-    145:159:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeVirtualMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):141:155 -> a
-    145:159:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):123 -> a
-    160:160: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):296:296 -> a
-    160:160: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):276 -> a
-    160:160:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeVirtualMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):155 -> a
-    160:160:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):123 -> a
-    161:187:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeVirtualMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):147:173 -> a
-    161:187:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):123 -> a
-    188:193:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.LambdaBridgeMethodSourceCode.build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):17:22 -> a
-    188:193:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeVirtualMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):174 -> a
-    188:193:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):123 -> a
-    194:194: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):296:296 -> a
-    194:194: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):276 -> a
-    194:194:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeVirtualMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):174 -> a
-    194:194:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):123 -> a
-    195:210:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeVirtualMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):162:177 -> a
-    195:210:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):123 -> a
-    211:216:com.android.tools.r8.graph.DexField getCaptureField(int):127:132 -> a
-    217:217:com.android.tools.r8.graph.DexField getCaptureField(int):129:129 -> a
-    218:218:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):259:259 -> a
-    219:220:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.delegatesToLambdaImplMethod():182:183 -> a
-    219:220:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):259 -> a
-    221:271:com.android.tools.r8.ir.desugar.LambdaClass$Target com.android.tools.r8.ir.desugar.LambdaClass.createLambdaImplMethodTarget(com.android.tools.r8.graph.ProgramMethod):282:332 -> a
-    221:271:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):260 -> a
-    272:272:com.android.tools.r8.ir.desugar.LambdaClass$Target com.android.tools.r8.ir.desugar.LambdaClass.createLambdaImplMethodTarget(com.android.tools.r8.graph.ProgramMethod):331:331 -> a
-    272:272:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):260 -> a
-    273:273:com.android.tools.r8.ir.desugar.LambdaClass$Target com.android.tools.r8.ir.desugar.LambdaClass.createLambdaImplMethodTarget(com.android.tools.r8.graph.ProgramMethod):326:326 -> a
-    273:273:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):260 -> a
-    274:287:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):264:277 -> a
-    288:288:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):266:266 -> a
-    289:291:com.android.tools.r8.ir.desugar.LambdaClass$Target com.android.tools.r8.ir.desugar.LambdaClass.createInterfaceMethodTarget(com.android.tools.r8.graph.ProgramMethod):420:422 -> a
-    289:291:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):268 -> a
-    292:312:com.android.tools.r8.ir.desugar.LambdaClass$Target com.android.tools.r8.ir.desugar.LambdaClass.createConstructorTarget(com.android.tools.r8.graph.ProgramMethod):394:414 -> a
-    292:312:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):270 -> a
-    313:315:com.android.tools.r8.ir.desugar.LambdaClass$Target com.android.tools.r8.ir.desugar.LambdaClass.createConstructorTarget(com.android.tools.r8.graph.ProgramMethod):413:415 -> a
-    313:315:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):270 -> a
-    316:318:com.android.tools.r8.ir.desugar.LambdaClass$Target com.android.tools.r8.ir.desugar.LambdaClass.createInstanceMethodTarget(com.android.tools.r8.graph.ProgramMethod):339:339 -> a
-    316:318:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):275 -> a
-    321:343:com.android.tools.r8.ir.desugar.LambdaClass$Target com.android.tools.r8.ir.desugar.LambdaClass.createInstanceMethodTarget(com.android.tools.r8.graph.ProgramMethod):342:364 -> a
-    321:343:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):275 -> a
-    344:347:com.android.tools.r8.ir.desugar.LambdaClass$Target com.android.tools.r8.ir.desugar.LambdaClass.createInstanceMethodTarget(com.android.tools.r8.graph.ProgramMethod):363:366 -> a
-    344:347:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):275 -> a
-    348:363:com.android.tools.r8.ir.desugar.LambdaClass$Target com.android.tools.r8.ir.desugar.LambdaClass.createStaticMethodTarget(com.android.tools.r8.graph.ProgramMethod):372:387 -> a
-    348:363:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):272 -> a
-    364:368:com.android.tools.r8.ir.desugar.LambdaClass$Target com.android.tools.r8.ir.desugar.LambdaClass.createStaticMethodTarget(com.android.tools.r8.graph.ProgramMethod):384:388 -> a
-    364:368:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):272 -> a
-    369:371:com.android.tools.r8.graph.DexString generateUniqueLambdaMethodName():426:428 -> a
-    1:2:com.android.tools.r8.graph.DexProgramClass getLambdaProgramClass():107:108 -> b
-    1:1:boolean isStateless():136:136 -> c
+    1:3:void <clinit>():68:70 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):90:90 -> <init>
+    2:39:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):80:117 -> <init>
+    1:6:com.android.tools.r8.graph.DexField getCaptureField(int):207:212 -> a
+    7:7:com.android.tools.r8.graph.DexField getCaptureField(int):209:209 -> a
+    8:15:void addSynthesizedFrom(com.android.tools.r8.graph.DexProgramClass):220:227 -> a
+    16:16:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):359:359 -> 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):382:408 -> a
+    17:43:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):360 -> a
+    44:44:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> 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):409 -> a
+    44:44:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):360 -> 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):409:432 -> a
+    45:68:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):360 -> a
+    69:69:com.android.tools.r8.ir.desugar.LambdaClass$Target com.android.tools.r8.ir.desugar.LambdaClass.createLambdaImplMethodTarget(com.android.tools.r8.graph.ProgramMethod):431:431 -> a
+    69:69:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):360 -> a
+    70:70:com.android.tools.r8.ir.desugar.LambdaClass$Target com.android.tools.r8.ir.desugar.LambdaClass.createLambdaImplMethodTarget(com.android.tools.r8.graph.ProgramMethod):426:426 -> a
+    70:70:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):360 -> a
+    71:84:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):364:377 -> a
+    85:87:com.android.tools.r8.ir.desugar.LambdaClass$Target com.android.tools.r8.ir.desugar.LambdaClass.createInstanceMethodTarget(com.android.tools.r8.graph.ProgramMethod):439:439 -> a
+    85:87:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):375 -> a
+    90:112:com.android.tools.r8.ir.desugar.LambdaClass$Target com.android.tools.r8.ir.desugar.LambdaClass.createInstanceMethodTarget(com.android.tools.r8.graph.ProgramMethod):442:464 -> a
+    90:112:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):375 -> a
+    113:116:com.android.tools.r8.ir.desugar.LambdaClass$Target com.android.tools.r8.ir.desugar.LambdaClass.createInstanceMethodTarget(com.android.tools.r8.graph.ProgramMethod):463:466 -> a
+    113:116:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):375 -> a
+    117:132:com.android.tools.r8.ir.desugar.LambdaClass$Target com.android.tools.r8.ir.desugar.LambdaClass.createStaticMethodTarget(com.android.tools.r8.graph.ProgramMethod):472:487 -> a
+    117:132:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):372 -> a
+    133:137:com.android.tools.r8.ir.desugar.LambdaClass$Target com.android.tools.r8.ir.desugar.LambdaClass.createStaticMethodTarget(com.android.tools.r8.graph.ProgramMethod):484:488 -> a
+    133:137:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):372 -> a
+    138:158:com.android.tools.r8.ir.desugar.LambdaClass$Target com.android.tools.r8.ir.desugar.LambdaClass.createConstructorTarget(com.android.tools.r8.graph.ProgramMethod):494:514 -> a
+    138:158:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):370 -> a
+    159:161:com.android.tools.r8.ir.desugar.LambdaClass$Target com.android.tools.r8.ir.desugar.LambdaClass.createConstructorTarget(com.android.tools.r8.graph.ProgramMethod):513:515 -> a
+    159:161:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):370 -> a
+    162:164:com.android.tools.r8.ir.desugar.LambdaClass$Target com.android.tools.r8.ir.desugar.LambdaClass.createInterfaceMethodTarget(com.android.tools.r8.graph.ProgramMethod):520:522 -> a
+    162:164:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):368 -> a
+    165:165:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):366:366 -> a
+    166:168:com.android.tools.r8.graph.DexString generateUniqueLambdaMethodName():526:528 -> a
+    1:1:com.android.tools.r8.graph.DexProgramClass getOrCreateLambdaClass():147:147 -> b
+    2:10:long computeChecksumForSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):195:203 -> b
+    1:1:boolean isStateless():216:216 -> c
     2:2:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.isStateless():188:188 -> c
-    2:2:boolean isStateless():136 -> c
-com.android.tools.r8.ir.desugar.LambdaClass$ClassMethodWithAccessorTarget -> com.android.tools.r8.internal.xn:
+    2:2:boolean isStateless():216 -> c
+    1:13:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():151:163 -> d
+    14:17:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.ir.desugar.LambdaClass.buildInterfaces():350:353 -> d
+    14:17:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():164 -> d
+    18:25:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():164:171 -> d
+    26:42:com.android.tools.r8.graph.DexEncodedField[] com.android.tools.r8.ir.desugar.LambdaClass.synthesizeStaticFields():327:343 -> d
+    26:42:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():172 -> d
+    43:43: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):74:74 -> d
+    43:43:com.android.tools.r8.graph.DexEncodedField[] com.android.tools.r8.ir.desugar.LambdaClass.synthesizeStaticFields():343 -> d
+    43:43:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():172 -> d
+    44:44:com.android.tools.r8.graph.DexEncodedField[] com.android.tools.r8.ir.desugar.LambdaClass.synthesizeStaticFields():343:343 -> d
+    44:44:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():172 -> d
+    45:57:com.android.tools.r8.graph.DexEncodedField[] com.android.tools.r8.ir.desugar.LambdaClass.synthesizeInstanceFields():307:319 -> d
+    45:57:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():173 -> d
+    58:58: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):74:74 -> d
+    58:58:com.android.tools.r8.graph.DexEncodedField[] com.android.tools.r8.ir.desugar.LambdaClass.synthesizeInstanceFields():319 -> d
+    58:58:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():173 -> d
+    59:59:com.android.tools.r8.graph.DexEncodedField[] com.android.tools.r8.ir.desugar.LambdaClass.synthesizeInstanceFields():319:319 -> d
+    59:59:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():173 -> d
+    60:74:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods():271:285 -> d
+    60:74:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():174 -> d
+    75:83:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode.build(com.android.tools.r8.ir.desugar.LambdaClass):26:34 -> d
+    75:83:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods():285 -> d
+    75:83:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():174 -> d
+    84:108:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode.build(com.android.tools.r8.ir.desugar.LambdaClass):31:55 -> d
+    84:108:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods():285 -> d
+    84:108:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():174 -> d
+    109:109: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):277:277 -> d
+    109:109:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods():285 -> d
+    109:109:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():174 -> d
+    110:122:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods():285:297 -> d
+    110:122:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():174 -> d
+    123:134:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.LambdaClassConstructorSourceCode.build(com.android.tools.r8.ir.desugar.LambdaClass):24:35 -> d
+    123:134:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods():298 -> d
+    123:134:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():174 -> d
+    135:135: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):277:277 -> d
+    135:135:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods():298 -> d
+    135:135:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():174 -> d
+    136:138:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods():298:300 -> d
+    136:138:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():174 -> d
+    139:151:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.LambdaClass.synthesizeVirtualMethods(com.android.tools.r8.graph.DexMethod):232:244 -> d
+    139:151:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():175 -> d
+    152:152: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):277:277 -> d
+    152:152:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.LambdaClass.synthesizeVirtualMethods(com.android.tools.r8.graph.DexMethod):244 -> d
+    152:152:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():175 -> d
+    153:171:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.LambdaClass.synthesizeVirtualMethods(com.android.tools.r8.graph.DexMethod):244:262 -> d
+    153:171:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():175 -> d
+    172:177:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.LambdaBridgeMethodSourceCode.build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):17:22 -> d
+    172:177:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.LambdaClass.synthesizeVirtualMethods(com.android.tools.r8.graph.DexMethod):263 -> d
+    172:177:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():175 -> d
+    178:178: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):277:277 -> d
+    178:178:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.LambdaClass.synthesizeVirtualMethods(com.android.tools.r8.graph.DexMethod):263 -> d
+    178:178:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():175 -> d
+    179:179:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.LambdaClass.synthesizeVirtualMethods(com.android.tools.r8.graph.DexMethod):263:263 -> d
+    179:179:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():175 -> d
+    180:189:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():175:184 -> d
+com.android.tools.r8.ir.desugar.LambdaClass$ClassMethodWithAccessorTarget -> com.android.tools.r8.internal.Cm:
     boolean $assertionsDisabled -> g
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> h
-    1:1:void <clinit>():673:673 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):675:676 -> <init>
-    1:26:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):682:707 -> a
-    27:54:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.AccessorMethodSourceCode.build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):16:43 -> a
-    27:54:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):708 -> a
-    55:55:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.AccessorMethodSourceCode.build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):41:41 -> a
-    55:55:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):708 -> a
-    56:61:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.AccessorMethodSourceCode.build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):32:37 -> a
-    56:61:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):708 -> a
-    62:85:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.AccessorMethodSourceCode.build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):22:45 -> a
-    62:85:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):708 -> a
-    86:86: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):276:276 -> a
-    86:86:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):708 -> a
-    87:88:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):711:712 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$InstanceLambdaImplTarget -> com.android.tools.r8.internal.yn:
+    1:1:void <clinit>():753:753 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):755:756 -> <init>
+    1:17:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):762:778 -> a
+    18:45:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.AccessorMethodSourceCode.build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):16:43 -> a
+    18:45:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):779 -> a
+    46:46:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.AccessorMethodSourceCode.build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):41:41 -> a
+    46:46:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):779 -> a
+    47:52:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.AccessorMethodSourceCode.build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):32:37 -> a
+    47:52:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):779 -> a
+    53:76:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.AccessorMethodSourceCode.build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):22:45 -> a
+    53:76:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):779 -> a
+    77:77: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):277:277 -> a
+    77:77:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):779 -> a
+    78:82:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):783:787 -> a
+    83:83:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):785:785 -> a
+com.android.tools.r8.ir.desugar.LambdaClass$InstanceLambdaImplTarget -> com.android.tools.r8.internal.Dm:
     boolean $assertionsDisabled -> g
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> h
-    1:1:void <clinit>():574:574 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):576:577 -> <init>
-    1:8:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):583:590 -> a
-    9:22:com.android.tools.r8.graph.DexEncodedMethod lambda$modifyLambdaImplementationMethod$0(com.android.tools.r8.graph.DexEncodedMethod):601:614 -> a
-    23:23: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):276:276 -> a
-    23:23:com.android.tools.r8.graph.DexEncodedMethod lambda$modifyLambdaImplementationMethod$0(com.android.tools.r8.graph.DexEncodedMethod):614 -> a
-    24:25:com.android.tools.r8.graph.DexEncodedMethod lambda$modifyLambdaImplementationMethod$0(com.android.tools.r8.graph.DexEncodedMethod):616:617 -> a
-    26:38:com.android.tools.r8.graph.ProgramMethod createSyntheticAccessor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):634:646 -> a
-    39:39:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode.builder(com.android.tools.r8.graph.DexMethod):24:24 -> a
-    39:39:com.android.tools.r8.graph.ProgramMethod createSyntheticAccessor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):646 -> a
-    40:53:com.android.tools.r8.graph.ProgramMethod createSyntheticAccessor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):646:659 -> a
-    54:54: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):296:296 -> a
-    54:54: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):276 -> a
-    54:54:com.android.tools.r8.graph.ProgramMethod createSyntheticAccessor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):659 -> a
-    55:58:com.android.tools.r8.graph.ProgramMethod createSyntheticAccessor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):664:667 -> a
-    59:59:void lambda$createSyntheticAccessor$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.UseRegistry):662:662 -> a
-    1:31:com.android.tools.r8.graph.ProgramMethod modifyLambdaImplementationMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):597:627 -> b
-com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> com.android.tools.r8.internal.zn:
+    1:1:void <clinit>():670:670 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):672:673 -> <init>
+    1:5:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):679:683 -> a
+    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    6:6:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):683 -> a
+    7:10:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):683:686 -> a
+    11:24:com.android.tools.r8.graph.DexEncodedMethod lambda$modifyLambdaImplementationMethod$0(com.android.tools.r8.graph.DexEncodedMethod):697:710 -> a
+    25:25: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):277:277 -> a
+    25:25:com.android.tools.r8.graph.DexEncodedMethod lambda$modifyLambdaImplementationMethod$0(com.android.tools.r8.graph.DexEncodedMethod):710 -> a
+    26:27:com.android.tools.r8.graph.DexEncodedMethod lambda$modifyLambdaImplementationMethod$0(com.android.tools.r8.graph.DexEncodedMethod):712:713 -> a
+    28:32:com.android.tools.r8.graph.ProgramMethod createSyntheticAccessor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):722:726 -> a
+    33:33:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode.builder(com.android.tools.r8.graph.DexMethod):24:24 -> a
+    33:33:com.android.tools.r8.graph.ProgramMethod createSyntheticAccessor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):726 -> a
+    34:47:com.android.tools.r8.graph.ProgramMethod createSyntheticAccessor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):726:739 -> a
+    48:48: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):297:297 -> a
+    48:48: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):277 -> a
+    48:48:com.android.tools.r8.graph.ProgramMethod createSyntheticAccessor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):739 -> a
+    49:52:com.android.tools.r8.graph.ProgramMethod createSyntheticAccessor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):744:747 -> a
+    53:53:void lambda$createSyntheticAccessor$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.UseRegistry):742:742 -> a
+    1:24:com.android.tools.r8.graph.ProgramMethod modifyLambdaImplementationMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):693:716 -> b
+com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> com.android.tools.r8.internal.Em:
     boolean $assertionsDisabled -> g
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> h
-    1:1:void <clinit>():502:502 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):504:505 -> <init>
-    1:42:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):512:553 -> a
-    43:57:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.graph.DexEncodedMethod):523:537 -> a
-    58:58: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):276:276 -> a
-    58:58:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.graph.DexEncodedMethod):537 -> a
-    59:63:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.graph.DexEncodedMethod):539:543 -> a
-    64:64:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.graph.DexEncodedMethod):542:542 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$InvalidLambdaImplTarget -> com.android.tools.r8.internal.An:
+    1:1:void <clinit>():602:602 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):604:605 -> <init>
+    1:2:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):612:613 -> a
+    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    3:3:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):613 -> a
+    4:41:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):613:650 -> a
+    42:56:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.graph.DexEncodedMethod):623:637 -> a
+    57:57: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):277:277 -> a
+    57:57:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.graph.DexEncodedMethod):637 -> a
+    58:62:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.graph.DexEncodedMethod):639:643 -> a
+    63:63:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.graph.DexEncodedMethod):642:642 -> a
+com.android.tools.r8.ir.desugar.LambdaClass$InvalidLambdaImplTarget -> com.android.tools.r8.internal.Fm:
     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):563:564 -> <init>
+    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):659:660 -> <init>
     com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean) -> a
-com.android.tools.r8.ir.desugar.LambdaClass$NoAccessorMethodTarget -> com.android.tools.r8.internal.Bn:
-    1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Invoke$Type):470:470 -> <init>
+com.android.tools.r8.ir.desugar.LambdaClass$NoAccessorMethodTarget -> com.android.tools.r8.internal.Gm:
+    1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Invoke$Type):570:570 -> <init>
     com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean) -> a
-com.android.tools.r8.ir.desugar.LambdaClass$StaticLambdaImplTarget -> com.android.tools.r8.internal.Cn:
+com.android.tools.r8.ir.desugar.LambdaClass$StaticLambdaImplTarget -> com.android.tools.r8.internal.Hm:
     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):485:486 -> <init>
-    1:3:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):492:494 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$Target -> com.android.tools.r8.internal.Dn$a:
+    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):585:586 -> <init>
+    1:3:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):592:594 -> a
+com.android.tools.r8.ir.desugar.LambdaClass$Target -> com.android.tools.r8.internal.Im$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
     boolean $assertionsDisabled -> a
     com.android.tools.r8.graph.DexMethod callTarget -> b
     boolean hasEnsuredAccessibility -> d
-    1:1:void <clinit>():434:434 -> <clinit>
-    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):442:446 -> <init>
+    1:1:void <clinit>():534:534 -> <clinit>
+    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):542:546 -> <init>
     com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean) -> a
-    1:5:com.android.tools.r8.graph.ProgramMethod ensureAccessibilityIfNeeded(boolean):454:458 -> b
-com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode -> com.android.tools.r8.internal.En:
+    1:5:com.android.tools.r8.graph.ProgramMethod ensureAccessibilityIfNeeded(boolean):554:558 -> b
+com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode -> com.android.tools.r8.internal.Jm:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():22:22 -> <clinit>
-com.android.tools.r8.ir.desugar.LambdaDescriptor -> com.android.tools.r8.internal.Fn:
+com.android.tools.r8.ir.desugar.LambdaDescriptor -> com.android.tools.r8.internal.Km:
     com.android.tools.r8.graph.MethodAccessFlags targetAccessFlags -> l
     com.android.tools.r8.graph.DexMethodHandle implHandle -> h
     com.android.tools.r8.graph.DexType targetHolder -> m
@@ -39341,46 +39502,46 @@
     2:19:void <init>():45:62 -> <init>
     20:20:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList):78:78 -> <init>
     21:78:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList):45:102 -> <init>
-    1:4:com.android.tools.r8.graph.DexType getImplReceiverType():109:112 -> a
-    5:45:com.android.tools.r8.graph.DexEncodedMethod lookupTargetMethod(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):117:157 -> a
-    46:47:com.android.tools.r8.graph.DexEncodedMethod lookupTargetMethod(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):151:152 -> a
-    48:49:com.android.tools.r8.graph.DexEncodedMethod lookupTargetMethod(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):144:145 -> a
-    50:57:com.android.tools.r8.graph.DexEncodedMethod lookupTargetMethod(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):125:132 -> a
-    58:58:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.isPrivateInstanceMethod(com.android.tools.r8.graph.DexEncodedMethod):168:168 -> a
-    58:58:com.android.tools.r8.graph.DexEncodedMethod lookupTargetMethod(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):132 -> a
-    59:60:com.android.tools.r8.graph.DexEncodedMethod lookupTargetMethod(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):132:133 -> a
-    61:61:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.isPublicizedInstanceMethod(com.android.tools.r8.graph.DexEncodedMethod):173:173 -> a
-    61:61:com.android.tools.r8.graph.DexEncodedMethod lookupTargetMethod(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):133 -> a
-    62:71:com.android.tools.r8.graph.DexEncodedMethod lookupTargetMethod(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):130:139 -> a
-    72:73:boolean isInstanceMethod(com.android.tools.r8.graph.DexEncodedMethod):162:163 -> a
-    74:74:boolean verifyTargetFoundInClass(com.android.tools.r8.graph.DexType):177:177 -> a
-    75:76:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.delegatesToLambdaImplMethod():182:183 -> a
-    75:76:boolean needsAccessor(com.android.tools.r8.graph.ProgramMethod):193 -> a
-    77:89:boolean needsAccessor(com.android.tools.r8.graph.ProgramMethod):197:209 -> a
+    1:41:com.android.tools.r8.graph.DexEncodedMethod lookupTargetMethod(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):117:157 -> a
+    42:43:com.android.tools.r8.graph.DexEncodedMethod lookupTargetMethod(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):151:152 -> a
+    44:45:com.android.tools.r8.graph.DexEncodedMethod lookupTargetMethod(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):144:145 -> a
+    46:53:com.android.tools.r8.graph.DexEncodedMethod lookupTargetMethod(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):125:132 -> a
+    54:54:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.isPrivateInstanceMethod(com.android.tools.r8.graph.DexEncodedMethod):168:168 -> a
+    54:54:com.android.tools.r8.graph.DexEncodedMethod lookupTargetMethod(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):132 -> a
+    55:56:com.android.tools.r8.graph.DexEncodedMethod lookupTargetMethod(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):132:133 -> a
+    57:57:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.isPublicizedInstanceMethod(com.android.tools.r8.graph.DexEncodedMethod):173:173 -> a
+    57:57:com.android.tools.r8.graph.DexEncodedMethod lookupTargetMethod(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):133 -> a
+    58:67:com.android.tools.r8.graph.DexEncodedMethod lookupTargetMethod(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):130:139 -> a
+    68:69:boolean isInstanceMethod(com.android.tools.r8.graph.DexEncodedMethod):162:163 -> a
+    70:70:boolean verifyTargetFoundInClass(com.android.tools.r8.graph.DexType):177:177 -> a
+    71:72:boolean delegatesToLambdaImplMethod():182:183 -> a
+    73:89:boolean needsAccessor(com.android.tools.r8.graph.ProgramMethod):193:209 -> a
     90:134:boolean needsAccessor(com.android.tools.r8.graph.ProgramMethod):206:250 -> a
-    135:138:boolean isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexDefinitionSupplier):265:268 -> a
-    139:164:com.android.tools.r8.ir.desugar.LambdaDescriptor infer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):277:302 -> a
-    165:175:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.isEnforcedSignatureValid(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexProto):415:425 -> a
-    165:175:com.android.tools.r8.ir.desugar.LambdaDescriptor infer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):302 -> a
-    176:201:com.android.tools.r8.ir.desugar.LambdaDescriptor infer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):310:335 -> a
-    202:232:void com.android.tools.r8.ir.desugar.LambdaDescriptor.extractAltMetafactory(com.android.tools.r8.graph.DexItemFactory,java.util.List,java.util.function.Consumer,java.util.function.Consumer):356:386 -> a
-    202:232:com.android.tools.r8.ir.desugar.LambdaDescriptor infer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):335 -> a
-    233:234:com.android.tools.r8.ir.desugar.LambdaDescriptor infer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):304:305 -> a
-    235:236:void lambda$infer$0(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):339:340 -> a
-    237:241:java.util.List getInterfaces(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfoWithClassHierarchy):393:397 -> a
-    242:248:java.lang.Object getBootstrapArgument(java.util.List,int,java.lang.Class):402:408 -> a
-    249:249:java.lang.Object getBootstrapArgument(java.util.List,int,java.lang.Class):403:403 -> a
-    250:258:boolean isSameOrDerived(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):437:445 -> a
-    259:262:boolean isSameOrDerived(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):444:447 -> a
-    1:1:com.android.tools.r8.graph.DexMethod getMainMethod():66:66 -> b
-    2:3: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
-com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode -> com.android.tools.r8.internal.Ln:
+    135:138:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexDefinitionSupplier):265:268 -> a
+    135:138:com.android.tools.r8.ir.desugar.LambdaDescriptor infer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):277 -> a
+    139:163:com.android.tools.r8.ir.desugar.LambdaDescriptor infer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):278:302 -> a
+    164:174:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.isEnforcedSignatureValid(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexProto):415:425 -> a
+    164:174:com.android.tools.r8.ir.desugar.LambdaDescriptor infer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):302 -> a
+    175:200:com.android.tools.r8.ir.desugar.LambdaDescriptor infer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):310:335 -> a
+    201:231:void com.android.tools.r8.ir.desugar.LambdaDescriptor.extractAltMetafactory(com.android.tools.r8.graph.DexItemFactory,java.util.List,java.util.function.Consumer,java.util.function.Consumer):356:386 -> a
+    201:231:com.android.tools.r8.ir.desugar.LambdaDescriptor infer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):335 -> a
+    232:233:com.android.tools.r8.ir.desugar.LambdaDescriptor infer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):304:305 -> a
+    234:235:void lambda$infer$0(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):339:340 -> a
+    236:240:java.util.List getInterfaces(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfoWithClassHierarchy):393:397 -> a
+    241:247:java.lang.Object getBootstrapArgument(java.util.List,int,java.lang.Class):402:408 -> a
+    248:248:java.lang.Object getBootstrapArgument(java.util.List,int,java.lang.Class):403:403 -> a
+    249:257:boolean isSameOrDerived(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):437:445 -> a
+    258:261:boolean isSameOrDerived(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):444:447 -> a
+    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.Qm:
     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):619:619 -> a
+    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):608:608 -> 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
@@ -39400,7 +39561,7 @@
     158:158:int com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.prepareParameterValue(com.android.tools.r8.graph.DexType,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):342:342 -> a
     158:158:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):242 -> a
     159:166:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):240:247 -> a
-    167:167:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.isInterface():462:462 -> a
+    167:167:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.isInterface():562:562 -> a
     167:167:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):247 -> a
     168:168:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):247:247 -> a
     169:180:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):246:257 -> a
@@ -39410,7 +39571,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):619:619 -> a
+    235:235:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):608:608 -> 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
@@ -39455,53 +39616,263 @@
     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.LambdaMainMethodSourceCode$1 -> com.android.tools.r8.internal.Kn:
+com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode$1 -> com.android.tools.r8.internal.Pm:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():461:461 -> <clinit>
-com.android.tools.r8.ir.desugar.LambdaRewriter -> com.android.tools.r8.internal.Wn:
+com.android.tools.r8.ir.desugar.LambdaRewriter -> com.android.tools.r8.internal.bn:
     com.android.tools.r8.graph.DexString instanceFieldName -> c
     com.android.tools.r8.graph.AppView appView -> b
-    java.util.List knownLambdaClasses -> f
     java.util.Set forcefullyMovedMethods -> e
     boolean $assertionsDisabled -> a
-    java.util.Map methodIds -> g
+    java.util.Map knownLambdaClasses -> f
     com.android.tools.r8.ir.desugar.LambdaRewriter$LambdaRewriterLens$Builder lensBuilder -> d
-    1:1:void <clinit>():61:61 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):81:81 -> <init>
-    2:13:void <init>(com.android.tools.r8.graph.AppView):72:83 -> <init>
-    1:2:void forcefullyMoveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):87:88 -> a
-    3:15:void synthesizeAccessibilityBridgesForLambdaClassesD8(java.util.Collection,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):98:110 -> a
-    16:16:int lambda$synthesizeAccessibilityBridgesForLambdaClassesD8$0(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.desugar.LambdaClass):100:100 -> a
-    17:17:int desugarLambdas(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):120:120 -> a
-    18:69:int desugarLambdas(com.android.tools.r8.graph.ProgramMethod,java.util.function.Function):134:185 -> a
-    70:70:java.util.List lambda$desugarLambdas$2(java.util.List):137:137 -> a
-    71:72:void removeLambdaDeserializationMethods(java.lang.Iterable):192:193 -> a
-    73:76:void finalizeLambdaDesugaringForD8(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):200:203 -> a
-    77:79:com.android.tools.r8.ir.desugar.LambdaClass createLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):217:219 -> a
-    80:89:com.android.tools.r8.ir.desugar.LambdaClass createLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):218:227 -> a
-    90:107:com.android.tools.r8.ir.desugar.LambdaClass createLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):224:241 -> a
-    108:108:java.lang.Integer lambda$createLambdaClass$3(com.android.tools.r8.graph.DexMethod,java.lang.Integer):219:219 -> a
-    109:111:java.lang.String lambda$createLambdaClass$4(com.android.tools.r8.graph.ProgramMethod,int):230:232 -> a
-    112:112:void lambda$createLambdaClass$5(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):235:235 -> a
-    113:137:com.android.tools.r8.graph.GraphLens$NestedGraphLens fixup():250:274 -> a
-    138:139:com.android.tools.r8.ir.desugar.LambdaDescriptor 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 -> a
-    138:139:com.android.tools.r8.ir.desugar.LambdaClass lambda$desugarLambdas$1(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexCallSite):123 -> a
-    140:140:com.android.tools.r8.ir.desugar.LambdaClass lambda$desugarLambdas$1(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexCallSite):127:127 -> a
-    1:1:java.util.Set getForcefullyMovedMethods():92:92 -> b
-    2:6:void optimizeSynthesizedClasses(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):208:208 -> b
-    1:1:java.util.Collection getKnownLambdaClasses():246:246 -> c
-com.android.tools.r8.ir.desugar.LambdaRewriter$LambdaRewriterLens -> com.android.tools.r8.internal.Vn:
-    1:1:void <init>(java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory):286:286 -> <init>
-    1:1:com.android.tools.r8.ir.desugar.LambdaRewriter$LambdaRewriterLens com.android.tools.r8.ir.desugar.LambdaRewriter$LambdaRewriterLens.withoutMethodMap():301:301 -> a
-    1:1:com.android.tools.r8.ir.desugar.LambdaRewriter$LambdaRewriterLens access$000(com.android.tools.r8.ir.desugar.LambdaRewriter$LambdaRewriterLens):277 -> a
+    1:1:void <clinit>():69:69 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):95:95 -> <init>
+    2:18:void <init>(com.android.tools.r8.graph.AppView):81:97 -> <init>
+    1:2:void forcefullyMoveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):101:102 -> a
+    3:15:void synthesizeAccessibilityBridgesForLambdaClassesD8(java.util.Collection,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):112:124 -> a
+    16:16:int lambda$synthesizeAccessibilityBridgesForLambdaClassesD8$0(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.desugar.LambdaClass):114:114 -> a
+    17:17:int desugarLambdas(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):134:134 -> a
+    18:69:int desugarLambdas(com.android.tools.r8.graph.ProgramMethod,java.util.function.Function):148:199 -> a
+    70:70:java.util.List lambda$desugarLambdas$2(java.util.List):151:151 -> a
+    71:72:void removeLambdaDeserializationMethods(java.lang.Iterable):206:207 -> a
+    73:75:void finalizeLambdaDesugaringForD8(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):215:215 -> a
+    77:83:void finalizeLambdaDesugaringForD8(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):217:223 -> a
+    84:88:void optimizeSynthesizedClasses(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):228:228 -> a
+    89:89:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):257:257 -> a
+    90:110:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.LambdaClass.createLambdaClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.LambdaDescriptor):123:143 -> a
+    90:110:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):257 -> a
+    111:111:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):259:259 -> a
+    112:113:java.lang.Object com.android.tools.r8.ir.desugar.LambdaRewriter.getKnown(java.util.Map,java.lang.Object):312:313 -> a
+    112:113:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):259 -> a
+    114:116:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):259:261 -> a
+    117:123:java.lang.Object com.android.tools.r8.ir.desugar.LambdaRewriter.putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):318:324 -> a
+    117:123:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):262 -> a
+    124:128:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):262:266 -> a
+    129:129:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():415:415 -> a
+    129:129:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):266 -> a
+    130:138:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):267:275 -> a
+    139:151: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
+    139:151:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):278 -> a
+    152:152: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):307:307 -> a
+    152:152:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):278 -> a
+    153:153: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):306:306 -> a
+    153:153:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):278 -> a
+    154:154: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):302:302 -> a
+    154:154:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):278 -> a
+    155:155:java.lang.Object com.android.tools.r8.ir.desugar.LambdaRewriter.putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):325:325 -> a
+    155:155:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):262 -> a
+    156:158:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):282:284 -> a
+    159:159:java.lang.Object com.android.tools.r8.ir.desugar.LambdaRewriter.getKnown(java.util.Map,java.lang.Object):314:314 -> a
+    159:159:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):259 -> a
+    160:161:com.android.tools.r8.ir.desugar.LambdaDescriptor 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 -> a
+    160:161:com.android.tools.r8.ir.desugar.LambdaClass lambda$desugarLambdas$1(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexCallSite):137 -> a
+    162:162:com.android.tools.r8.ir.desugar.LambdaClass lambda$desugarLambdas$1(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexCallSite):141:141 -> a
+    163:187: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.an:
+    1:1:void <init>(java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory):445:445 -> <init>
+    1:1:com.android.tools.r8.ir.desugar.LambdaRewriter$LambdaRewriterLens com.android.tools.r8.ir.desugar.LambdaRewriter$LambdaRewriterLens.withoutMethodMap():460:460 -> 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():306:306 -> l
-com.android.tools.r8.ir.desugar.LambdaRewriter$LambdaRewriterLens$Builder -> com.android.tools.r8.internal.Un:
+    1:1:com.android.tools.r8.ir.desugar.LambdaRewriter$LambdaRewriterLens$Builder builder():465:465 -> l
+com.android.tools.r8.ir.desugar.LambdaRewriter$LambdaRewriterLens$Builder -> com.android.tools.r8.internal.Zm:
     boolean $assertionsDisabled -> e
-    1:1:void <clinit>():309:309 -> <clinit>
-    1:1:void <init>():309:309 -> <init>
-    1:6:com.android.tools.r8.ir.desugar.LambdaRewriter$LambdaRewriterLens build(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory):311:316 -> a
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper -> com.android.tools.r8.internal.Dv:
+    1:1:void <clinit>():468:468 -> <clinit>
+    1:1:void <init>():468:468 -> <init>
+    1:6:com.android.tools.r8.ir.desugar.LambdaRewriter$LambdaRewriterLens build(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory):470:475 -> a
+com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring -> com.android.tools.r8.internal.Zq:
+    java.util.Map bridges -> c
+    java.util.Map getFieldBridges -> d
+    com.android.tools.r8.graph.AppView appView -> b
+    com.android.tools.r8.graph.DexProgramClass nestConstructor -> f
+    boolean nestConstructorUsed -> g
+    boolean $assertionsDisabled -> a
+    java.util.Map putFieldBridges -> e
+    1:1:void <clinit>():45:45 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):70:70 -> <init>
+    2:11:void <init>(com.android.tools.r8.graph.AppView):63:72 -> <init>
+    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):273:273 -> 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
+    19:22:java.lang.Object lambda$asyncProcessNest$0(com.android.tools.r8.graph.DexProgramClass):122:125 -> a
+    23:27:void com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.processNest(com.android.tools.r8.graph.DexClass,java.util.List):133:137 -> a
+    23:27:java.lang.Object lambda$asyncProcessNest$0(com.android.tools.r8.graph.DexProgramClass):125 -> a
+    28:32:void com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.reportDesugarDependencies(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):164:168 -> a
+    28:32:void com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.processNest(com.android.tools.r8.graph.DexClass,java.util.List):141 -> a
+    28:32:java.lang.Object lambda$asyncProcessNest$0(com.android.tools.r8.graph.DexProgramClass):125 -> a
+    33:37:void com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.processNest(com.android.tools.r8.graph.DexClass,java.util.List):142:146 -> a
+    33:37:java.lang.Object lambda$asyncProcessNest$0(com.android.tools.r8.graph.DexProgramClass):125 -> a
+    38:38:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
+    38:38:void com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.processNest(com.android.tools.r8.graph.DexClass,java.util.List):147 -> a
+    38:38:java.lang.Object lambda$asyncProcessNest$0(com.android.tools.r8.graph.DexProgramClass):125 -> a
+    39:40:void com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.processNest(com.android.tools.r8.graph.DexClass,java.util.List):148:149 -> a
+    39:40:java.lang.Object lambda$asyncProcessNest$0(com.android.tools.r8.graph.DexProgramClass):125 -> a
+    41:43:void com.android.tools.r8.graph.ClasspathMethod.registerCodeReferencesForDesugaring(com.android.tools.r8.graph.UseRegistry):16:18 -> a
+    41:43:void com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.processNest(com.android.tools.r8.graph.DexClass,java.util.List):149 -> a
+    41:43:java.lang.Object lambda$asyncProcessNest$0(com.android.tools.r8.graph.DexProgramClass):125 -> a
+    44:44:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    44:44:void com.android.tools.r8.graph.ClasspathMethod.registerCodeReferencesForDesugaring(com.android.tools.r8.graph.UseRegistry):19 -> a
+    44:44:void com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.processNest(com.android.tools.r8.graph.DexClass,java.util.List):149 -> a
+    44:44:java.lang.Object lambda$asyncProcessNest$0(com.android.tools.r8.graph.DexProgramClass):125 -> a
+    45:45:void com.android.tools.r8.graph.ClasspathMethod.registerCodeReferencesForDesugaring(com.android.tools.r8.graph.UseRegistry):21:21 -> a
+    45:45:void com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.processNest(com.android.tools.r8.graph.DexClass,java.util.List):149 -> a
+    45:45:java.lang.Object lambda$asyncProcessNest$0(com.android.tools.r8.graph.DexProgramClass):125 -> a
+    46:46:void com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.processNest(com.android.tools.r8.graph.DexClass,java.util.List):152:152 -> a
+    46:46:java.lang.Object lambda$asyncProcessNest$0(com.android.tools.r8.graph.DexProgramClass):125 -> a
+    47:67:com.android.tools.r8.graph.DexProgramClass createNestAccessConstructor():177:197 -> a
+    68:70:void synthesizeNestConstructor(com.android.tools.r8.graph.DexApplication$Builder):202:204 -> a
+    71:77:com.android.tools.r8.graph.DexMethod computeMethodBridge(com.android.tools.r8.graph.DexEncodedMethod):235:241 -> a
+    78:85:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.computeMethodBridgeName(com.android.tools.r8.graph.DexEncodedMethod):209:216 -> a
+    78:85:com.android.tools.r8.graph.DexMethod computeMethodBridge(com.android.tools.r8.graph.DexEncodedMethod):242 -> a
+    86:86:com.android.tools.r8.graph.DexMethod computeMethodBridge(com.android.tools.r8.graph.DexEncodedMethod):242:242 -> a
+    87:94:boolean invokeRequiresRewriting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClassAndMethod):271:278 -> a
+    95:102:boolean fieldAccessRequiresRewriting(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClassAndMethod):282:289 -> a
+    103:104:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):309:310 -> a
+    105:106:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):252:253 -> a
+    105:106:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):311 -> a
+    107:107:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():199:199 -> a
+    107:107:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):255 -> a
+    107:107:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):311 -> a
+    108:111:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):255:258 -> a
+    108:111:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):311 -> a
+    112:112:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():199:199 -> a
+    112:112:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):260 -> a
+    112:112:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):311 -> a
+    113:118:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):261:266 -> a
+    113:118:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):311 -> a
+    119:119:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.computeFieldBridgeName(com.android.tools.r8.graph.DexEncodedField,boolean):220:220 -> a
+    119:119:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):267 -> a
+    119:119:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):311 -> a
+    120:120:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():199:199 -> a
+    120:120:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.computeFieldBridgeName(com.android.tools.r8.graph.DexEncodedField,boolean):222 -> a
+    120:120:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):267 -> a
+    120:120:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):311 -> a
+    121:123:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.computeFieldBridgeName(com.android.tools.r8.graph.DexEncodedField,boolean):223:225 -> a
+    121:123:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):267 -> a
+    121:123:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):311 -> a
+    124:124:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():199:199 -> a
+    124:124:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.computeFieldBridgeName(com.android.tools.r8.graph.DexEncodedField,boolean):226 -> a
+    124:124:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):267 -> a
+    124:124:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):311 -> a
+    125:129:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.computeFieldBridgeName(com.android.tools.r8.graph.DexEncodedField,boolean):227:231 -> a
+    125:129:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):267 -> a
+    125:129:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):311 -> a
+    130:130:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):267:267 -> a
+    130:130:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):311 -> a
+    131:139:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):312:320 -> a
+    140:142:com.android.tools.r8.graph.ProgramMethod lambda$ensureFieldAccessBridge$1(com.android.tools.r8.graph.DexEncodedField,boolean,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexField):323:323 -> a
+    143:146:com.android.tools.r8.graph.ProgramMethod lambda$ensureInvokeBridge$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):348:351 -> a
+    147:147:com.android.tools.r8.graph.ProgramMethod lambda$ensureInvokeBridge$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):350:350 -> a
+    1:2:com.android.tools.r8.graph.DexType getNestConstructorType():76:77 -> b
+    3:3:boolean holderRequiresBridge(com.android.tools.r8.graph.DexClass):295:295 -> b
+    4:4:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> b
+    4:4:boolean holderRequiresBridge(com.android.tools.r8.graph.DexClass):297 -> b
+    5:5:boolean holderRequiresBridge(com.android.tools.r8.graph.DexClass):300:300 -> b
+    6:6:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> b
+    6:6:boolean holderRequiresBridge(com.android.tools.r8.graph.DexClass):300 -> b
+    7:11:boolean holderRequiresBridge(com.android.tools.r8.graph.DexClass):300:304 -> b
+    12:17:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):330:335 -> b
+    18:20:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.computeInitializerBridge(com.android.tools.r8.graph.DexMethod):246:248 -> b
+    18:20:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):335 -> b
+    21:29:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):337:345 -> b
+    void reportMissingNestHost(com.android.tools.r8.graph.DexClass) -> c
+com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess -> com.android.tools.r8.internal.Zq$a:
+    com.android.tools.r8.graph.DexEncodedField field -> a
+    boolean isGet -> b
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedField,boolean):463:465 -> <init>
+    1:1:com.android.tools.r8.graph.DexField getField():526:526 -> a
+    1:1:com.android.tools.r8.graph.DexType getHolder():522:522 -> b
+    1:1:com.android.tools.r8.graph.DexType getType():518:518 -> c
+    1:1:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstance():498:498 -> d
+    1:1:boolean isInstanceGet():510 -> d
+    2:2:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isGet():486:486 -> d
+    2:2:boolean isInstanceGet():510 -> d
+    1:1:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isGet():486:486 -> e
+    1:1:boolean isPut():494 -> e
+    1:5:boolean equals(java.lang.Object):478:482 -> equals
+    1:1:boolean isStatic():490:490 -> f
+    1:1:boolean isStaticGet():502:502 -> g
+    2:2:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isGet():486:486 -> g
+    2:2:boolean isStaticGet():502 -> g
+    1:1:int hashCode():470:470 -> hashCode
+com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$NestBasedAccessDesugaringUseRegistry -> com.android.tools.r8.internal.ar:
+    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):359:361 -> <init>
+    1:4:void registerInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):367:370 -> a
+    5:7:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.lookupOnHolder(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):90:92 -> a
+    5:7:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.access$000(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):45 -> a
+    5:7:void registerInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):370 -> a
+    8:8:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
+    8:8:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.lookupOnHolder(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):92 -> a
+    8:8:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.access$000(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):45 -> a
+    8:8:void registerInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):370 -> a
+    9:9:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.lookupOnHolder(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):92:92 -> a
+    9:9:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.access$000(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):45 -> a
+    9:9:void registerInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):370 -> a
+    10:11:void registerInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):371:372 -> a
+    12:12:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean):380:380 -> a
+    13:14:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.lookupOnHolder(com.android.tools.r8.graph.DexField):96:97 -> a
+    13:14:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.access$100(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring,com.android.tools.r8.graph.DexField):45 -> a
+    13:14:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean):380 -> a
+    15:15:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
+    15:15:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.lookupOnHolder(com.android.tools.r8.graph.DexField):97 -> a
+    15:15:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.access$100(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring,com.android.tools.r8.graph.DexField):45 -> a
+    15:15:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean):380 -> a
+    16:16:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.lookupOnHolder(com.android.tools.r8.graph.DexField):97:97 -> a
+    16:16:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.access$100(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring,com.android.tools.r8.graph.DexField):45 -> a
+    16:16:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean):380 -> a
+    17:18:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean):381:382 -> a
+    19:19:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):400:400 -> a
+    20:20:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):427:427 -> a
+    1:1:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):412:412 -> b
+    void registerInitClass(com.android.tools.r8.graph.DexType) -> c
+    1:1:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):405:405 -> c
+    2:2:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):422:422 -> c
+    void registerInstanceOf(com.android.tools.r8.graph.DexType) -> d
+    1:1:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):417:417 -> d
+    void registerNewInstance(com.android.tools.r8.graph.DexType) -> e
+    1:1:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):395:395 -> e
+    2:2:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):439:439 -> e
+    void registerTypeReference(com.android.tools.r8.graph.DexType) -> f
+    1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):444:444 -> g
+com.android.tools.r8.ir.desugar.NestedPrivateMethodLens -> com.android.tools.r8.internal.gr:
+    java.util.Map getFieldMap -> n
+    java.util.Map putFieldMap -> o
+    boolean $assertionsDisabled -> l
+    com.android.tools.r8.graph.DexType nestConstructorType -> m
+    1:1:void <clinit>():20:20 -> <clinit>
+    1:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.graph.GraphLens):35:40 -> <init>
+    7:20:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.graph.GraphLens):34:47 -> <init>
+    1:3:com.android.tools.r8.graph.DexMethod lookupFieldForMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod,java.util.Map):52:54 -> a
+    4:5:com.android.tools.r8.graph.DexMethod lookupGetFieldForMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):62:63 -> a
+    6:10:com.android.tools.r8.graph.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):101:105 -> a
+    11:13:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.graph.RewrittenPrototypeDescription.withExtraUnusedNullParameters(int):471:473 -> a
+    11:13:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.graph.RewrittenPrototypeDescription.withExtraUnusedNullParameter():466 -> a
+    11:13:com.android.tools.r8.graph.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):105 -> a
+    14:27:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):113:126 -> a
+    28:34:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):125:131 -> a
+    1:2:com.android.tools.r8.graph.DexMethod lookupPutFieldForMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):68:69 -> b
+    1:1:boolean isContextFreeForMethods():74:74 -> e
+    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.fr:
+    boolean $assertionsDisabled -> e
+    java.util.Map getFieldMap -> f
+    java.util.Map putFieldMap -> g
+    1:1:void <clinit>():138:138 -> <clinit>
+    1:4:void <init>():138:141 -> <init>
+    1:1:void mapGetField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):144:144 -> a
+    2:8:com.android.tools.r8.ir.desugar.NestedPrivateMethodLens build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):152:158 -> a
+    1:1:void mapPutField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):148:148 -> b
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper -> com.android.tools.r8.internal.wu:
     1:1:void <init>():23:23 -> <init>
     void forAllRewrittenTypes(java.util.function.Consumer) -> a
     boolean isRewriting() -> a
@@ -39510,7 +39881,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.Dv$a:
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper -> com.android.tools.r8.internal.wu$a:
     java.util.Map rewritten -> c
     java.util.Map initialPrefixes -> d
     com.android.tools.r8.graph.DexItemFactory factory -> e
@@ -39547,19 +39918,45 @@
     14:19:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.lookup(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.Map):178:183 -> b
     14:19: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):167 -> b
     14:19:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):128 -> b
-    20:30:void com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.failIfRewritingProgramType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):133:143 -> b
-    20: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):169 -> b
-    20:30:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):128 -> b
+    20:24:void com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.failIfRewritingProgramType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):133:137 -> b
+    20: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):169 -> b
+    20:24:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):128 -> b
+    25:25:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> b
+    25:25:void com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.failIfRewritingProgramType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):138 -> b
+    25:25: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):169 -> b
+    25:25:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):128 -> b
+    26:30:void com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.failIfRewritingProgramType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):139:143 -> b
+    26: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):169 -> b
+    26:30:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):128 -> b
     31:31: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):172:172 -> b
     31:31:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):128 -> b
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper$EmptyPrefixRewritingMapper -> com.android.tools.r8.internal.Ev:
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper$EmptyPrefixRewritingMapper -> com.android.tools.r8.internal.xu:
     1:1:void <init>():207:207 -> <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
     boolean shouldRewriteTypeName(java.lang.String) -> 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.StringConcatRewriter -> com.android.tools.r8.internal.wD:
+com.android.tools.r8.ir.desugar.R8NestBasedAccessDesugaring -> com.android.tools.r8.internal.lx:
+    boolean $assertionsDisabled -> h
+    1:1:void <clinit>():30:30 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):33:33 -> <init>
+    boolean shouldProcessClassInNest(com.android.tools.r8.graph.DexClass,java.util.List) -> a
+    1:3:com.android.tools.r8.ir.desugar.NestedPrivateMethodLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):39:39 -> a
+    4:20:void com.android.tools.r8.ir.desugar.R8NestBasedAccessDesugaring.computeAndProcessNestsConcurrently(java.util.concurrent.ExecutorService):77:93 -> a
+    4:20:com.android.tools.r8.ir.desugar.NestedPrivateMethodLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):41 -> a
+    21:21:com.android.tools.r8.ir.desugar.NestedPrivateMethodLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):42:42 -> a
+    22:22:com.android.tools.r8.ir.desugar.NestedPrivateMethodLens$Builder com.android.tools.r8.ir.desugar.NestedPrivateMethodLens.builder():135:135 -> a
+    22:22:com.android.tools.r8.ir.desugar.NestedPrivateMethodLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):42 -> a
+    23:23:com.android.tools.r8.ir.desugar.NestedPrivateMethodLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):43:43 -> a
+    24:26:void com.android.tools.r8.ir.desugar.R8NestBasedAccessDesugaring.clearNestAttributes():69:71 -> a
+    24:26:com.android.tools.r8.ir.desugar.NestedPrivateMethodLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44 -> a
+    27:28:com.android.tools.r8.ir.desugar.NestedPrivateMethodLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):45:46 -> a
+    29:31:void addDeferredBridgesAndMapMethods(com.android.tools.r8.ir.desugar.NestedPrivateMethodLens$Builder):51:53 -> a
+    32:37:void addDeferredBridgesAndMapMethods(java.util.Map,java.util.function.BiConsumer):58:63 -> a
+    38:41: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.kC:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexMethod defaultAppendMethod -> h
@@ -39627,8 +40024,8 @@
     163:163: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.rD:
-com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder -> com.android.tools.r8.internal.vD:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$1 -> com.android.tools.r8.internal.fC:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder -> com.android.tools.r8.internal.jC:
     com.android.tools.r8.ir.code.Instruction invokeCustom -> f
     java.util.ListIterator blocks -> d
     com.android.tools.r8.ir.code.BasicBlock currentBlock -> g
@@ -39661,153 +40058,151 @@
     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.sD:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ArgumentChunk -> com.android.tools.r8.internal.gC:
     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.tD:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$Chunk -> com.android.tools.r8.internal.hC:
     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.uD:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ConstantChunk -> com.android.tools.r8.internal.iC:
     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: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.nF:
-    com.android.tools.r8.graph.AppView appView -> b
-    com.android.tools.r8.graph.DexProto twrCloseResourceProto -> c
-    java.util.List synthesizedMethods -> d
+com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter -> com.android.tools.r8.internal.gE:
+    com.android.tools.r8.ir.conversion.IRConverter converter -> d
+    com.android.tools.r8.graph.AppView appView -> c
+    java.util.Set referencingClasses -> f
+    com.android.tools.r8.graph.DexMethod twrCloseResourceMethod -> e
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():40:40 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):52:52 -> <init>
-    2:14:void <init>(com.android.tools.r8.graph.AppView):44:56 -> <init>
-    1:3:boolean enableTwrCloseResourceDesugaring(com.android.tools.r8.utils.InternalOptions):47:49 -> a
-    4:26:int rewriteCf(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):61:83 -> a
-    27:33:int rewriteCf(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):81:87 -> a
-    34:34:java.util.List lambda$rewriteCf$0(java.util.List):64:64 -> a
-    35:35:boolean isTwrCloseResourceMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):116:116 -> a
-    36:41:com.android.tools.r8.graph.ProgramMethod createSyntheticCloseResourceMethod(com.android.tools.r8.graph.ProgramMethod):121:126 -> a
-    42:42:com.android.tools.r8.graph.ProgramMethod createSyntheticCloseResourceMethod(com.android.tools.r8.graph.ProgramMethod):123:123 -> a
-    43:45:void lambda$createSyntheticCloseResourceMethod$2(com.android.tools.r8.synthesis.SyntheticMethodBuilder):129:131 -> a
-    46:47:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133:134 -> a
-    48:83:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):493:528 -> a
-    48:83:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    84:96:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):525:537 -> a
-    84:96:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    97:97:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> a
-    97:97:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):537 -> a
-    97:97:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    98:107:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):537:546 -> a
-    98:107:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    108:123:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):543:558 -> a
-    108:123:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    124:128:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):555:559 -> a
-    124:128:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    129:150:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):553:574 -> a
-    129:150:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    151:155:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):571:575 -> a
-    151:155:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    156:173:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):569:586 -> a
-    156:173:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    174:174:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> a
-    174:174:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):586 -> a
-    174:174:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    175:180:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):586:591 -> a
-    175:180:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    181:181:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):590:590 -> a
-    181:181:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    182:196:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):589:603 -> a
-    182:196:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    197:208:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):600:611 -> a
-    197:208:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    209:220:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):608:619 -> a
-    209:220:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    221:234:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):615:628 -> a
-    221:234:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    235:246:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):624:635 -> a
-    235:246:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    247:261:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):632:646 -> a
-    247:261:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    262:277:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):640:655 -> a
-    262:277:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    278:278:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> a
-    278:278:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):655 -> a
-    278:278:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    279:294:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):655:670 -> a
-    279:294:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    295:307:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):667:679 -> a
-    295:307:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    308:320:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):675:687 -> a
-    308:320:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    321:332:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):684:695 -> a
-    321:332:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    333:344:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):691:702 -> a
-    333:344:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    345:359:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):699:713 -> a
-    345:359:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    360:375:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):707:722 -> a
-    360:375:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    376:376:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> a
-    376:376:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):722 -> a
-    376:376:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    377:382:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):722:727 -> a
-    377:382:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    383:383:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):726:726 -> a
-    383:383:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    384:396:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):725:737 -> a
-    384:396:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    397:409:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):734:746 -> a
-    397:409:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    410:410:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> a
-    410:410:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):746 -> a
-    410:410:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    411:421:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):746:756 -> a
-    411:421:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    422:422:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> a
-    422:422:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):756 -> a
-    422:422:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    423:440:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):756:773 -> a
-    423:440:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    441:441:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> a
-    441:441:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):773 -> a
-    441:441:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    442:453:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):773:784 -> a
-    442:453:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    454:454:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> a
-    454:454:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):784 -> a
-    454:454:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    455:466:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):784:795 -> a
-    455:466:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    467:467:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> a
-    467:467:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):795 -> a
-    467:467:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    468:470:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):795:797 -> a
-    468:470:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    471:761:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):515:805 -> a
-    471:761:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    762:774:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):804:816 -> a
-    762:774:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    775:782:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):815:822 -> a
-    775:782:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    783:790:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):821:828 -> a
-    783:790:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    791:798:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):827:834 -> a
-    791:798:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    799:807:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):833:841 -> a
-    799:807:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    808:850:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):800:842 -> a
-    808:850:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.graph.DexMethod):133 -> a
-    851:851:void processSynthesizedMethods(com.android.tools.r8.ir.conversion.IRConverter):138:138 -> a
-    852:852:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1030:1030 -> a
-    852:852:void rewriteIR(com.android.tools.r8.ir.code.IRCode):94 -> a
-    853:865:void rewriteIR(com.android.tools.r8.ir.code.IRCode):95:107 -> a
-    866:866:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
-    866:866:void rewriteIR(com.android.tools.r8.ir.code.IRCode):108 -> a
-    867:869:void rewriteIR(com.android.tools.r8.ir.code.IRCode):109:111 -> a
-com.android.tools.r8.ir.desugar.backports.BackportedMethods -> com.android.tools.r8.internal.X1:
+    int $r8$clinit -> b
+    1:1:void <clinit>():53:53 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):65:65 -> <init>
+    2:14:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):63:75 -> <init>
+    1:13:boolean isSynthesizedCloseResourceMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):110:122 -> a
+    14:19:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):129:134 -> a
+    20:55:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):493:528 -> a
+    20:55:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    56:68:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):525:537 -> a
+    56:68:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    69:69:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> a
+    69:69:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):537 -> a
+    69:69:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    70:79:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):537:546 -> a
+    70:79:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    80:95:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):543:558 -> a
+    80:95:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    96:100:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):555:559 -> a
+    96:100:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    101:122:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):553:574 -> a
+    101:122:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    123:127:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):571:575 -> a
+    123:127:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    128:145:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):569:586 -> a
+    128:145:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    146:146:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> a
+    146:146:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):586 -> a
+    146:146:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    147:152:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):586:591 -> a
+    147:152:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    153:153:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):590:590 -> a
+    153:153:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    154:168:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):589:603 -> a
+    154:168:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    169:180:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):600:611 -> a
+    169:180:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    181:192:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):608:619 -> a
+    181:192:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    193:206:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):615:628 -> a
+    193:206:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    207:218:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):624:635 -> a
+    207:218:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    219:233:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):632:646 -> a
+    219:233:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    234:249:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):640:655 -> a
+    234:249:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    250:250:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> a
+    250:250:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):655 -> a
+    250:250:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    251:266:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):655:670 -> a
+    251:266:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    267:279:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):667:679 -> a
+    267:279:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    280:292:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):675:687 -> a
+    280:292:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    293:304:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):684:695 -> a
+    293:304:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    305:316:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):691:702 -> a
+    305:316:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    317:331:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):699:713 -> a
+    317:331:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    332:347:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):707:722 -> a
+    332:347:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    348:348:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> a
+    348:348:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):722 -> a
+    348:348:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    349:354:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):722:727 -> a
+    349:354:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    355:355:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):726:726 -> a
+    355:355:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    356:368:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):725:737 -> a
+    356:368:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    369:381:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):734:746 -> a
+    369:381:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    382:382:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> a
+    382:382:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):746 -> a
+    382:382:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    383:393:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):746:756 -> a
+    383:393:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    394:394:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> a
+    394:394:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):756 -> a
+    394:394:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    395:412:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):756:773 -> a
+    395:412:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    413:413:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> a
+    413:413:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):773 -> a
+    413:413:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    414:425:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):773:784 -> a
+    414:425:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    426:426:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> a
+    426:426:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):784 -> a
+    426:426:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    427:438:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):784:795 -> a
+    427:438:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    439:439:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> a
+    439:439:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):795 -> a
+    439:439:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    440:442:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):795:797 -> a
+    440:442:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    443:733:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):515:805 -> a
+    443:733:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    734:746:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):804:816 -> a
+    734:746:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    747:754:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):815:822 -> a
+    747:754:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    755:762:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):821:828 -> a
+    755:762:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    763:770:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):827:834 -> a
+    763:770:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    771:779:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):833:841 -> a
+    771:779:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    780:822:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):800:842 -> a
+    780:822:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
+    823:831:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):137:145 -> a
+    832:832: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):277:277 -> a
+    832:832:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):145 -> a
+    833:862:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):150:179 -> a
+    863:863:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1025:1025 -> 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):39:39 -> 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.S1:
     1:20:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2147:2166 -> A
     21:36:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2163:2178 -> A
     37:54:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2174:2191 -> A
@@ -40852,265 +41247,105 @@
     91:91:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6570 -> z0
     92:94:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6570:6572 -> z0
     95:158:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6513:6576 -> z0
-com.android.tools.r8.ir.desugar.backports.BooleanMethodRewrites -> com.android.tools.r8.internal.X2:
+com.android.tools.r8.ir.desugar.backports.BooleanMethodRewrites -> com.android.tools.r8.internal.O2:
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter createRewriter(com.android.tools.r8.cf.code.CfLogicalBinop$Opcode):15:15 -> a
     2:2:com.android.tools.r8.cf.code.CfInstruction lambda$createRewriter$0(com.android.tools.r8.cf.code.CfLogicalBinop$Opcode,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):15:15 -> a
-    3:3:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteLogicalAnd():19:19 -> a
-    1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteLogicalOr():23:23 -> b
-    1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteLogicalXor():27:27 -> c
-com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators -> com.android.tools.r8.internal.I7:
-    1:1:com.android.tools.r8.graph.CfCode generateListOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):31:31 -> a
-    2:21:com.android.tools.r8.graph.CfCode generateFixedMethods(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.graph.DexType):40:59 -> a
-    22:22:com.android.tools.r8.graph.CfCode generateFixedMethods(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.graph.DexType):56:56 -> a
-    23:39:com.android.tools.r8.graph.CfCode generateFixedMethods(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.graph.DexType):53:69 -> a
-    1:1:com.android.tools.r8.graph.CfCode generateSetOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):35:35 -> b
-com.android.tools.r8.ir.desugar.backports.CollectionMethodRewrites -> com.android.tools.r8.internal.J7:
-    1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteListOfEmpty():16:16 -> a
-    2:2:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteToCollectionMethod(java.lang.String):28:28 -> a
-    3:5:com.android.tools.r8.cf.code.CfInstruction lambda$rewriteToCollectionMethod$0(java.lang.String,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):29:31 -> a
-    1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteMapOfEmpty():24:24 -> b
-    1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteSetOfEmpty():20:20 -> c
-com.android.tools.r8.ir.desugar.backports.FloatMethodRewrites -> com.android.tools.r8.internal.Kc:
-    1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteHashCode():16:16 -> a
-    2:5:com.android.tools.r8.cf.code.CfInstruction lambda$rewriteHashCode$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):17:20 -> a
-    6:6:com.android.tools.r8.cf.code.CfInstruction lambda$rewriteHashCode$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):19:19 -> a
-com.android.tools.r8.ir.desugar.backports.LongMethodRewrites -> com.android.tools.r8.internal.Bp:
-    1:1:com.android.tools.r8.cf.code.CfInstruction lambda$rewriteCompare$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):17:17 -> a
-    2:2:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteCompare():17:17 -> a
-com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites -> com.android.tools.r8.internal.Zs:
-    1:2:com.android.tools.r8.cf.code.CfInstruction lambda$rewriteToAddInstruction$1(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):28:29 -> a
-    3:3:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteAsIdentity():34:34 -> a
-    1:4:com.android.tools.r8.cf.code.CfInstruction lambda$rewriteToInvokeMath$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):18:21 -> b
-    5:5:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteToAddInstruction():27:27 -> b
-    1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteToInvokeMath():17:17 -> c
-com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites$1 -> com.android.tools.r8.internal.Ys:
+    3:3:com.android.tools.r8.cf.code.CfInstruction com.android.tools.r8.ir.desugar.backports.LongMethodRewrites.lambda$rewriteCompare$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):17:17 -> a
+    4:4:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter com.android.tools.r8.ir.desugar.backports.OptionalMethodRewrites.createRewriter(java.util.function.Function,java.lang.String):20:20 -> a
+    5:8:com.android.tools.r8.cf.code.CfInstruction com.android.tools.r8.ir.desugar.backports.OptionalMethodRewrites.lambda$createRewriter$0(java.util.function.Function,java.lang.String,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):21:24 -> a
+    9:9:com.android.tools.r8.cf.code.CfInstruction com.android.tools.r8.ir.desugar.backports.OptionalMethodRewrites.lambda$createRewriter$0(java.util.function.Function,java.lang.String,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):23:23 -> a
+    10:10:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter com.android.tools.r8.ir.desugar.backports.CollectionMethodRewrites.rewriteToCollectionMethod(java.lang.String):28:28 -> a
+    11:13:com.android.tools.r8.cf.code.CfInstruction com.android.tools.r8.ir.desugar.backports.CollectionMethodRewrites.lambda$rewriteToCollectionMethod$0(java.lang.String,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):29:31 -> a
+    14:14:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateListOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):31:31 -> a
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.backports.OptionalMethodRewrites.lambda$rewriteDoubleOrElseGet$2(com.android.tools.r8.graph.DexItemFactory):33:33 -> a
+    16:16:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites.rewriteAsIdentity():34:34 -> a
+    17:36:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateFixedMethods(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.graph.DexType):40:59 -> a
+    37:37:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateFixedMethods(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.graph.DexType):56:56 -> a
+    38:54:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateFixedMethods(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.graph.DexType):53:69 -> a
+    1:4:com.android.tools.r8.cf.code.CfInstruction com.android.tools.r8.ir.desugar.backports.FloatMethodRewrites.lambda$rewriteHashCode$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):17:20 -> b
+    5:5:com.android.tools.r8.cf.code.CfInstruction com.android.tools.r8.ir.desugar.backports.FloatMethodRewrites.lambda$rewriteHashCode$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):19:19 -> b
+    6:6:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter com.android.tools.r8.ir.desugar.backports.LongMethodRewrites.rewriteCompare():17:17 -> b
+    7:7:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateSetOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):35:35 -> b
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.backports.OptionalMethodRewrites.lambda$rewriteIntOrElseGet$3(com.android.tools.r8.graph.DexItemFactory):37:37 -> b
+    1:2:com.android.tools.r8.cf.code.CfInstruction com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites.lambda$rewriteToAddInstruction$1(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):28:29 -> c
+    3:3:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter com.android.tools.r8.ir.desugar.backports.OptionalMethodRewrites.rewriteDoubleOrElseGet():33:33 -> c
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.backports.OptionalMethodRewrites.lambda$rewriteLongOrElseGet$4(com.android.tools.r8.graph.DexItemFactory):41:41 -> c
+    1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter com.android.tools.r8.ir.desugar.backports.FloatMethodRewrites.rewriteHashCode():16:16 -> d
+    2:5:com.android.tools.r8.cf.code.CfInstruction com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites.lambda$rewriteToArraysHashCode$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):22:25 -> d
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.backports.OptionalMethodRewrites.lambda$rewriteOrElseGet$1(com.android.tools.r8.graph.DexItemFactory):29:29 -> d
+    1:4:com.android.tools.r8.cf.code.CfInstruction com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites.lambda$rewriteToInvokeMath$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):18:21 -> e
+    5:5:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter com.android.tools.r8.ir.desugar.backports.OptionalMethodRewrites.rewriteIntOrElseGet():37:37 -> e
+    1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter com.android.tools.r8.ir.desugar.backports.CollectionMethodRewrites.rewriteListOfEmpty():16:16 -> f
+    1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteLogicalAnd():19:19 -> g
+    1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteLogicalOr():23:23 -> h
+    1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteLogicalXor():27:27 -> i
+    1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter com.android.tools.r8.ir.desugar.backports.OptionalMethodRewrites.rewriteLongOrElseGet():41:41 -> j
+    1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter com.android.tools.r8.ir.desugar.backports.CollectionMethodRewrites.rewriteMapOfEmpty():24:24 -> k
+    1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter com.android.tools.r8.ir.desugar.backports.OptionalMethodRewrites.rewriteOrElseGet():29:29 -> l
+    1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites.rewriteRequireNonNull():31:31 -> m
+    1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter com.android.tools.r8.ir.desugar.backports.CollectionMethodRewrites.rewriteSetOfEmpty():20:20 -> n
+    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.Rr:
     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 -> com.android.tools.r8.internal.ou:
-    1:4:com.android.tools.r8.cf.code.CfInstruction lambda$rewriteToArraysHashCode$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):22:25 -> a
-    5:5:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteRequireNonNull():31:31 -> a
-    1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteToArraysHashCode():21:21 -> b
-com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites$1 -> com.android.tools.r8.internal.nu:
+com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites$1 -> com.android.tools.r8.internal.it:
     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.desugar.backports.OptionalMethodRewrites -> com.android.tools.r8.internal.xu:
-    1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter createRewriter(java.util.function.Function,java.lang.String):20:20 -> a
-    2:5:com.android.tools.r8.cf.code.CfInstruction lambda$createRewriter$0(java.util.function.Function,java.lang.String,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):21:24 -> a
-    6:6:com.android.tools.r8.cf.code.CfInstruction lambda$createRewriter$0(java.util.function.Function,java.lang.String,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):23:23 -> a
-    7:7:com.android.tools.r8.graph.DexType lambda$rewriteDoubleOrElseGet$2(com.android.tools.r8.graph.DexItemFactory):33:33 -> a
-    8:8:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteDoubleOrElseGet():33:33 -> a
-    1:1:com.android.tools.r8.graph.DexType lambda$rewriteIntOrElseGet$3(com.android.tools.r8.graph.DexItemFactory):37:37 -> b
-    2:2:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteIntOrElseGet():37:37 -> b
-    1:1:com.android.tools.r8.graph.DexType lambda$rewriteLongOrElseGet$4(com.android.tools.r8.graph.DexItemFactory):41:41 -> c
-    2:2:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteLongOrElseGet():41:41 -> c
-    1:1:com.android.tools.r8.graph.DexType lambda$rewriteOrElseGet$1(com.android.tools.r8.graph.DexItemFactory):29:29 -> d
-    2:2:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteOrElseGet():29:29 -> d
-com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring -> com.android.tools.r8.internal.I8:
-    1:1:void <init>(com.android.tools.r8.graph.AppView):34:34 -> <init>
-    1:8:void lambda$reportDesugarDependencies$0(com.android.tools.r8.ir.desugar.nest.Nest):40:47 -> a
-    9:9:void lambda$reportDesugarDependencies$0(com.android.tools.r8.ir.desugar.nest.Nest):41:41 -> a
-    10:10:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):52:52 -> a
-    11:11:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):792:792 -> a
-    11:11:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):52 -> a
-    12:12:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():650:650 -> a
-    12:12:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):794 -> a
-    12:12:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):52 -> a
-    13:13:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):794:794 -> a
-    13:13:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):52 -> a
-    14:16:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):798:800 -> a
-    14:16:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):794 -> a
-    14:16:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):52 -> a
-    17:17:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):794:794 -> a
-    17:17:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):52 -> a
-    18:18:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):792:792 -> a
-    18:18:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):52 -> a
-    19:20:void synthesizeBridgesForNestBasedAccessesOnClasspath(com.android.tools.r8.ir.conversion.MethodProcessor,java.util.concurrent.ExecutorService):58:59 -> a
-    21:21:void com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.forEachNest(java.util.function.Consumer):81:81 -> a
-    21:21:void synthesizeBridgesForNestBasedAccessesOnClasspath(com.android.tools.r8.ir.conversion.MethodProcessor,java.util.concurrent.ExecutorService):59 -> a
-    22:22:com.android.tools.r8.ir.desugar.nest.D8NestBridgeConsumer com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer.createForD8(com.android.tools.r8.ir.conversion.MethodProcessor):14:14 -> a
-    22:22:void synthesizeBridgesForNestBasedAccessesOnClasspath(com.android.tools.r8.ir.conversion.MethodProcessor,java.util.concurrent.ExecutorService):67 -> a
-    23:23:void synthesizeBridgesForNestBasedAccessesOnClasspath(com.android.tools.r8.ir.conversion.MethodProcessor,java.util.concurrent.ExecutorService):68:68 -> a
-    24:24:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$2(java.util.List,com.android.tools.r8.ir.desugar.nest.Nest):61:61 -> a
-    25:25:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
-    25:25:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$2(java.util.List,com.android.tools.r8.ir.desugar.nest.Nest):61 -> a
-    26:28:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$2(java.util.List,com.android.tools.r8.ir.desugar.nest.Nest):62:64 -> a
-    29:29:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$3(com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer,com.android.tools.r8.graph.DexClasspathClass):70:70 -> a
-    30:30:void synthesizeBridgesForNestBasedAccessesOnClasspath(com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):76:76 -> a
-    31:31:void com.android.tools.r8.graph.DexClasspathClass.forEachClasspathMethod(java.util.function.Consumer):76:76 -> a
-    31:31:void synthesizeBridgesForNestBasedAccessesOnClasspath(com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):76 -> a
-    32:32:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$4(com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer,com.android.tools.r8.graph.ClasspathMethod):78:78 -> a
-    33:35:void com.android.tools.r8.graph.ClasspathMethod.registerCodeReferencesForDesugaring(com.android.tools.r8.graph.UseRegistry):16:18 -> a
-    33:35:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$4(com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer,com.android.tools.r8.graph.ClasspathMethod):78 -> a
-    36:36:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    36:36:void com.android.tools.r8.graph.ClasspathMethod.registerCodeReferencesForDesugaring(com.android.tools.r8.graph.UseRegistry):19 -> a
-    36:36:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$4(com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer,com.android.tools.r8.graph.ClasspathMethod):78 -> a
-    37:37:void com.android.tools.r8.graph.ClasspathMethod.registerCodeReferencesForDesugaring(com.android.tools.r8.graph.UseRegistry):21:21 -> a
-    37:37:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$4(com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer,com.android.tools.r8.graph.ClasspathMethod):78 -> a
-    1:1:void reportDesugarDependencies():38:38 -> c
-com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring$NestBasedAccessDesugaringUseRegistry -> com.android.tools.r8.internal.H8:
-    com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer bridgeConsumer -> c
-    com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring this$0 -> e
-    com.android.tools.r8.graph.ClasspathMethod context -> d
-    1:4:void <init>(com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring,com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):88:91 -> <init>
-    1:2:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean):95:96 -> a
-    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
-    3:3:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean):96 -> a
-    4:6:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean):96:98 -> a
-    7:7:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):115:115 -> a
-    8:8:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):145:145 -> a
-    1:1:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):120:120 -> b
-    void registerInitClass(com.android.tools.r8.graph.DexType) -> c
-    1:1:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):125:125 -> c
-    2:2:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):140:140 -> c
-    void registerInstanceOf(com.android.tools.r8.graph.DexType) -> d
-    1:1:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):130:130 -> d
-    void registerNewInstance(com.android.tools.r8.graph.DexType) -> e
-    1:1:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):135:135 -> e
-    2:2:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):150:150 -> e
-    void registerTypeReference(com.android.tools.r8.graph.DexType) -> f
-    1:5:void registerInvoke(com.android.tools.r8.graph.DexMethod):103:107 -> f
-    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> f
-    6:6:void registerInvoke(com.android.tools.r8.graph.DexMethod):107 -> f
-    7:9:void registerInvoke(com.android.tools.r8.graph.DexMethod):107:109 -> f
-    1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):155:155 -> g
-com.android.tools.r8.ir.desugar.nest.D8NestBridgeConsumer -> com.android.tools.r8.internal.J8:
-    com.android.tools.r8.ir.conversion.MethodProcessor methodProcessor -> a
-    1:1:void com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer.<init>():11:11 -> <init>
-    1:1:void <init>(com.android.tools.r8.ir.conversion.MethodProcessor):15 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.conversion.MethodProcessor):16:16 -> <init>
-    1:1:void com.android.tools.r8.ir.desugar.nest.D8NestBridgeConsumer.acceptFieldGetBridge(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):21:21 -> a
-    1:1:void com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer.acceptFieldBridge(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod,boolean):25 -> a
-    1:1:void com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer.acceptFieldBridge(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod,boolean):0 -> a
-    2:2:void com.android.tools.r8.ir.desugar.nest.D8NestBridgeConsumer.acceptFieldPutBridge(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):26:26 -> a
-    2:2:void com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer.acceptFieldBridge(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod,boolean):27 -> a
-    2:2:void com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer.acceptFieldBridge(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod,boolean):0 -> a
-    3:3:void acceptMethodBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):31:31 -> a
-com.android.tools.r8.ir.desugar.nest.Nest -> com.android.tools.r8.internal.fs:
-    com.android.tools.r8.graph.DexClass hostClass -> b
-    java.util.List missingMembers -> d
-    java.util.List members -> c
-    boolean $assertionsDisabled -> a
-    1:1:void <clinit>():16:16 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.DexClass,java.util.List,java.util.List):22:25 -> <init>
-    1:23:com.android.tools.r8.ir.desugar.nest.Nest create(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Consumer):34:56 -> a
-    24:28:void lambda$create$0(com.android.tools.r8.graph.AppView,java.util.List,java.util.List,com.android.tools.r8.graph.DexType):49:53 -> a
-    29:31:java.lang.Iterable getClasspathMembers():60:60 -> a
-    1:1:com.android.tools.r8.graph.DexClass getHostClass():65:65 -> b
-    1:1:java.util.List getMembers():69:69 -> c
-    1:1:java.util.List getMissingMembers():73:73 -> d
-    1:1:boolean hasMissingMembers():81:81 -> e
-com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring -> com.android.tools.r8.internal.gs:
-    com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
-    com.android.tools.r8.graph.AppView appView -> b
-    com.android.tools.r8.graph.DexProgramClass nestConstructor -> d
-    boolean nestConstructorUsed -> e
-    boolean $assertionsDisabled -> a
-    1:1:void <clinit>():53:53 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.AppView):75:77 -> <init>
-    1:1:boolean com.android.tools.r8.graph.DexClassAndField.isProgramField():0:0 -> a
-    1:1:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexClassAndField,boolean,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):273 -> a
-    2:2:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexClassAndField,boolean,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):274:274 -> a
-    3:14:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.ensureFieldAccessBridge(com.android.tools.r8.graph.ProgramField,boolean,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):285:296 -> a
-    3:14:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexClassAndField,boolean,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):274 -> a
-    15:15:boolean com.android.tools.r8.graph.DexClassAndField.isClasspathField():0:0 -> a
-    15:15:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexClassAndField,boolean,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):276 -> a
-    16:18:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexClassAndField,boolean,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):277:279 -> a
-    19:19:boolean com.android.tools.r8.graph.DexClassAndField.isLibraryField():0:0 -> a
-    19:19:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexClassAndField,boolean,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):279 -> a
-    20:21:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexClassAndField,boolean,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):279:280 -> a
-    22:22:boolean com.android.tools.r8.graph.DexClassAndMethod.isProgramMethod():0:0 -> a
-    22:22:com.android.tools.r8.graph.DexMethod ensureMethodBridge(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):330 -> a
-    23:23:com.android.tools.r8.graph.DexMethod ensureMethodBridge(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):331:331 -> a
-    24:32:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.ensureMethodBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):341:349 -> a
-    24:32:com.android.tools.r8.graph.DexMethod ensureMethodBridge(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):331 -> a
-    33:36:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.ensureMethodBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):348:351 -> a
-    33:36:com.android.tools.r8.graph.DexMethod ensureMethodBridge(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):331 -> a
-    37:44:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.ensureMethodBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):350:357 -> a
-    37:44:com.android.tools.r8.graph.DexMethod ensureMethodBridge(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):331 -> a
-    45:45:boolean com.android.tools.r8.graph.DexClassAndMethod.isClasspathMethod():0:0 -> a
-    45:45:com.android.tools.r8.graph.DexMethod ensureMethodBridge(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):333 -> a
-    46:48:com.android.tools.r8.graph.DexMethod ensureMethodBridge(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):334:336 -> a
-    49:49:boolean com.android.tools.r8.graph.DexClassAndMethod.isLibraryMethod():0:0 -> a
-    49:49:com.android.tools.r8.graph.DexMethod ensureMethodBridge(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):336 -> a
-    50:51:com.android.tools.r8.graph.DexMethod ensureMethodBridge(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):336:337 -> a
-    52:60:void forEachNest(java.util.function.Consumer,java.util.function.Consumer):85:93 -> a
-    61:67:boolean needsDesugaring(com.android.tools.r8.graph.ProgramMethod):99:105 -> a
-    68:68:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():451:451 -> a
-    68:68:boolean needsDesugaring(com.android.tools.r8.graph.ProgramMethod):105 -> a
-    69:78:boolean needsDesugaring(com.android.tools.r8.graph.ProgramMethod):105:114 -> a
-    79:79:boolean needsDesugaring(com.android.tools.r8.graph.ProgramMethod):113:113 -> a
-    80:80:boolean needsDesugaring(com.android.tools.r8.graph.ProgramMethod):110:110 -> a
-    81:81:boolean com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):118:118 -> a
-    81:81:boolean lambda$needsDesugaring$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.code.CfInstruction):114 -> a
-    82:82:boolean com.android.tools.r8.cf.code.CfInstruction.isFieldInstruction():0:0 -> a
-    82:82:boolean com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):118 -> a
-    82:82:boolean lambda$needsDesugaring$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.code.CfInstruction):114 -> a
-    83:83:boolean com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):119:119 -> a
-    83:83:boolean lambda$needsDesugaring$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.code.CfInstruction):114 -> a
-    84:84:boolean com.android.tools.r8.cf.code.CfInstruction.isInvoke():0:0 -> a
-    84:84:boolean com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):121 -> a
-    84:84:boolean lambda$needsDesugaring$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.code.CfInstruction):114 -> a
-    85:85:boolean com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):122:122 -> a
-    85:85:boolean lambda$needsDesugaring$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.code.CfInstruction):114 -> a
-    86:89:boolean needsDesugaring(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramMethod):128:131 -> a
-    90:90:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramMethod):67:67 -> a
-    90:90:boolean needsDesugaring(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramMethod):131 -> a
-    91:92:boolean needsDesugaring(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramMethod):132:133 -> a
-    93:96:boolean needsDesugaring(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.DexClassAndMethod):137:140 -> a
-    97:110:boolean desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):148:161 -> a
-    111:122:boolean desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):157:168 -> a
-    123:128:boolean desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):167:172 -> a
-    129:129:java.util.List lambda$desugar$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer,com.android.tools.r8.cf.code.CfInstruction):169:169 -> a
-    130:130:java.util.List desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):180:180 -> a
-    131:131:boolean com.android.tools.r8.cf.code.CfInstruction.isFieldInstruction():0:0 -> a
-    131:131:java.util.List desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):180 -> a
-    132:132:java.util.List desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):181:181 -> a
-    133:133:java.util.List com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.desugarFieldInstruction(com.android.tools.r8.cf.code.CfFieldInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):194:194 -> a
-    133:133:java.util.List desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):181 -> a
-    134:134:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramMethod):67:67 -> a
-    134:134:java.util.List com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.desugarFieldInstruction(com.android.tools.r8.cf.code.CfFieldInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):194 -> a
-    134:134:java.util.List desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):181 -> a
-    135:142:java.util.List com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.desugarFieldInstruction(com.android.tools.r8.cf.code.CfFieldInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):195:202 -> a
-    135:142:java.util.List desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):181 -> a
-    143:143:java.util.List com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.desugarFieldInstruction(com.android.tools.r8.cf.code.CfFieldInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):201:201 -> a
-    143:143:java.util.List desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):181 -> a
-    144:144:boolean com.android.tools.r8.cf.code.CfInstruction.isInvoke():0:0 -> a
-    144:144:java.util.List desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):183 -> a
-    145:145:java.util.List desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):184:184 -> a
-    146:154:java.util.List com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.desugarInvokeInstruction(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):207:215 -> a
-    146:154:java.util.List desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):184 -> a
-    155:155:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramMethod):67:67 -> a
-    155:155:java.util.List com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.desugarInvokeInstruction(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):215 -> a
-    155:155:java.util.List desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):184 -> a
-    156:168:java.util.List com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.desugarInvokeInstruction(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):216:228 -> a
-    156:168:java.util.List desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBridgeConsumer):184 -> a
-    169:169:java.lang.RuntimeException reportIncompleteNest(com.android.tools.r8.graph.LibraryMember):232:232 -> a
-    170:170:com.android.tools.r8.ir.desugar.nest.Nest com.android.tools.r8.ir.desugar.nest.Nest.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):29:29 -> a
-    170:170:java.lang.RuntimeException reportIncompleteNest(com.android.tools.r8.graph.LibraryMember):232 -> a
-    171:172:java.lang.RuntimeException reportIncompleteNest(com.android.tools.r8.graph.LibraryMember):233:234 -> a
-    173:193:com.android.tools.r8.graph.DexProgramClass createNestAccessConstructor():239:259 -> a
-    194:205:com.android.tools.r8.graph.DexMethod getFieldAccessBridgeReference(com.android.tools.r8.graph.DexClassAndField,boolean):301:312 -> a
-    206:215:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.getFieldAccessBridgeName(com.android.tools.r8.graph.DexClassAndField,boolean):317:326 -> a
-    206:215:com.android.tools.r8.graph.DexMethod getFieldAccessBridgeReference(com.android.tools.r8.graph.DexClassAndField,boolean):312 -> a
-    216:216:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():43:43 -> a
-    216:216:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.getFieldAccessBridgeName(com.android.tools.r8.graph.DexClassAndField,boolean):326 -> a
-    216:216:com.android.tools.r8.graph.DexMethod getFieldAccessBridgeReference(com.android.tools.r8.graph.DexClassAndField,boolean):312 -> a
-    217:217:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.getFieldAccessBridgeName(com.android.tools.r8.graph.DexClassAndField,boolean):326:326 -> a
-    217:217:com.android.tools.r8.graph.DexMethod getFieldAccessBridgeReference(com.android.tools.r8.graph.DexClassAndField,boolean):312 -> a
-    218:218:com.android.tools.r8.graph.DexMethod getFieldAccessBridgeReference(com.android.tools.r8.graph.DexClassAndField,boolean):311:311 -> a
-    219:229:com.android.tools.r8.graph.DexMethod getMethodBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):362:372 -> a
-    230:233:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.getMethodBridgeName(com.android.tools.r8.graph.DexClassAndMethod):377:380 -> a
-    230:233:com.android.tools.r8.graph.DexMethod getMethodBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):372 -> a
-    234:234:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():43:43 -> a
-    234:234:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.getMethodBridgeName(com.android.tools.r8.graph.DexClassAndMethod):380 -> a
-    234:234:com.android.tools.r8.graph.DexMethod getMethodBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):372 -> a
-    235:235:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.getMethodBridgeName(com.android.tools.r8.graph.DexClassAndMethod):380:380 -> a
-    235:235:com.android.tools.r8.graph.DexMethod getMethodBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):372 -> a
-    236:236:com.android.tools.r8.graph.DexMethod getMethodBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):372:372 -> a
-    1:2:com.android.tools.r8.graph.DexProgramClass synthesizeNestConstructor():264:265 -> b
-com.android.tools.r8.ir.optimize.ArgumentRemovalUtils -> com.android.tools.r8.internal.n1:
-    1:5:boolean isPinned(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):16:20 -> a
-com.android.tools.r8.ir.optimize.AssertionsRewriter -> com.android.tools.r8.internal.L1:
+com.android.tools.r8.ir.optimize.ArgumentRemovalUtils -> com.android.tools.r8.internal.m1:
+    boolean com.android.tools.r8.utils.NumberUtils.is16Bit(long) -> a
+    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: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:16: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
+    17:77: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
+    17:77: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
+    78:83:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite.writeTo(java.io.OutputStream):77:82 -> a
+    78:83: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):61 -> a
+    78:83: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
+    84:84: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):62:62 -> a
+    84:84: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
+    85:85: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):59:59 -> a
+    85:85: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
+    86:91: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):17:22 -> a
+    92:99: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):15:22 -> a
+    100:100: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):21:21 -> a
+    101:101: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):14:14 -> a
+    102:106:boolean isPinned(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):16:20 -> a
+    107:122:java.lang.String com.android.tools.r8.utils.MethodReferenceUtils.toSourceString(com.android.tools.r8.references.MethodReference,boolean,boolean):19:34 -> a
+    107:122:java.lang.String com.android.tools.r8.utils.MethodReferenceUtils.toSourceStringWithoutHolderAndReturnType(com.android.tools.r8.references.MethodReference):14 -> a
+    123:123: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
+    124:137:boolean com.android.tools.r8.utils.ValueUtils.isNonNullStringBuilder(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):24:37 -> a
+    138:146: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
+    147:147:int com.android.tools.r8.jetbrains.kotlinx.metadata.FlagsKt.flagsOf(com.android.tools.r8.jetbrains.kotlinx.metadata.Flag[]):27:27 -> a
+    148:148:int com.android.tools.r8.jetbrains.kotlinx.metadata.FlagsKt.flagsOf(com.android.tools.r8.jetbrains.kotlinx.metadata.Flag[]):24:24 -> a
+    149:150:void com.android.tools.r8.utils.FunctionUtils.forEachApply(java.lang.Iterable,java.util.function.Function,java.lang.Object):27:28 -> a
+    151:151:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):47:47 -> a
+    152:153:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.receiverType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):50:51 -> a
+    154:156: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$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):56:58 -> a
+    157:157:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):57:57 -> a
+    158:158:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):56:56 -> a
+    159:159:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):55:55 -> a
+    160:167:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):58:65 -> a
+    168:175:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:61 -> a
+    176:176:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):62:62 -> a
+    177:187:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:61 -> a
+    194:194:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):68:68 -> a
+    195:198:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:61 -> a
+    201:201:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):64:64 -> a
+    202:208:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:61 -> a
+    216:216:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):69:69 -> a
+    217:219:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.type(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):70:72 -> a
+    220:220:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.NodesKt.addTo(java.lang.Object,java.util.Collection):971:971 -> a
+    boolean com.android.tools.r8.utils.NumberUtils.is32Bit(long) -> b
+    1:1:void com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations.registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):35:35 -> b
+    2:4: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.J1:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> b
     java.util.List configuration -> e
@@ -41137,85 +41372,90 @@
     92:92:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation com.android.tools.r8.ir.optimize.AssertionsRewriter.getTransformationForMethod(com.android.tools.r8.graph.DexEncodedMethod):112:112 -> a
     92:92:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):313 -> a
     92:92:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
-    93:111:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):314:332 -> a
-    93:111:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
-    112:112:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1030:1030 -> a
-    112:112:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):334 -> a
-    112:112:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
-    113:118:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):335:340 -> a
-    113:118:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
-    119:132: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
-    119:132:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):341 -> a
-    119:132:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
-    133:133:java.lang.Object com.android.tools.r8.ir.code.IRCodeInstructionListIterator.previous():22:22 -> a
-    133:133: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
-    133:133:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):341 -> a
-    133:133:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
-    134: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):393:394 -> a
-    134: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
-    134:135:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
+    93:102: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
+    93:102:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
+    103:103:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    103:103:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):323 -> a
+    103:103:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
+    104:109: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
+    104:109:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
+    110:110:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1025:1025 -> a
+    110:110:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):334 -> a
+    110:110:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
+    111:116:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):335:340 -> a
+    111:116:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
+    117:130: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
+    117:130:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):341 -> a
+    117:130:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
+    131:131:java.lang.Object com.android.tools.r8.ir.code.IRCodeInstructionListIterator.previous():22:22 -> a
+    131:131: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
+    131:131:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):341 -> a
+    131:131:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
+    132:133: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
+    132:133:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):341 -> a
+    132:133:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
+    134:134:java.lang.Object com.android.tools.r8.ir.code.IRCodeInstructionListIterator.previous():22:22 -> a
+    134: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):396 -> a
+    134: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
+    134: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: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
+    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:136:java.lang.Object com.android.tools.r8.ir.code.IRCodeInstructionListIterator.previous():22:22 -> a
-    136:136: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
+    136:136: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
     136:136: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:136:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
-    137: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):397:397 -> a
-    137: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
-    137: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():22:22 -> 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):398 -> 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:141: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
-    139:141: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:141:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
-    142:142:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1133:1133 -> a
-    142:142: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
+    137: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):399:401 -> a
+    137: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
+    137: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:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1128:1128 -> 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):402 -> 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:141:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
+    141:141: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
+    141:141: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:141:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
+    142:142: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
     142:142:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):341 -> a
     142:142:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
-    143:143:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
-    143: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):402 -> a
+    143:143:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1128:1128 -> a
+    143: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):406 -> a
     143: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
     143: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: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
+    144:144:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> 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):405 -> 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:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1133:1133 -> 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):406 -> 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 com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):343:343 -> 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.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> 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):405 -> 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 com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):343 -> 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: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
-    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):39:39 -> 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):343 -> 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:153: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
-    149:153:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
-    154:154:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    154:154:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):352 -> a
-    154:154:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
-    155:162:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):353:360 -> a
-    155:162:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
-    163:163: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
-    163:163:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
-    164:164:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
-    164:164:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):357 -> a
-    164: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:169: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
-    165:169:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
-    170:170: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
-    170:170:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
-    171:171:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
-    171:171:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):364 -> a
-    171: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 run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):308:308 -> a
-com.android.tools.r8.ir.optimize.AssertionsRewriter$1 -> com.android.tools.r8.internal.J1:
+    147:151: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
+    147:151:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
+    152:152:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    152:152:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):352 -> a
+    152:152:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
+    153:160:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):353:360 -> a
+    153:160:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
+    161:161: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
+    161:161:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
+    162:162:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
+    162:162:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):357 -> a
+    162:162:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
+    163:167: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
+    163:167:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
+    168:168: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
+    168:168:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
+    169:169:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
+    169:169:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):364 -> a
+    169:169:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
+    170:170:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):308:308 -> a
+com.android.tools.r8.ir.optimize.AssertionsRewriter$1 -> com.android.tools.r8.internal.H1:
     int[] $SwitchMap$com$android$tools$r8$AssertionsConfiguration$AssertionTransformationScope -> a
     1:1:void <clinit>():41:41 -> <clinit>
-com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString -> com.android.tools.r8.internal.K1:
+com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString -> com.android.tools.r8.internal.I1:
     com.android.tools.r8.graph.DexString value -> b
     com.android.tools.r8.AssertionsConfiguration entry -> a
     1:1:void <init>(com.android.tools.r8.AssertionsConfiguration,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.optimize.AssertionsRewriter$1):33:33 -> <init>
@@ -41226,309 +41466,306 @@
     52:52:void <init>(com.android.tools.r8.AssertionsConfiguration,com.android.tools.r8.graph.DexItemFactory):47:47 -> <init>
     1:1:com.android.tools.r8.AssertionsConfiguration access$000(com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString):33:33 -> a
     1:1:com.android.tools.r8.graph.DexString access$100(com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString):33:33 -> b
-com.android.tools.r8.ir.optimize.AssumeInserter -> com.android.tools.r8.internal.R1:
+com.android.tools.r8.ir.optimize.AssumeInserter -> com.android.tools.r8.internal.M1:
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():60:60 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.AppView):64:65 -> <init>
+    1:1:void <clinit>():57:57 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.AppView):62:64 -> <init>
     boolean lambda$computeDominanceForAssumedValues$2(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
     boolean lambda$computeDominanceForAssumedValues$4(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
-    1:1:void insertAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):69:69 -> a
-    2:2:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):77:77 -> a
-    3:3:void com.android.tools.r8.ir.optimize.AssumeInserter.internalInsertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):87:87 -> a
-    3:3:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):78 -> a
-    4:11:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues com.android.tools.r8.ir.optimize.AssumeInserter.computeAssumedValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate):120:127 -> a
-    4:11:void com.android.tools.r8.ir.optimize.AssumeInserter.internalInsertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):88 -> a
-    4:11:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):78 -> a
-    12:12:void com.android.tools.r8.ir.optimize.AssumeInserter.internalInsertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):89:89 -> a
-    12:12:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):78 -> a
-    13:13:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues.isEmpty():806:806 -> a
-    13:13:void com.android.tools.r8.ir.optimize.AssumeInserter.internalInsertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):90 -> a
-    13:13:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):78 -> a
-    14:21:void com.android.tools.r8.ir.optimize.AssumeInserter.internalInsertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):94:101 -> a
-    14:21:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):78 -> a
-    22:22:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues.isEmpty():806:806 -> a
-    22:22:void com.android.tools.r8.ir.optimize.AssumeInserter.internalInsertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):102 -> a
-    22:22:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):78 -> a
-    23:23:void com.android.tools.r8.ir.optimize.AssumeInserter.internalInsertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):106:106 -> a
-    23:23:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):78 -> a
-    24:24:void com.android.tools.r8.ir.optimize.AssumeInserter.removeRedundantDominatedAssumeInstructions(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,java.util.Map):488:488 -> a
-    24:24:void com.android.tools.r8.ir.optimize.AssumeInserter.internalInsertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):107 -> a
-    24:24:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):78 -> a
-    25:25:void com.android.tools.r8.ir.optimize.AssumeInserter.internalInsertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):108:108 -> a
-    25:25:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):78 -> a
-    26:26:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues.isEmpty():806:806 -> a
-    26:26:void com.android.tools.r8.ir.optimize.AssumeInserter.internalInsertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):109 -> a
-    26:26:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):78 -> a
-    27:29:void com.android.tools.r8.ir.optimize.AssumeInserter.internalInsertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):113:115 -> a
-    27:29:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):78 -> a
-    30:30:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):79:79 -> a
-    31:50:void computeAssumedValuesInBlock(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.ir.optimize.AssumeInserter$AssumedValues$Builder):140:159 -> a
-    51:56:void computeAssumedValuesInBlock(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.ir.optimize.AssumeInserter$AssumedValues$Builder):158:163 -> a
-    57:81:boolean com.android.tools.r8.ir.optimize.AssumeInserter.computeAssumedValuesForFieldGet(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):286:310 -> a
-    57:81:void computeAssumedValuesInBlock(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.ir.optimize.AssumeInserter$AssumedValues$Builder):163 -> a
-    82:82:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo.getDynamicUpperBoundTypeOrElse(com.android.tools.r8.ir.analysis.type.TypeElement):52:52 -> a
-    82:82:boolean com.android.tools.r8.ir.optimize.AssumeInserter.computeAssumedValuesForFieldGet(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):310 -> a
-    82:82:void computeAssumedValuesInBlock(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.ir.optimize.AssumeInserter$AssumedValues$Builder):163 -> a
-    83:83:boolean com.android.tools.r8.ir.optimize.AssumeInserter.computeAssumedValuesForFieldGet(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):311:311 -> a
-    83:83:void computeAssumedValuesInBlock(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.ir.optimize.AssumeInserter$AssumedValues$Builder):163 -> a
-    84:84:boolean com.android.tools.r8.ir.optimize.AssumeInserter.computeAssumedValuesForFieldGet(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):308:308 -> a
-    84:84:void computeAssumedValuesInBlock(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.ir.optimize.AssumeInserter$AssumedValues$Builder):163 -> a
-    85:89:void computeAssumedValuesInBlock(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.ir.optimize.AssumeInserter$AssumedValues$Builder):172:176 -> a
-    90:90:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.peekPrevious():27:27 -> a
-    90:90:void computeAssumedValuesInBlock(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.ir.optimize.AssumeInserter$AssumedValues$Builder):177 -> a
-    91:101:void computeAssumedValuesInBlock(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.ir.optimize.AssumeInserter$AssumedValues$Builder):177:187 -> a
-    102:102:boolean com.android.tools.r8.ir.code.If.isNullTest():93:93 -> a
-    102:102:boolean com.android.tools.r8.ir.code.If.isNonTrivialNullTest():97 -> a
-    102:102:void computeAssumedValuesInBlock(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.ir.optimize.AssumeInserter$AssumedValues$Builder):188 -> a
-    103:103:boolean com.android.tools.r8.ir.code.If.isNonTrivialNullTest():97:97 -> a
-    103:103:void computeAssumedValuesInBlock(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.ir.optimize.AssumeInserter$AssumedValues$Builder):188 -> a
-    104:108:void computeAssumedValuesInBlock(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.ir.optimize.AssumeInserter$AssumedValues$Builder):189:193 -> a
-    109:115:boolean computeAssumedValuesForInvokeMethod(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):200:206 -> a
-    116:123:boolean com.android.tools.r8.ir.optimize.AssumeInserter.computeAssumedValuesFromArrayClone(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):215:222 -> a
-    116:123:boolean computeAssumedValuesForInvokeMethod(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):207 -> a
-    124:124:boolean computeAssumedValuesForInvokeMethod(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):210:210 -> a
-    125:141:boolean computeAssumedValuesForOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):320:336 -> a
-    142:142:void removeRedundantAssumeInstructions(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues):343:343 -> a
-    143:155:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):346:358 -> a
-    156:157:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues.getAssumedValueInfo(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):801:802 -> a
-    156:157:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):364 -> a
-    158:158:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):369:369 -> a
-    159:159:com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.getDynamicTypeAssumption():703:703 -> a
-    159:159:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):373 -> a
-    160:160:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setDynamicTypeAssumption(com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption):707:707 -> a
-    160:160:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):372 -> a
-    161:164:java.util.Map computeDominanceForAssumedValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues):383:386 -> a
-    165:167:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,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):389:391 -> a
-    168:168:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.isSubsumedBy(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):736:736 -> a
-    168:168:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,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):393 -> a
-    169:169:com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.unknown():962:962 -> a
-    169:169:com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.redundant():953 -> a
-    169:169:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,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):396 -> a
-    170:170:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.strengthenWith(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):740:740 -> a
-    170:170:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,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):400 -> a
-    171:171:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setNotNull():732:732 -> a
-    171:171:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.strengthenWith(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):741 -> a
-    171:171:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,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):400 -> a
-    172:172:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.strengthenWith(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):743:743 -> a
-    172:172:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,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):400 -> a
-    173:173:com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.getDynamicTypeAssumption():703:703 -> a
-    173:173:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.strengthenWith(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):744 -> a
-    173:173:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,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):400 -> a
-    174:174:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setDynamicTypeAssumption(com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption):707:707 -> a
-    174:174:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.strengthenWith(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):744 -> a
-    174:174:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,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):400 -> a
-    175:175:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,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):405:405 -> a
-    176:176:com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.everything():941:941 -> a
-    176:176:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,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):406 -> a
-    177:193:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,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):413:429 -> a
-    194:194:com.android.tools.r8.ir.optimize.AssumeInserter$EverythingElseAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.everythingElse():945:945 -> a
-    194:194:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,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):435 -> a
-    195:199:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,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):440:444 -> a
-    200:209:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,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):442:451 -> a
-    210:210:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance$Builder com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.builder(com.android.tools.r8.ir.code.Value):937:937 -> a
-    210:210:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,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):454 -> a
-    211:229:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,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):455:473 -> a
-    230:235:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList com.android.tools.r8.ir.optimize.AssumeInserter.findDominatedPredecessorIndexesInPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value,java.util.Set):637:642 -> a
-    230:235:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,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):475 -> a
-    236:236:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> a
-    236:236:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList com.android.tools.r8.ir.optimize.AssumeInserter.findDominatedPredecessorIndexesInPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value,java.util.Set):642 -> a
-    236:236:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,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):475 -> a
-    237:245:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList com.android.tools.r8.ir.optimize.AssumeInserter.findDominatedPredecessorIndexesInPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value,java.util.Set):644:652 -> a
-    237:245:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,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):475 -> a
-    246:250:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,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):476:480 -> a
-    251:251:java.util.Set lambda$computeDominanceForAssumedValues$3(com.android.tools.r8.ir.code.DominatorTree,com.android.tools.r8.ir.code.BasicBlock):452:452 -> a
-    252:252:boolean lambda$materializeAssumeInstructions$7(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):523:523 -> a
-    253:253:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isEverything():0:0 -> a
-    253:253:boolean lambda$materializeAssumeInstructions$7(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):523 -> a
-    254:260:void lambda$materializeAssumeInstructions$9(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.Map):532:538 -> a
-    261:261:void materializeSelectedAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,java.util.Set,java.util.Map,java.util.function.Predicate):553:553 -> a
-    262: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):555:560 -> a
-    268:268:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.getDominance():691:691 -> a
-    268:268: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):562 -> a
-    269:270:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.isNull():723:724 -> a
-    269:270: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):564 -> a
-    271:276: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):565:570 -> a
-    277:282: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):566:571 -> a
-    283:283:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isEverything():0:0 -> a
-    283:283: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):571 -> a
-    284:284: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):572:572 -> a
-    285:285:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isEverythingElse():0:0 -> a
-    285:285: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):573 -> a
-    286:287: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):574:575 -> a
-    288:288:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isSomething():0:0 -> a
-    288:288: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):576 -> a
-    289:306: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):577:594 -> a
-    307:312: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):591:596 -> a
-    313:314:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.isNull():723:724 -> a
-    313:314: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):599 -> a
-    315:333: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):600:618 -> a
-    334:339:void lambda$materializeSelectedAssumeInstructions$11(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):582:587 -> a
-    340:340:java.util.Map lambda$materializeSelectedAssumeInstructions$12(com.android.tools.r8.ir.code.BasicBlock):616:616 -> a
-    341:346:com.android.tools.r8.ir.code.BasicBlock getInsertionBlock(com.android.tools.r8.ir.code.Instruction):625:630 -> a
-    347:348:boolean com.android.tools.r8.ir.optimize.AssumeInserter.isNullableReferenceType(com.android.tools.r8.ir.code.Value):661:662 -> a
-    347:348:boolean isNullableReferenceTypeWithOtherNonDebugUsers(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):667 -> a
-    349:352:boolean isNullableReferenceTypeWithOtherNonDebugUsers(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):668:671 -> a
+    1:1:void insertAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):68:68 -> a
+    2:2:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):76:76 -> a
+    3:3:void com.android.tools.r8.ir.optimize.AssumeInserter.internalInsertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):86:86 -> a
+    3:3:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):77 -> a
+    4:11:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues com.android.tools.r8.ir.optimize.AssumeInserter.computeAssumedValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate):119:126 -> a
+    4:11:void com.android.tools.r8.ir.optimize.AssumeInserter.internalInsertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):87 -> a
+    4:11:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):77 -> a
+    12:12:void com.android.tools.r8.ir.optimize.AssumeInserter.internalInsertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):88:88 -> a
+    12:12:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):77 -> a
+    13:13:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues.isEmpty():776:776 -> a
+    13:13:void com.android.tools.r8.ir.optimize.AssumeInserter.internalInsertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):89 -> a
+    13:13:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):77 -> a
+    14:21:void com.android.tools.r8.ir.optimize.AssumeInserter.internalInsertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):93:100 -> a
+    14:21:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):77 -> a
+    22:22:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues.isEmpty():776:776 -> a
+    22:22:void com.android.tools.r8.ir.optimize.AssumeInserter.internalInsertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):101 -> a
+    22:22:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):77 -> a
+    23:23:void com.android.tools.r8.ir.optimize.AssumeInserter.internalInsertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):105:105 -> a
+    23:23:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):77 -> a
+    24:24:void com.android.tools.r8.ir.optimize.AssumeInserter.removeRedundantDominatedAssumeInstructions(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,java.util.Map):458:458 -> a
+    24:24:void com.android.tools.r8.ir.optimize.AssumeInserter.internalInsertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):106 -> a
+    24:24:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):77 -> a
+    25:25:void com.android.tools.r8.ir.optimize.AssumeInserter.internalInsertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):107:107 -> a
+    25:25:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):77 -> a
+    26:26:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues.isEmpty():776:776 -> a
+    26:26:void com.android.tools.r8.ir.optimize.AssumeInserter.internalInsertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):108 -> a
+    26:26:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):77 -> a
+    27:29:void com.android.tools.r8.ir.optimize.AssumeInserter.internalInsertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):112:114 -> a
+    27:29:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):77 -> a
+    30:30:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):78:78 -> a
+    31:50:void computeAssumedValuesInBlock(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.ir.optimize.AssumeInserter$AssumedValues$Builder):139:158 -> a
+    51:56:void computeAssumedValuesInBlock(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.ir.optimize.AssumeInserter$AssumedValues$Builder):157:162 -> a
+    57:70:boolean com.android.tools.r8.ir.optimize.AssumeInserter.computeAssumedValuesForFieldGet(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):267:280 -> a
+    57:70:void computeAssumedValuesInBlock(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.ir.optimize.AssumeInserter$AssumedValues$Builder):162 -> a
+    71:71:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo.getDynamicUpperBoundTypeOrElse(com.android.tools.r8.ir.analysis.type.TypeElement):52:52 -> a
+    71:71:boolean com.android.tools.r8.ir.optimize.AssumeInserter.computeAssumedValuesForFieldGet(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):280 -> a
+    71:71:void computeAssumedValuesInBlock(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.ir.optimize.AssumeInserter$AssumedValues$Builder):162 -> a
+    72:72:boolean com.android.tools.r8.ir.optimize.AssumeInserter.computeAssumedValuesForFieldGet(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):281:281 -> a
+    72:72:void computeAssumedValuesInBlock(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.ir.optimize.AssumeInserter$AssumedValues$Builder):162 -> a
+    73:73:boolean com.android.tools.r8.ir.optimize.AssumeInserter.computeAssumedValuesForFieldGet(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):278:278 -> a
+    73:73:void computeAssumedValuesInBlock(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.ir.optimize.AssumeInserter$AssumedValues$Builder):162 -> a
+    74:78:void computeAssumedValuesInBlock(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.ir.optimize.AssumeInserter$AssumedValues$Builder):171:175 -> a
+    79:79:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.peekPrevious():27:27 -> a
+    79:79:void computeAssumedValuesInBlock(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.ir.optimize.AssumeInserter$AssumedValues$Builder):176 -> a
+    80:90:void computeAssumedValuesInBlock(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.ir.optimize.AssumeInserter$AssumedValues$Builder):176:186 -> a
+    91:91:boolean com.android.tools.r8.ir.code.If.isNullTest():93:93 -> a
+    91:91:boolean com.android.tools.r8.ir.code.If.isNonTrivialNullTest():97 -> a
+    91:91:void computeAssumedValuesInBlock(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.ir.optimize.AssumeInserter$AssumedValues$Builder):187 -> a
+    92:92:boolean com.android.tools.r8.ir.code.If.isNonTrivialNullTest():97:97 -> a
+    92:92:void computeAssumedValuesInBlock(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.ir.optimize.AssumeInserter$AssumedValues$Builder):187 -> a
+    93:97:void computeAssumedValuesInBlock(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.ir.optimize.AssumeInserter$AssumedValues$Builder):188:192 -> a
+    98:104:boolean computeAssumedValuesForInvokeMethod(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):199:205 -> a
+    105:112:boolean com.android.tools.r8.ir.optimize.AssumeInserter.computeAssumedValuesFromArrayClone(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):214:221 -> a
+    105:112:boolean computeAssumedValuesForInvokeMethod(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):206 -> a
+    113:113:boolean computeAssumedValuesForInvokeMethod(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):209:209 -> a
+    114:130:boolean computeAssumedValuesForOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):290:306 -> a
+    131:131:void removeRedundantAssumeInstructions(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues):313:313 -> a
+    132:144:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):316:328 -> a
+    145:146:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues.getAssumedValueInfo(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):771:772 -> a
+    145:146:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):334 -> a
+    147:147:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):339:339 -> a
+    148:148:com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.getDynamicTypeAssumption():673:673 -> a
+    148:148:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):343 -> a
+    149:149:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setDynamicTypeAssumption(com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption):677:677 -> a
+    149:149:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):342 -> a
+    150:153:java.util.Map computeDominanceForAssumedValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues):353:356 -> a
+    154:156:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,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):359:361 -> a
+    157:157:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.isSubsumedBy(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):706:706 -> a
+    157:157:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,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):363 -> a
+    158:158:com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.unknown():932:932 -> a
+    158:158:com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.redundant():923 -> a
+    158:158:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,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):366 -> a
+    159:159:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.strengthenWith(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):710:710 -> a
+    159:159:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,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):370 -> a
+    160:160:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setNotNull():702:702 -> a
+    160:160:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.strengthenWith(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):711 -> a
+    160:160:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,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):370 -> a
+    161:161:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.strengthenWith(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):713:713 -> a
+    161:161:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,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):370 -> a
+    162:162:com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.getDynamicTypeAssumption():673:673 -> a
+    162:162:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.strengthenWith(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):714 -> a
+    162:162:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,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):370 -> a
+    163:163:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setDynamicTypeAssumption(com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption):677:677 -> a
+    163:163:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.strengthenWith(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):714 -> a
+    163:163:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,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):370 -> a
+    164:164:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,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):375:375 -> a
+    165:165:com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.everything():911:911 -> a
+    165:165:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,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):376 -> a
+    166:182:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,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):383:399 -> a
+    183:183:com.android.tools.r8.ir.optimize.AssumeInserter$EverythingElseAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.everythingElse():915:915 -> a
+    183:183:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,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):405 -> a
+    184:188:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,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):410:414 -> a
+    189:198:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,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):412:421 -> a
+    199:199:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance$Builder com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.builder(com.android.tools.r8.ir.code.Value):907:907 -> a
+    199:199:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,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):424 -> a
+    200:218:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,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):425:443 -> a
+    219:224:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList com.android.tools.r8.ir.optimize.AssumeInserter.findDominatedPredecessorIndexesInPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value,java.util.Set):607:612 -> a
+    219:224:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,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):445 -> a
+    225:225:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> a
+    225:225:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList com.android.tools.r8.ir.optimize.AssumeInserter.findDominatedPredecessorIndexesInPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value,java.util.Set):612 -> a
+    225:225:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,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):445 -> a
+    226:234:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList com.android.tools.r8.ir.optimize.AssumeInserter.findDominatedPredecessorIndexesInPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value,java.util.Set):614:622 -> a
+    226:234:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,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):445 -> a
+    235:239:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,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):446:450 -> a
+    240:240:java.util.Set lambda$computeDominanceForAssumedValues$3(com.android.tools.r8.ir.code.DominatorTree,com.android.tools.r8.ir.code.BasicBlock):422:422 -> a
+    241:241:boolean lambda$materializeAssumeInstructions$7(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):493:493 -> a
+    242:242:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isEverything():0:0 -> a
+    242:242:boolean lambda$materializeAssumeInstructions$7(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):493 -> a
+    243:249:void lambda$materializeAssumeInstructions$9(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.Map):502:508 -> a
+    250:250:void materializeSelectedAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,java.util.Set,java.util.Map,java.util.function.Predicate):523:523 -> a
+    251:256: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):525:530 -> a
+    257:257:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.getDominance():661:661 -> a
+    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: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:271: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:541 -> a
+    272:272:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isEverything():0:0 -> a
+    272:272: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
+    273:273: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):542:542 -> a
+    274:274:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isEverythingElse():0:0 -> a
+    274:274: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):543 -> a
+    275:276: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):544:545 -> a
+    277:277:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isSomething():0:0 -> a
+    277:277: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):546 -> a
+    278:295: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):547:564 -> a
+    296:301: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):561:566 -> a
+    302:303:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.isNull():693:694 -> a
+    302:303: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):569 -> a
+    304:322: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):570:588 -> a
+    323:328:void lambda$materializeSelectedAssumeInstructions$11(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):552:557 -> a
+    329:329:java.util.Map lambda$materializeSelectedAssumeInstructions$12(com.android.tools.r8.ir.code.BasicBlock):586:586 -> a
+    330:335:com.android.tools.r8.ir.code.BasicBlock getInsertionBlock(com.android.tools.r8.ir.code.Instruction):595:600 -> a
+    336:337:boolean com.android.tools.r8.ir.optimize.AssumeInserter.isNullableReferenceType(com.android.tools.r8.ir.code.Value):631:632 -> a
+    336:337:boolean isNullableReferenceTypeWithOtherNonDebugUsers(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):637 -> a
+    338:341:boolean isNullableReferenceTypeWithOtherNonDebugUsers(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):638:641 -> a
     boolean lambda$materializeSelectedAssumeInstructions$10(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> b
-    1:33:boolean computeAssumedValuesFromSingleTarget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):229:261 -> b
-    34:34:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo.getDynamicUpperBoundTypeOrElse(com.android.tools.r8.ir.analysis.type.TypeElement):41:41 -> b
-    34:34:boolean computeAssumedValuesFromSingleTarget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):261 -> b
-    35:35:boolean computeAssumedValuesFromSingleTarget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):262:262 -> b
-    36:52:boolean computeAssumedValuesFromSingleTarget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):259:275 -> b
-    53:53:boolean lambda$computeDominanceForAssumedValues$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):419:419 -> b
-    54:54:java.util.Map lambda$computeDominanceForAssumedValues$5(com.android.tools.r8.ir.code.Instruction):469:469 -> b
-    55:106:void materializeAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues):492:543 -> b
-    107:107:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> b
-    107:107:void materializeAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues):543 -> b
-    108:108:void materializeAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues):543:543 -> b
-    109:109:boolean lambda$materializeAssumeInstructions$8(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):529:529 -> b
-    110:110:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isEverything():0:0 -> b
-    110:110:boolean lambda$materializeAssumeInstructions$8(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):529 -> b
-    1:1:java.util.List lambda$materializeSelectedAssumeInstructions$13(com.android.tools.r8.ir.code.Instruction):617:617 -> c
-com.android.tools.r8.ir.optimize.AssumeInserter$1 -> com.android.tools.r8.internal.R1$a:
-com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance -> com.android.tools.r8.internal.R1$b:
-    1:1:void <init>():910:910 -> <init>
+    1:15:boolean computeAssumedValuesFromSingleTarget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):228:242 -> b
+    16:16:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo.getDynamicUpperBoundTypeOrElse(com.android.tools.r8.ir.analysis.type.TypeElement):41:41 -> b
+    16:16:boolean computeAssumedValuesFromSingleTarget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):242 -> b
+    17:17:boolean computeAssumedValuesFromSingleTarget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):243:243 -> b
+    18:34:boolean computeAssumedValuesFromSingleTarget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):240:256 -> b
+    35:35:boolean lambda$computeDominanceForAssumedValues$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):389:389 -> b
+    36:36:java.util.Map lambda$computeDominanceForAssumedValues$5(com.android.tools.r8.ir.code.Instruction):439:439 -> b
+    37:88:void materializeAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues):462:513 -> b
+    89:89:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> b
+    89:89:void materializeAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues):513 -> b
+    90:90:void materializeAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues):513:513 -> b
+    91:91:boolean lambda$materializeAssumeInstructions$8(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):499:499 -> b
+    92:92:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isEverything():0:0 -> b
+    92:92:boolean lambda$materializeAssumeInstructions$8(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):499 -> b
+    1:1:java.util.List lambda$materializeSelectedAssumeInstructions$13(com.android.tools.r8.ir.code.Instruction):587:587 -> c
+com.android.tools.r8.ir.optimize.AssumeInserter$1 -> com.android.tools.r8.internal.M1$a:
+com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance -> com.android.tools.r8.internal.M1$b:
+    1:1:void <init>():880:880 -> <init>
     com.android.tools.r8.ir.optimize.AssumeInserter$SomethingAssumedDominance asSomething() -> a
-com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance$Builder -> com.android.tools.r8.internal.R1$b$a:
+com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance$Builder -> com.android.tools.r8.internal.M1$b$a:
     java.util.Map dominatedPhiUsers -> d
     java.util.Set dominatedUsers -> c
     com.android.tools.r8.ir.code.Value assumedValue -> b
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():965:965 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$1):965:965 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.code.Value):972:972 -> <init>
-    3:7:void <init>(com.android.tools.r8.ir.code.Value):969:973 -> <init>
-    1:3:void addDominatedUser(com.android.tools.r8.ir.code.Instruction):977:979 -> a
-    4:6:void addDominatedPhiUser(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):983:985 -> a
-    7:7:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance build():989:989 -> a
-    8:8:com.android.tools.r8.ir.optimize.AssumeInserter$NothingAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.nothing():949:949 -> a
-    8:8:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance build():990 -> a
-    9:11:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance build():992:992 -> a
-    13:13:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance build():994:994 -> a
-    14:14:com.android.tools.r8.ir.optimize.AssumeInserter$SomethingAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.something(java.util.Set,java.util.Map):958:958 -> a
-    14:14:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance build():994 -> a
-com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo -> com.android.tools.r8.internal.R1$c:
+    1:1:void <clinit>():935:935 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$1):935:935 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.Value):942:942 -> <init>
+    3:7:void <init>(com.android.tools.r8.ir.code.Value):939:943 -> <init>
+    1:3:void addDominatedUser(com.android.tools.r8.ir.code.Instruction):947:949 -> a
+    4:6:void addDominatedPhiUser(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):953:955 -> a
+    7:7:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance build():959:959 -> a
+    8:8:com.android.tools.r8.ir.optimize.AssumeInserter$NothingAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.nothing():919:919 -> a
+    8:8:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance build():960 -> a
+    9:11:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance build():962:962 -> a
+    13:13:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance build():964:964 -> a
+    14:14:com.android.tools.r8.ir.optimize.AssumeInserter$SomethingAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.something(java.util.Set,java.util.Map):928:928 -> a
+    14:14:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance build():964 -> a
+com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo -> com.android.tools.r8.internal.M1$c:
     com.android.tools.r8.ir.code.Assume$NonNullAssumption nonNullAssumption -> c
     com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance dominance -> a
     com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption dynamicTypeAssumption -> b
-    1:2:void <init>(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance):686:687 -> <init>
-    1:1:boolean hasDynamicTypeInfo():699:699 -> a
-    1:1:boolean isNonNull():728:728 -> b
-    1:1:void setNotNull():732:732 -> c
-com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues -> com.android.tools.r8.internal.R1$d:
+    1:2:void <init>(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance):656:657 -> <init>
+    1:1:boolean hasDynamicTypeInfo():669:669 -> a
+    1:1:boolean isNonNull():698:698 -> b
+    1:1:void setNotNull():702:702 -> c
+com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues -> com.android.tools.r8.internal.M1$d:
     java.util.Map assumedValues -> b
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():749:749 -> <clinit>
-    1:2:void <init>(java.util.Map):758:759 -> <init>
-    1:14:void computeDominance(com.android.tools.r8.utils.TriFunction):768:781 -> a
+    1:1:void <clinit>():719:719 -> <clinit>
+    1:2:void <init>(java.util.Map):728:729 -> <init>
+    1:14:void computeDominance(com.android.tools.r8.utils.TriFunction):738:751 -> a
     15:15:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isEverything():0:0 -> a
-    15:15:void computeDominance(com.android.tools.r8.utils.TriFunction):781 -> a
-    16:20:void computeDominance(com.android.tools.r8.utils.TriFunction):782:786 -> a
+    15:15:void computeDominance(com.android.tools.r8.utils.TriFunction):751 -> a
+    16:20:void computeDominance(com.android.tools.r8.utils.TriFunction):752:756 -> a
     21:21:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isUnknown():0:0 -> a
-    21:21:void computeDominance(com.android.tools.r8.utils.TriFunction):786 -> a
-    22:24:void computeDominance(com.android.tools.r8.utils.TriFunction):786:788 -> a
+    21:21:void computeDominance(com.android.tools.r8.utils.TriFunction):756 -> a
+    22:24:void computeDominance(com.android.tools.r8.utils.TriFunction):756:758 -> a
     25:25:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isNothing():0:0 -> a
-    25:25:void computeDominance(com.android.tools.r8.utils.TriFunction):788 -> a
-    26:26:void computeDominance(com.android.tools.r8.utils.TriFunction):788:788 -> a
+    25:25:void computeDominance(com.android.tools.r8.utils.TriFunction):758 -> a
+    26:26:void computeDominance(com.android.tools.r8.utils.TriFunction):758:758 -> a
     27:27:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isUnknown():0:0 -> a
-    27:27:void computeDominance(com.android.tools.r8.utils.TriFunction):788 -> a
-    28:28:void computeDominance(com.android.tools.r8.utils.TriFunction):789:789 -> a
-    29:29:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setDominance(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance):695:695 -> a
-    29:29:void computeDominance(com.android.tools.r8.utils.TriFunction):791 -> a
-    30:31:void computeDominance(com.android.tools.r8.utils.TriFunction):794:795 -> a
-    32:32:boolean lambda$computeDominance$0(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):783:783 -> a
-    33:33:void removeAll(java.util.Map):818:818 -> a
-    34:38:void lambda$removeAll$3(com.android.tools.r8.ir.code.Instruction,java.util.Map):820:824 -> a
-    39:56:void removeIf(com.android.tools.r8.utils.TriPredicate):831:848 -> a
-com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder -> com.android.tools.r8.internal.R1$d$a:
+    27:27:void computeDominance(com.android.tools.r8.utils.TriFunction):758 -> a
+    28:28:void computeDominance(com.android.tools.r8.utils.TriFunction):759:759 -> a
+    29:29:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setDominance(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance):665:665 -> a
+    29:29:void computeDominance(com.android.tools.r8.utils.TriFunction):761 -> a
+    30:31:void computeDominance(com.android.tools.r8.utils.TriFunction):764:765 -> a
+    32:32:boolean lambda$computeDominance$0(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):753:753 -> a
+    33:33:void removeAll(java.util.Map):788:788 -> a
+    34:38:void lambda$removeAll$3(com.android.tools.r8.ir.code.Instruction,java.util.Map):790:794 -> a
+    39:56:void removeIf(com.android.tools.r8.utils.TriPredicate):801:818 -> a
+com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder -> com.android.tools.r8.internal.M1$d$a:
     java.util.Map assumedValues -> a
     java.util.Set nonNullValuesKnownToDominateAllUsers -> b
-    1:7:void <init>():853:859 -> <init>
-    1:5:void updateAssumedValueInfo(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance,java.util.function.Consumer):866:870 -> a
+    1:7:void <init>():823:829 -> <init>
+    1:5:void updateAssumedValueInfo(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance,java.util.function.Consumer):836:840 -> a
     6:6:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isEverything():0:0 -> a
-    6:6:void updateAssumedValueInfo(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance,java.util.function.Consumer):871 -> a
-    7:8:void updateAssumedValueInfo(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance,java.util.function.Consumer):871:872 -> a
-    9:9:java.util.Map lambda$updateAssumedValueInfo$0(com.android.tools.r8.ir.code.Instruction):868:868 -> a
-    10:10:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo lambda$updateAssumedValueInfo$1(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance,com.android.tools.r8.ir.code.Value):869:869 -> a
-    11:11:void lambda$addAssumedValueKnownToDominateAllUsers$2(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):886:886 -> a
-    12:14:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setDynamicTypeAssumption(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):712:714 -> a
-    12:14:void lambda$addAssumedValueKnownToDominateAllUsers$2(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):886 -> a
-    15:15:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setNotNull():732:732 -> a
-    15:15:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setDynamicTypeAssumption(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):715 -> a
-    15:15:void lambda$addAssumedValueKnownToDominateAllUsers$2(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):886 -> a
-    16:16:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setDynamicTypeAssumption(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):717:717 -> a
-    16:16:void lambda$addAssumedValueKnownToDominateAllUsers$2(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):886 -> a
-    17:17:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setNotNull():732:732 -> a
-    17:17:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setDynamicTypeAssumption(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):718 -> a
-    17:17:void lambda$addAssumedValueKnownToDominateAllUsers$2(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):886 -> a
-    18:18:boolean isMaybeNull(com.android.tools.r8.ir.code.Value):901:901 -> a
-    19:19:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues build():905:905 -> a
-    20:20:com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.everything():941:941 -> a
-    20:20:void addAssumedValueKnownToDominateAllUsers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):884 -> a
-    21:21:void addAssumedValueKnownToDominateAllUsers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):884:884 -> a
-    22:22:void addAssumedValueKnownToDominateAllUsers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):881:881 -> a
-    23:23:com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.everything():941:941 -> a
-    23:23:void addNonNullValueKnownToDominateAllUsers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):892 -> a
-    24:24:void addNonNullValueKnownToDominateAllUsers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):892:892 -> a
-    25:25:void addNonNullValueKnownToDominateAllUsers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):891:891 -> a
-    1:1:com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.unknown():962:962 -> b
-    1:1:void addNonNullValueWithUnknownDominance(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):897 -> b
-    2:2:void addNonNullValueWithUnknownDominance(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):897:897 -> b
-    3:3:void addNonNullValueWithUnknownDominance(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):896:896 -> b
-com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance -> com.android.tools.r8.internal.R1$e:
+    6:6:void updateAssumedValueInfo(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance,java.util.function.Consumer):841 -> a
+    7:8:void updateAssumedValueInfo(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance,java.util.function.Consumer):841:842 -> a
+    9:9:java.util.Map lambda$updateAssumedValueInfo$0(com.android.tools.r8.ir.code.Instruction):838:838 -> a
+    10:10:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo lambda$updateAssumedValueInfo$1(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance,com.android.tools.r8.ir.code.Value):839:839 -> a
+    11:11:void lambda$addAssumedValueKnownToDominateAllUsers$2(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):856:856 -> a
+    12:14:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setDynamicTypeAssumption(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):682:684 -> a
+    12:14:void lambda$addAssumedValueKnownToDominateAllUsers$2(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):856 -> a
+    15:15:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setNotNull():702:702 -> a
+    15:15:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setDynamicTypeAssumption(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):685 -> a
+    15:15:void lambda$addAssumedValueKnownToDominateAllUsers$2(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):856 -> a
+    16:16:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setDynamicTypeAssumption(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):687:687 -> a
+    16:16:void lambda$addAssumedValueKnownToDominateAllUsers$2(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):856 -> a
+    17:17:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setNotNull():702:702 -> a
+    17:17:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setDynamicTypeAssumption(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):688 -> a
+    17:17:void lambda$addAssumedValueKnownToDominateAllUsers$2(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):856 -> a
+    18:18:boolean isMaybeNull(com.android.tools.r8.ir.code.Value):871:871 -> a
+    19:19:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues build():875:875 -> a
+    20:20:com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.everything():911:911 -> a
+    20:20:void addAssumedValueKnownToDominateAllUsers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):854 -> a
+    21:21:void addAssumedValueKnownToDominateAllUsers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):854:854 -> a
+    22:22:void addAssumedValueKnownToDominateAllUsers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):851:851 -> a
+    23:23:com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.everything():911:911 -> a
+    23:23:void addNonNullValueKnownToDominateAllUsers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):862 -> a
+    24:24:void addNonNullValueKnownToDominateAllUsers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):862:862 -> a
+    25:25:void addNonNullValueKnownToDominateAllUsers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):861:861 -> a
+    1:1:com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.unknown():932:932 -> b
+    1:1:void addNonNullValueWithUnknownDominance(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):867 -> b
+    2:2:void addNonNullValueWithUnknownDominance(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):867:867 -> b
+    3:3:void addNonNullValueWithUnknownDominance(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):866:866 -> b
+com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance -> com.android.tools.r8.internal.M1$e:
     com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance INSTANCE -> a
-    1:1:void <clinit>():1001:1001 -> <clinit>
-    1:1:void <init>():1003:1003 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance getInstance():1006:1006 -> b
-com.android.tools.r8.ir.optimize.AssumeInserter$EverythingElseAssumedDominance -> com.android.tools.r8.internal.R1$f:
+    1:1:void <clinit>():971:971 -> <clinit>
+    1:1:void <init>():973:973 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance getInstance():976:976 -> b
+com.android.tools.r8.ir.optimize.AssumeInserter$EverythingElseAssumedDominance -> com.android.tools.r8.internal.M1$f:
     com.android.tools.r8.ir.optimize.AssumeInserter$EverythingElseAssumedDominance INSTANCE -> a
-    1:1:void <clinit>():1017:1017 -> <clinit>
-    1:1:void <init>():1020:1020 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.AssumeInserter$EverythingElseAssumedDominance getInstance():1023:1023 -> b
-com.android.tools.r8.ir.optimize.AssumeInserter$NothingAssumedDominance -> com.android.tools.r8.internal.R1$g:
+    1:1:void <clinit>():987:987 -> <clinit>
+    1:1:void <init>():990:990 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.AssumeInserter$EverythingElseAssumedDominance getInstance():993:993 -> b
+com.android.tools.r8.ir.optimize.AssumeInserter$NothingAssumedDominance -> com.android.tools.r8.internal.M1$g:
     com.android.tools.r8.ir.optimize.AssumeInserter$NothingAssumedDominance INSTANCE -> a
-    1:1:void <clinit>():1034:1034 -> <clinit>
-    1:1:void <init>():1036:1036 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.AssumeInserter$NothingAssumedDominance getInstance():1039:1039 -> b
-com.android.tools.r8.ir.optimize.AssumeInserter$SomethingAssumedDominance -> com.android.tools.r8.internal.R1$h:
+    1:1:void <clinit>():1004:1004 -> <clinit>
+    1:1:void <init>():1006:1006 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.AssumeInserter$NothingAssumedDominance getInstance():1009:1009 -> b
+com.android.tools.r8.ir.optimize.AssumeInserter$SomethingAssumedDominance -> com.android.tools.r8.internal.M1$h:
     java.util.Map dominatedPhiUsers -> b
     java.util.Set dominatedUsers -> a
-    1:3:void <init>(java.util.Set,java.util.Map):1054:1056 -> <init>
+    1:3:void <init>(java.util.Set,java.util.Map):1024:1026 -> <init>
     com.android.tools.r8.ir.optimize.AssumeInserter$SomethingAssumedDominance asSomething() -> a
-    1:1:java.util.Map getDominatedPhiUsers():1064:1064 -> b
-    1:1:java.util.Set getDominatedUsers():1060:1060 -> c
-com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance -> com.android.tools.r8.internal.R1$i:
+    1:1:java.util.Map getDominatedPhiUsers():1034:1034 -> b
+    1:1:java.util.Set getDominatedUsers():1030:1030 -> c
+com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance -> com.android.tools.r8.internal.M1$i:
     com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance INSTANCE -> a
-    1:1:void <clinit>():1080:1080 -> <clinit>
-    1:1:void <init>():1082:1082 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance getInstance():1085:1085 -> b
-com.android.tools.r8.ir.optimize.AssumeRemover -> com.android.tools.r8.internal.S1:
+    1:1:void <clinit>():1050:1050 -> <clinit>
+    1:1:void <init>():1052:1052 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance getInstance():1055:1055 -> b
+com.android.tools.r8.ir.optimize.AssumeRemover -> com.android.tools.r8.internal.N1:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set affectedValues -> c
     java.util.Set assumeInstructionsToRemove -> d
     boolean mayHaveIntroducedTrivialPhi -> e
     com.android.tools.r8.ir.code.IRCode code -> b
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):41:41 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):36:43 -> <init>
-    1:2:void markAssumeDynamicTypeUsersForRemoval(com.android.tools.r8.ir.code.Value):55:56 -> a
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):40:40 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):35:42 -> <init>
+    1:2:void markAssumeDynamicTypeUsersForRemoval(com.android.tools.r8.ir.code.Value):54:55 -> a
     3:3:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
-    3:3:void markAssumeDynamicTypeUsersForRemoval(com.android.tools.r8.ir.code.Value):56 -> a
-    4:7:void markAssumeDynamicTypeUsersForRemoval(com.android.tools.r8.ir.code.Value):57:60 -> a
-    8:10:void markUnusedAssumeValuesForRemoval(java.util.Collection):67:69 -> a
-    11:11:void com.android.tools.r8.ir.optimize.AssumeRemover.markForRemoval(com.android.tools.r8.ir.code.Assume):75:75 -> a
-    11:11:void markUnusedAssumeValuesForRemoval(java.util.Collection):69 -> a
-    12:26:void removeIfMarked(com.android.tools.r8.ir.code.Assume,com.android.tools.r8.ir.code.InstructionListIterator):80:94 -> a
-    27:35:com.android.tools.r8.ir.optimize.AssumeRemover removeMarkedInstructions(java.util.Set):103:111 -> a
-    36:36:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
-    36:36:com.android.tools.r8.ir.optimize.AssumeRemover removeMarkedInstructions(java.util.Set):111 -> a
-    37:37:com.android.tools.r8.ir.optimize.AssumeRemover removeMarkedInstructions(java.util.Set):112:112 -> a
-    38:39:void finish():121:122 -> a
-    40:40:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    40:40:void finish():122 -> a
-    41:41:void finish():122:122 -> a
-    1:1:java.util.Set getAffectedValues():47:47 -> b
-    1:1:boolean mayHaveIntroducedTrivialPhi():51:51 -> c
-com.android.tools.r8.ir.optimize.BasicBlockInstructionsEquivalence -> com.android.tools.r8.internal.h2:
+    3:3:void markAssumeDynamicTypeUsersForRemoval(com.android.tools.r8.ir.code.Value):55 -> a
+    4:7:void markAssumeDynamicTypeUsersForRemoval(com.android.tools.r8.ir.code.Value):56:59 -> a
+    8:22:void removeIfMarked(com.android.tools.r8.ir.code.Assume,com.android.tools.r8.ir.code.InstructionListIterator):71:85 -> a
+    23:31:com.android.tools.r8.ir.optimize.AssumeRemover removeMarkedInstructions(java.util.Set):94:102 -> a
+    32:32:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
+    32:32:com.android.tools.r8.ir.optimize.AssumeRemover removeMarkedInstructions(java.util.Set):102 -> a
+    33:33:com.android.tools.r8.ir.optimize.AssumeRemover removeMarkedInstructions(java.util.Set):103:103 -> a
+    34:35:void finish():112:113 -> a
+    36:36:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
+    36:36:void finish():113 -> a
+    37:37:void finish():113:113 -> a
+    1:1:java.util.Set getAffectedValues():46:46 -> b
+    1:1:boolean mayHaveIntroducedTrivialPhi():50:50 -> c
+com.android.tools.r8.ir.optimize.BasicBlockInstructionsEquivalence -> com.android.tools.r8.internal.c2:
     int[] hashes -> c
     com.android.tools.r8.ir.regalloc.RegisterAllocator allocator -> b
     boolean $assertionsDisabled -> a
@@ -41547,7 +41784,7 @@
     39:39:boolean doEquivalent(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):70 -> a
     40:40:void clearComputedHash(com.android.tools.r8.ir.code.BasicBlock):74:74 -> a
     1:12:int computeHash(com.android.tools.r8.ir.code.BasicBlock):90:101 -> b
-com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator -> com.android.tools.r8.internal.A3:
+com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator -> com.android.tools.r8.internal.n3:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.utils.collections.ProgramMethodSet revisitedMethods -> d
     com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions options -> c
@@ -41622,7 +41859,7 @@
     268:268: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
     268:268:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):381 -> a
     269:291:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):382:404 -> a
-    292:292:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
+    292:292:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
     292:292:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):404 -> a
     293:293:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):404:404 -> a
     294:318:com.android.tools.r8.utils.collections.ProgramMethodSet methodsToRevisit():410:434 -> a
@@ -41632,12 +41869,12 @@
     1:1:void lambda$abandonCallSitePropagation$4(com.android.tools.r8.graph.ProgramMethod):285:285 -> b
     1:9:void logResults():78:86 -> c
     10:10:void logResults():82:82 -> c
-com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode -> com.android.tools.r8.internal.z3:
+com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode -> com.android.tools.r8.internal.m3:
     com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode COLLECT -> a
     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.Z5:
+com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization -> com.android.tools.r8.internal.L5:
     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
@@ -41647,10 +41884,10 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):128:128 -> <init>
     2:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):126:131 -> <init>
     1:71:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):135:205 -> a
-    72:72:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1030:1030 -> a
+    72:72:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1025:1025 -> a
     72:72:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):209 -> a
     73:99:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):210:236 -> a
-    100:100:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1030:1030 -> a
+    100:100:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1025:1025 -> 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):237 -> 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):237:237 -> a
     102:102:void com.android.tools.r8.utils.IteratorUtils.removeIf(com.android.tools.r8.ir.code.InstructionListIterator,java.util.function.Predicate):127:127 -> a
@@ -41659,9 +41896,16 @@
     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):167:171 -> a
     162:186: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):300:324 -> a
     162:186: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):171 -> a
-    187:224: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):328:365 -> a
-    187:224: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):324 -> a
-    187:224: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):171 -> a
+    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):328:328 -> 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):324 -> 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):171 -> a
+    188:188:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> 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):328 -> 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):324 -> 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):171 -> a
+    189:224: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):330:365 -> a
+    189:224: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):324 -> a
+    189:224: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):171 -> a
     225:225:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping.map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory):38:38 -> a
     225:225: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):365 -> a
     225:225: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):324 -> a
@@ -41695,7 +41939,7 @@
     388:490:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):390:492 -> a
     491:585:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):398:492 -> a
     586:591:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):405:410 -> a
-    592:596:boolean com.android.tools.r8.ir.code.Value.isDexItemBasedConstStringThatNeedsToComputeClassName():803:807 -> a
+    592:596:boolean com.android.tools.r8.ir.code.Value.isDexItemBasedConstStringThatNeedsToComputeClassName():800:804 -> a
     592:596:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):415 -> a
     597:622:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):418:443 -> a
     623:630:boolean com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization.isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.StaticPut):526:533 -> a
@@ -41707,13 +41951,13 @@
     733:733:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):492:492 -> a
     734:734:java.util.Map validateFinalFieldPuts(java.util.Map,java.util.Map):519:519 -> a
     735:737:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):537:539 -> a
-    738:738:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1318:1318 -> a
+    738:738:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1295:1295 -> a
     738:738:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):539 -> a
     739:741:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):542:544 -> a
     742:742:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
     742:742:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):544 -> a
     743:744:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):544:545 -> a
-com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult -> com.android.tools.r8.internal.Z5$a:
+com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult -> com.android.tools.r8.internal.L5$a:
     java.util.Map fieldsWithStaticValues -> c
     com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult EMPTY -> a
     boolean $assertionsDisabled -> b
@@ -41722,19 +41966,19 @@
     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:com.android.tools.r8.graph.DexValue getStaticValue(com.android.tools.r8.graph.DexEncodedField):94:94 -> a
-    5:5:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():209:209 -> a
+    5:5:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():199:199 -> a
     5:5:com.android.tools.r8.graph.DexValue getStaticValue(com.android.tools.r8.graph.DexEncodedField):95 -> a
     6:10:com.android.tools.r8.graph.DexValue getStaticValue(com.android.tools.r8.graph.DexEncodedField):95:99 -> a
-    1:1:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():209:209 -> b
+    1:1:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():199:199 -> b
     1:1:boolean hasStaticValue(com.android.tools.r8.graph.DexEncodedField):86 -> b
     2:3:boolean hasStaticValue(com.android.tools.r8.graph.DexEncodedField):87:88 -> b
-com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$WaveDoneAction -> com.android.tools.r8.internal.a6:
+com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$WaveDoneAction -> com.android.tools.r8.internal.M5:
     java.util.Map fieldsWithStaticValues -> a
     1:1:void <init>(java.util.Map):107:107 -> <init>
     2:5:void <init>(java.util.Map):105:108 -> <init>
     1:1:void join(java.util.Map):112:112 -> a
     2:2:void execute():118:118 -> a
-com.android.tools.r8.ir.optimize.CodeRewriter -> com.android.tools.r8.internal.w7:
+com.android.tools.r8.ir.optimize.CodeRewriter -> com.android.tools.r8.internal.h7:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.utils.InternalOptions options -> d
@@ -41745,21 +41989,21 @@
     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():1710:1710 -> a
+    27:27:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatInliningIssue():1836:1836 -> 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():666:667 -> a
+    28:29:boolean com.android.tools.r8.ir.code.IRCode.hasCatchHandlers():662:663 -> 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():38:38 -> 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():1159:1159 -> a
+    86:86:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1154:1154 -> 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():1159:1159 -> a
+    103:103:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1154:1154 -> 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
@@ -41772,570 +42016,578 @@
     143:143:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):843 -> a
     144:151:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):843:850 -> a
     152:152:int codeUnitMargin():857:857 -> a
-    153:170:void rewriteSingleKeySwitchToIf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1070:1087 -> a
-    171:193: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):1096:1118 -> a
+    153:193: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
     194:194:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> a
-    194:194: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):1118 -> a
-    195:209: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):1119:1133 -> a
+    194:194: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
+    195:209: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
     210:210:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> a
-    210:210: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):1133 -> a
-    211:246: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):1135:1170 -> a
+    210:210: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
+    211:246: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
     247:247:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> a
-    247:247: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):1170 -> a
-    248:248: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):1172:1172 -> a
+    247:247: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
+    248:248: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
     249:263: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
-    249:263: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):1173 -> a
+    249:263: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
     264:264: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
     264:264: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
-    264:264: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):1173 -> a
+    264:264: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
     265:276: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
-    265:276: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):1173 -> a
+    265:276: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
     277:277:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> a
     277:277: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
-    277:277: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):1173 -> a
+    277:277: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
     278:327: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
-    278:327: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):1173 -> a
+    278:327: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
     328:328: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
     328:328: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
-    328:328: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):1173 -> a
+    328:328: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
     329:329: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
-    329:329: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):1173 -> a
-    330:338: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):1177:1185 -> a
-    339:339: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):1114:1114 -> a
-    340:354:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1234:1248 -> a
+    329:329: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
+    330:338: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
+    339:339: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
+    340:354:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1172:1186 -> a
     355:373:void com.android.tools.r8.ir.optimize.CodeRewriter.collapseIfTrueTarget(com.android.tools.r8.ir.code.BasicBlock):469:487 -> a
-    355:373:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1249 -> a
-    374:374:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1251:1251 -> a
+    355:373:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1187 -> a
+    374:374:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1189:1189 -> a
     375:388:void com.android.tools.r8.ir.optimize.CodeRewriter.collapseNonFallthroughSwitchTargets(com.android.tools.r8.ir.code.BasicBlock):493:506 -> a
-    375:388:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1252 -> a
-    389:405:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1256:1272 -> a
-    406:439: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):1375:1408 -> a
-    440:440:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    440:440: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):1408 -> a
-    441:441: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):1409:1409 -> a
-    442:442:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1030:1030 -> a
-    442:442: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):1410 -> a
-    443:445: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):1412:1414 -> a
+    375:388:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1190 -> a
+    389:405:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1194:1210 -> a
+    406:439: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
+    440:440:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
+    440:440: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
+    441:441: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
+    442:442:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1025:1025 -> a
+    442:442: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
+    443:445: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:1352 -> a
     446:446:boolean com.android.tools.r8.ir.code.Instruction.isCheckCast():0:0 -> a
-    446:446: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):1414 -> a
-    447:451: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):1415:1419 -> a
-    452:463: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):1465:1476 -> a
-    452:463: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):1417 -> a
+    446:446: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
+    447:451: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
+    452:461: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
+    452:461: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
+    462:462:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    462:462: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
+    462:462: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
+    463:463: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
+    463:463: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
     464:464: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
-    464:464: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):1476 -> a
-    464:464: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):1417 -> a
-    465:514: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):1477:1526 -> a
-    465:514: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):1417 -> a
+    464:464: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
+    464:464: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
+    465:514: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
+    465:514: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
     515:515:java.lang.Object com.android.tools.r8.ir.code.IRCodeInstructionListIterator.previous():22:22 -> a
-    515:515: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):1528 -> a
-    515:515: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):1417 -> a
-    516:527: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):1529:1540 -> a
-    516:527: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):1417 -> a
-    528:528:com.android.tools.r8.ir.code.InvokeStatic$Builder com.android.tools.r8.ir.code.InvokeStatic.builder():47:47 -> a
-    528:528: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):1540 -> a
-    528:528: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):1417 -> a
-    529:532: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):1541:1544 -> a
-    529:532: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):1417 -> a
-    533:533:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
-    533:533: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):1545 -> a
-    533:533: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):1417 -> a
-    534:545: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):1546:1557 -> a
-    534:545: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):1417 -> a
-    546:550: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):1426:1430 -> a
-    551:551:boolean com.android.tools.r8.ir.code.Instruction.isInstanceOf():0:0 -> a
-    551:551: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):1432 -> a
-    552:554: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):1433:1435 -> a
-    555:555: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):1434:1434 -> a
-    556:556:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(java.util.Set):1209:1209 -> a
-    556:556: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):1447 -> a
-    557:561: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):1448:1452 -> a
-    562:568: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):1566:1572 -> a
-    569:569: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
-    569:569: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):1574 -> a
-    570:638: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):1575:1643 -> a
-    639:639:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
-    639:639: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):1644 -> a
-    640:640:boolean lambda$removeInstanceOfInstructionIfTrivial$2(com.android.tools.r8.ir.code.Value):1618:1618 -> a
-    641:645:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):1651:1655 -> a
-    646:656: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):1660:1670 -> a
-    657:665:boolean isBinopWithLit8OrLit16(com.android.tools.r8.ir.code.Instruction):1791:1799 -> a
-    666:671:com.android.tools.r8.ir.code.Value binopWithLit8OrLit16NonConstant(com.android.tools.r8.ir.code.Binop):1818:1823 -> a
-    672:672:boolean lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.ConstInstruction):1886:1886 -> a
-    673:673:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
-    673:673:boolean lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.ConstInstruction):1887 -> a
-    674:674:boolean lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.ConstInstruction):1887:1887 -> a
-    675:681: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):1949:1955 -> a
-    682:685: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):1983:1986 -> a
-    686:686:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
-    686:686: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):1993 -> a
-    687:687:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> a
-    687:687: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):1993 -> a
-    688:776: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):1994:2082 -> a
-    777:779: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):49:51 -> a
-    777:779: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):2082 -> a
-    780:781: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):2083:2084 -> a
-    782:829:com.android.tools.r8.ir.code.ConstInstruction[] computeConstantArrayValues(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.BasicBlock,int):2120:2167 -> a
-    830:865:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2668:2703 -> a
-    866:866: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):2793:2793 -> a
-    866:866:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2704 -> a
-    867:883:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2709:2725 -> a
-    884:884: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):2793:2793 -> a
-    884:884:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2726 -> a
-    885:885:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2715:2715 -> a
-    886:886: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):2793:2793 -> a
-    886:886:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2716 -> a
-    887:890:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2737:2740 -> a
-    891:891:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleConstClassValue():0:0 -> a
-    891:891:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2740 -> a
-    892:893:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2741:2742 -> a
-    894:894:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleConstClassValue():0:0 -> a
-    894:894:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2742 -> a
-    895:903:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2743:2751 -> a
-    904:904:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2750:2750 -> a
-    905:905: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):2793:2793 -> a
-    905:905:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2746 -> a
-    906:911:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2757:2762 -> a
-    912:912: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):2793:2793 -> a
-    912:912:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2763 -> a
-    913:913:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2767:2767 -> a
-    914:914:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
-    914:914:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2767 -> a
-    915:915:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2768:2768 -> a
-    916:916:boolean com.android.tools.r8.graph.DexEncodedField.isEnum():200:200 -> a
-    916:916:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2769 -> a
-    917:917:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2770:2770 -> a
-    918:918:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
-    918:918:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2770 -> a
-    919:919:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2772:2772 -> a
-    920:920:boolean com.android.tools.r8.graph.DexEncodedField.isEnum():200:200 -> a
-    920:920:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2773 -> a
-    921:921: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):2793:2793 -> a
-    921:921:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2774 -> a
-    922:923: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):2788:2789 -> a
-    924:924:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2954:2954 -> a
-    925:925:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():878:878 -> a
-    925:925:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2954 -> a
-    926:927:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2954:2955 -> a
-    928:955: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):2965:2992 -> a
-    956:956:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():878:878 -> a
-    956:956: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):2996 -> a
-    957:971: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):3011:3025 -> a
-    972:988:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3229:3245 -> a
-    989:989:boolean com.android.tools.r8.ir.code.Instruction.isDebugPosition():0:0 -> a
-    989:989:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3245 -> a
-    990:994:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3246:3250 -> a
-    995:995:boolean com.android.tools.r8.ir.code.Instruction.isDebugPosition():0:0 -> a
-    995:995:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3250 -> a
-    996:996:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3254:3254 -> a
-    997:999: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):3265:3267 -> a
-    1000:1002: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
-    1000:1002: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):3267 -> a
-    1003:1004: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):3268:3269 -> a
-    1005:1025:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3391:3411 -> a
-    1026:1026: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
-    1026:1026:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3411 -> a
-    1027:1043:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3411:3427 -> a
-    1044:1044:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3426:3426 -> a
-    1045:1056:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3425:3436 -> a
-    1057:1079:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3447:3469 -> a
-    1080:1080: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
-    1080:1080:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3469 -> a
-    1081:1081:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3470:3470 -> a
-    1082:1116: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):3507:3541 -> a
-    1082:1116:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3474 -> a
-    1117:1132:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3475:3490 -> a
-    1133:1133:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalsChange():0:0 -> a
-    1133:1133:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3492 -> a
-    1134:1138:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3493:3497 -> a
-    1139:1139: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
-    1139:1139:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3497 -> a
-    1140:1144:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3552:3556 -> a
-    1145:1145: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
-    1145:1145:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3556 -> a
-    1146:1150:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3557:3561 -> a
-    1151:1151:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3614:3614 -> a
-    1152:1161:boolean com.android.tools.r8.ir.optimize.CodeRewriter.isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3620:3629 -> a
-    1152:1161:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3616 -> a
-    1162:1162:boolean com.android.tools.r8.ir.optimize.CodeRewriter.isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3626:3626 -> a
-    1162:1162:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3616 -> a
-    1163:1163:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1163:1163:boolean com.android.tools.r8.ir.optimize.CodeRewriter.isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3626 -> a
-    1163:1163:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3616 -> a
-    1164:1164:boolean com.android.tools.r8.ir.optimize.CodeRewriter.isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3626:3626 -> a
-    1164:1164:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3616 -> a
-    1165:1169: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):3635:3639 -> a
-    1170:1190:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3649:3669 -> a
-    1191:1200:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3668:3677 -> a
-    1201:1221:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3675:3695 -> a
-    1222:1222:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1159:1159 -> a
-    1222:1222:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3699 -> a
-    1223:1237:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3699:3713 -> a
-    1238:1238:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1159:1159 -> a
-    1238:1238:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3715 -> a
-    1239:1239:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3715:3715 -> a
-    1240:1243: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
-    1240:1243:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3715 -> a
-    1244:1244:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3716:3716 -> a
-    1245:1245:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1159:1159 -> a
-    1245:1245:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3719 -> a
-    1246:1247:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3719:3720 -> a
-    1248:1248:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1159:1159 -> a
-    1248:1248:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3722 -> a
-    1249:1268:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3722:3741 -> a
-    1269:1285:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3739:3755 -> a
-    1286:1293:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3759:3766 -> a
-    1294:1304:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3779:3789 -> a
-    1294:1304:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3766 -> a
-    1305:1310:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3767:3772 -> a
-    1311:1311:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3769:3769 -> a
-    1312:1312:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1312:1312:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3769 -> a
-    1313:1313:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    1313:1313:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    1313:1313:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3769 -> a
-    1314:1314:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3769:3769 -> a
-    1315:1315:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3787:3787 -> a
-    1315:1315:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3766 -> a
-    1316:1316:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1316:1316:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3787 -> a
-    1316:1316:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3766 -> a
-    1317:1317:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    1317:1317:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    1317:1317:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3787 -> a
-    1317:1317:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3766 -> a
-    1318:1318:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3787:3787 -> a
-    1318:1318:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3766 -> a
-    1319:1319:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3783:3783 -> a
-    1319:1319:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3766 -> a
-    1320:1320:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1320:1320:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3783 -> a
-    1320:1320:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3766 -> a
-    1321:1321:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    1321:1321:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    1321:1321:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3783 -> a
-    1321:1321:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3766 -> a
-    1322:1322:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3783:3783 -> a
-    1322:1322:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3766 -> a
-    1323:1329:void recursiveAddOperands(com.android.tools.r8.ir.code.Phi,java.util.Set,java.util.Set):3793:3799 -> a
+    515:515: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
+    515:515: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
+    516:529: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:1480 -> a
+    516:529: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
+    530:530:com.android.tools.r8.ir.code.InvokeStatic$Builder com.android.tools.r8.ir.code.InvokeStatic.builder():47:47 -> a
+    530:530: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
+    530:530: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
+    531:531: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:1481 -> a
+    531:531: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
+    532:532:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setMethod(com.android.tools.r8.graph.DexClassAndMethod):266:266 -> a
+    532:532:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeStatic$Builder.setMethod(com.android.tools.r8.graph.DexClassAndMethod):0 -> a
+    532:532: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 -> a
+    532:532: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
+    533:536: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
+    533:536: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
+    537:537:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
+    537:537: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
+    537:537: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
+    538:550: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
+    538:550: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
+    551:555: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
+    556:556:boolean com.android.tools.r8.ir.code.Instruction.isInstanceOf():0:0 -> a
+    556:556: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
+    557:559: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
+    560:560: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
+    561:561:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(java.util.Set):1204:1204 -> a
+    561:561: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
+    562:566: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
+    567: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):1507:1513 -> a
+    574:574:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    574:574: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
+    575:575: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
+    575:575: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
+    576:644: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
+    645:645:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
+    645:645: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
+    646:646:boolean lambda$removeInstanceOfInstructionIfTrivial$2(com.android.tools.r8.ir.code.Value):1559:1559 -> a
+    647:649:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):1592:1594 -> a
+    650:650:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    650:650:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):1594 -> a
+    651:653:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):1594:1596 -> a
+    654:664: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
+    665:673:boolean isBinopWithLit8OrLit16(com.android.tools.r8.ir.code.Instruction):1732:1740 -> a
+    674:679:com.android.tools.r8.ir.code.Value binopWithLit8OrLit16NonConstant(com.android.tools.r8.ir.code.Binop):1759:1764 -> a
+    680:680:boolean lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.ConstInstruction):1827:1827 -> a
+    681:681:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
+    681:681:boolean lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.ConstInstruction):1828 -> a
+    682:682:boolean lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.ConstInstruction):1828:1828 -> a
+    683:689: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
+    690: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):1924:1927 -> a
+    694:694:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
+    694:694: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
+    695:695:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> a
+    695:695: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
+    696:784: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
+    785:787: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):49:51 -> a
+    785:787: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
+    788:789: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
+    790:837: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
+    838:873:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2609:2644 -> a
+    874:874: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):2734:2734 -> a
+    874:874:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2645 -> a
+    875:891:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2650:2666 -> a
+    892:892: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):2734:2734 -> a
+    892:892:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2667 -> a
+    893:893:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2656:2656 -> a
+    894:894: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):2734:2734 -> a
+    894:894:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2657 -> a
+    895:898:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2678:2681 -> a
+    899:899:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleConstClassValue():0:0 -> a
+    899:899:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2681 -> a
+    900:901:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2682:2683 -> a
+    902:902:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleConstClassValue():0:0 -> a
+    902:902:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2683 -> a
+    903:911:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2684:2692 -> a
+    912:912:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2691:2691 -> a
+    913:913: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):2734:2734 -> a
+    913:913:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2687 -> a
+    914:919:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2698:2703 -> a
+    920:920: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):2734:2734 -> a
+    920:920:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2704 -> a
+    921:921:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2708:2708 -> a
+    922:922:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
+    922:922:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2708 -> a
+    923:923:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    923:923:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89 -> a
+    923:923:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2708 -> a
+    924:924:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2709:2709 -> a
+    925:925:boolean com.android.tools.r8.graph.DexEncodedField.isEnum():190:190 -> a
+    925:925:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2710 -> a
+    926:926:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2711:2711 -> a
+    927:927:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
+    927:927:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2711 -> a
+    928:928:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    928:928:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89 -> a
+    928:928:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2711 -> a
+    929:929:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2713:2713 -> a
+    930:930:boolean com.android.tools.r8.graph.DexEncodedField.isEnum():190:190 -> a
+    930:930:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2714 -> a
+    931:931: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):2734:2734 -> a
+    931:931:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2715 -> a
+    932:933: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):2729:2730 -> a
+    934:934:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2895:2895 -> a
+    935:935:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():875:875 -> a
+    935:935:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2895 -> a
+    936:937:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2895:2896 -> a
+    938:965: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):2906:2933 -> a
+    966:966:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():875:875 -> a
+    966:966: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):2937 -> a
+    967:981: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):2952:2966 -> a
+    982:998:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3170:3186 -> a
+    999:999:boolean com.android.tools.r8.ir.code.Instruction.isDebugPosition():0:0 -> a
+    999:999:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3186 -> a
+    1000:1004:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3187:3191 -> a
+    1005:1005:boolean com.android.tools.r8.ir.code.Instruction.isDebugPosition():0:0 -> a
+    1005:1005:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3191 -> a
+    1006:1006:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3195:3195 -> a
+    1007:1009: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):3206:3208 -> a
+    1010:1012: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
+    1010:1012: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):3208 -> a
+    1013:1014: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):3209:3210 -> a
+    1015:1035:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3332:3352 -> a
+    1036:1036: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
+    1036:1036:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3352 -> a
+    1037:1053:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3352:3368 -> a
+    1054:1054:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3367:3367 -> a
+    1055:1066:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3366:3377 -> a
+    1067:1089:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3388:3410 -> a
+    1090:1090: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
+    1090:1090:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3410 -> a
+    1091:1091:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3411:3411 -> a
+    1092:1126: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):3448:3482 -> a
+    1092:1126:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3415 -> a
+    1127:1142:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3416:3431 -> a
+    1143:1143:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalsChange():0:0 -> a
+    1143:1143:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3433 -> a
+    1144:1148:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3434:3438 -> a
+    1149:1149: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
+    1149:1149:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3438 -> a
+    1150:1154:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3493:3497 -> a
+    1155:1155: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
+    1155:1155:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3497 -> a
+    1156:1160:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3498:3502 -> a
+    1161:1161:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3555:3555 -> a
+    1162:1166:boolean com.android.tools.r8.ir.optimize.CodeRewriter.isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3561:3565 -> a
+    1162:1166:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3557 -> a
+    1167:1167:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    1167:1167:boolean com.android.tools.r8.ir.optimize.CodeRewriter.isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3565 -> a
+    1167:1167:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3557 -> a
+    1168:1168:boolean com.android.tools.r8.ir.optimize.CodeRewriter.isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3570:3570 -> a
+    1168:1168:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3557 -> a
+    1169:1169:boolean com.android.tools.r8.ir.optimize.CodeRewriter.isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3567:3567 -> a
+    1169:1169:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3557 -> a
+    1170:1170:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    1170:1170:boolean com.android.tools.r8.ir.optimize.CodeRewriter.isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3567 -> a
+    1170:1170:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3557 -> a
+    1171:1171:boolean com.android.tools.r8.ir.optimize.CodeRewriter.isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3567:3567 -> a
+    1171:1171:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3557 -> a
+    1172:1176: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):3576:3580 -> a
+    1177:1197:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3590:3610 -> a
+    1198:1207:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3609:3618 -> a
+    1208:1228:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3616:3636 -> a
+    1229:1229:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1154:1154 -> a
+    1229:1229:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3640 -> a
+    1230:1244:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3640:3654 -> a
+    1245:1245:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1154:1154 -> a
+    1245:1245:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3656 -> a
+    1246:1246:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3656:3656 -> a
+    1247:1250: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
+    1247:1250:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3656 -> a
+    1251:1251:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3657:3657 -> a
+    1252:1252:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1154:1154 -> a
+    1252:1252:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3660 -> a
+    1253:1254:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3660:3661 -> a
+    1255:1255:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1154:1154 -> a
+    1255:1255:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3663 -> a
+    1256:1275:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3663:3682 -> a
+    1276:1292:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3680:3696 -> a
+    1293:1300:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3700:3707 -> a
+    1301:1311:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3720:3730 -> a
+    1301:1311:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3707 -> a
+    1312:1317:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3708:3713 -> a
+    1318:1318:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3710:3710 -> a
+    1319:1319:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    1319:1319:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3710 -> a
+    1320:1320:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    1320:1320:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    1320:1320:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3710 -> a
+    1321:1321:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3710:3710 -> a
+    1322:1322:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3728:3728 -> a
+    1322:1322:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3707 -> a
+    1323:1323:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    1323:1323:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3728 -> a
+    1323:1323:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3707 -> a
+    1324:1324:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    1324:1324:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    1324:1324:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3728 -> a
+    1324:1324:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3707 -> a
+    1325:1325:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3728:3728 -> a
+    1325:1325:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3707 -> a
+    1326:1326:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3724:3724 -> a
+    1326:1326:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3707 -> a
+    1327:1327:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    1327:1327:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3724 -> a
+    1327:1327:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3707 -> a
+    1328:1328:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    1328:1328:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    1328:1328:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3724 -> a
+    1328:1328:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3707 -> a
+    1329:1329:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3724:3724 -> a
+    1329:1329:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3707 -> a
+    1330:1336:void recursiveAddOperands(com.android.tools.r8.ir.code.Phi,java.util.Set,java.util.Set):3734:3740 -> a
     1:3:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):179:181 -> b
-    4:4:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1030:1030 -> b
+    4:4:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1025:1025 -> b
     4:4:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):181 -> b
     5:17:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):183:195 -> b
     18:18:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> b
     18:18:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):195 -> b
     19:28:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):196:205 -> b
-    29:29:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(java.util.Set):1209:1209 -> b
+    29:29:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(java.util.Set):1204:1204 -> b
     29:29:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):217 -> b
     30:31:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):220:221 -> b
-    32:32:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> b
+    32:32:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> b
     32:32:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):221 -> b
     33:36:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):221:224 -> b
     37:38:boolean isFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):414:415 -> b
     39:48:void unlinkTrivialGotoBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):454:463 -> b
-    49:49:boolean lambda$shortenLiveRanges$5(com.android.tools.r8.ir.code.ConstInstruction):1895:1895 -> b
+    49:49:boolean lambda$shortenLiveRanges$5(com.android.tools.r8.ir.code.ConstInstruction):1836:1836 -> b
     50:50:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> b
-    50:50:boolean lambda$shortenLiveRanges$5(com.android.tools.r8.ir.code.ConstInstruction):1895 -> b
-    51:51:boolean lambda$shortenLiveRanges$5(com.android.tools.r8.ir.code.ConstInstruction):1895:1895 -> b
-    52:53:boolean isCSEInstructionCandidate(com.android.tools.r8.ir.code.Instruction):2461:2462 -> b
+    50:50:boolean lambda$shortenLiveRanges$5(com.android.tools.r8.ir.code.ConstInstruction):1836 -> b
+    51:51:boolean lambda$shortenLiveRanges$5(com.android.tools.r8.ir.code.ConstInstruction):1836:1836 -> b
+    52:53:boolean isCSEInstructionCandidate(com.android.tools.r8.ir.code.Instruction):2402:2403 -> b
     54:54:boolean com.android.tools.r8.ir.code.Instruction.isInstanceOf():0:0 -> b
-    54:54:boolean isCSEInstructionCandidate(com.android.tools.r8.ir.code.Instruction):2463 -> b
+    54:54:boolean isCSEInstructionCandidate(com.android.tools.r8.ir.code.Instruction):2404 -> b
     55:55:boolean com.android.tools.r8.ir.code.Instruction.isCheckCast():0:0 -> b
-    55:55:boolean isCSEInstructionCandidate(com.android.tools.r8.ir.code.Instruction):2464 -> b
-    56:57:boolean isCSEInstructionCandidate(com.android.tools.r8.ir.code.Instruction):2465:2466 -> b
-    58:58:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2482:2482 -> b
-    59:65:boolean com.android.tools.r8.ir.optimize.CodeRewriter.hasCSECandidate(com.android.tools.r8.ir.code.IRCode,int):2470:2476 -> b
-    59:65:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2483 -> b
-    66:68:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2485:2487 -> b
+    55:55:boolean isCSEInstructionCandidate(com.android.tools.r8.ir.code.Instruction):2405 -> b
+    56:57:boolean isCSEInstructionCandidate(com.android.tools.r8.ir.code.Instruction):2406:2407 -> b
+    58:58:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2423:2423 -> b
+    59:65:boolean com.android.tools.r8.ir.optimize.CodeRewriter.hasCSECandidate(com.android.tools.r8.ir.code.IRCode,int):2411:2417 -> b
+    59:65:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2424 -> b
+    66:68:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2426:2428 -> b
     69:69:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> b
-    69:69:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2487 -> b
-    70:83:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2488:2501 -> b
-    84:93:boolean com.android.tools.r8.ir.optimize.CodeRewriter.shareCatchHandlers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2448:2457 -> b
-    84:93:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2502 -> b
-    94:110:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2503:2519 -> b
-    111:137:void replaceTrivialNewInstancePhis(com.android.tools.r8.ir.code.Value):3812:3838 -> b
-    1:1:java.util.Map lambda$shortenLiveRangesInsideBlock$7(com.android.tools.r8.ir.code.BasicBlock):2078:2078 -> c
-    2:2:com.android.tools.r8.ir.code.DominatorTree lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2826:2826 -> c
+    69:69:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2428 -> b
+    70:83:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2429:2442 -> b
+    84:93: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
+    84:93:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2443 -> b
+    94:110:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2444:2460 -> b
+    111:137:void replaceTrivialNewInstancePhis(com.android.tools.r8.ir.code.Value):3753:3779 -> 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):2767:2767 -> 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):2826 -> c
-    4:4:boolean lambda$logArgumentTypes$11(com.android.tools.r8.ir.code.Instruction):3658:3658 -> 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):2930:2930 -> d
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$9(com.android.tools.r8.ir.code.IRCode):2825 -> d
+    3:3:com.android.tools.r8.ir.code.DominatorTree lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2767 -> c
+    4:4:boolean lambda$logArgumentTypes$11(com.android.tools.r8.ir.code.Instruction):3599:3599 -> 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):2871:2871 -> d
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$9(com.android.tools.r8.ir.code.IRCode):2766 -> 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):2930 -> d
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$9(com.android.tools.r8.ir.code.IRCode):2825 -> 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):2933:2946 -> d
-    3:16:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$9(com.android.tools.r8.ir.code.IRCode):2825 -> d
-    1:1:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$3(com.android.tools.r8.ir.code.IRCode):1874:1874 -> 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):2871 -> d
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$9(com.android.tools.r8.ir.code.IRCode):2766 -> 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):2874:2887 -> d
+    3:16:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$9(com.android.tools.r8.ir.code.IRCode):2766 -> 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):1874 -> e
-    1:59:void optimizeAlwaysThrowingInstructions(com.android.tools.r8.ir.code.IRCode):3035:3093 -> 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):2976:3034 -> f
     60:60:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo.hasNonNullParamOrThrow():50:50 -> f
-    60:60:void optimizeAlwaysThrowingInstructions(com.android.tools.r8.ir.code.IRCode):3097 -> f
-    61:84:void optimizeAlwaysThrowingInstructions(com.android.tools.r8.ir.code.IRCode):3098:3121 -> f
-    85:85:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> f
-    85:85:void optimizeAlwaysThrowingInstructions(com.android.tools.r8.ir.code.IRCode):3121 -> f
-    86:88:void optimizeAlwaysThrowingInstructions(com.android.tools.r8.ir.code.IRCode):3121:3123 -> f
-    1:51:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2814:2864 -> g
-    52:52:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():878:878 -> g
-    52:52:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2865 -> g
-    53:62:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2867:2876 -> g
-    63:63:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2875:2875 -> g
-    64:64:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():878:878 -> g
-    64:64:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2882 -> g
-    65:65:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2885:2885 -> g
-    66:79:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2884:2897 -> g
-    80:80:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2896:2896 -> g
-    81:81:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():878:878 -> g
-    81:81:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2903 -> g
-    82:82:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2906:2906 -> g
-    83:102:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2905:2924 -> g
+    60:60:void optimizeAlwaysThrowingInstructions(com.android.tools.r8.ir.code.IRCode):3038 -> f
+    61:84:void optimizeAlwaysThrowingInstructions(com.android.tools.r8.ir.code.IRCode):3039:3062 -> 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):3062 -> f
+    86:88:void optimizeAlwaysThrowingInstructions(com.android.tools.r8.ir.code.IRCode):3062:3064 -> f
+    1:51:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2755:2805 -> g
+    52:52:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():875:875 -> g
+    52:52:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2806 -> g
+    53:62:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2808:2817 -> g
+    63:63:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2816:2816 -> g
+    64:64:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():875:875 -> g
+    64:64:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2823 -> g
+    65:65:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2826:2826 -> g
+    66:79:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2825:2838 -> g
+    80:80:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2837:2837 -> g
+    81:81:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():875:875 -> g
+    81:81:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2844 -> g
+    82:82:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2847:2847 -> g
+    83:102:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2846:2865 -> 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():1030:1030 -> i
-    1:1:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3356 -> i
-    2:4:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3357:3359 -> i
+    1:1:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1025:1025 -> i
+    1:1:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3297 -> i
+    2:4:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3298:3300 -> i
     5:5:boolean com.android.tools.r8.ir.code.Instruction.isArrayLength():0:0 -> i
-    5:5:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3359 -> i
-    6:19:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3363:3376 -> i
+    5:5:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3300 -> i
+    6:19:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3304:3317 -> i
     20:20:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> i
-    20:20:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3376 -> i
-    21:23:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3377:3379 -> i
+    20:20:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3317 -> i
+    21:23:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3318:3320 -> i
     24:24:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayFilledData():0:0 -> i
-    24:24:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3380 -> i
-    25:25:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3381:3381 -> i
-    26:26:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1133:1133 -> i
-    26:26:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3382 -> i
+    24:24:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3321 -> i
+    25:25:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3322:3322 -> i
+    26:26:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1128:1128 -> i
+    26:26:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3323 -> i
     27:27:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> i
-    27:27:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3383 -> i
-    28:28:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3387:3387 -> i
-    1:32:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1298:1329 -> j
-    33:33:boolean com.android.tools.r8.ir.optimize.CodeRewriter.checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1278:1278 -> j
-    33:33:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1331 -> j
-    34:40:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.CodeRewriter.getArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1287:1293 -> j
-    34:40:boolean com.android.tools.r8.ir.optimize.CodeRewriter.checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1280 -> j
-    34:40:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1331 -> j
-    41:44:boolean com.android.tools.r8.ir.optimize.CodeRewriter.checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1280:1283 -> j
-    41:44:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1331 -> j
-    45:65:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1332:1352 -> j
-    66:66:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(java.util.Set):1209:1209 -> j
-    66:66:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1353 -> j
-    67:68:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1354:1355 -> j
-    69:69:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(java.util.Set):1209:1209 -> j
-    69:69:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1356 -> j
-    70:71:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1358:1359 -> j
-    72:72:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> j
-    72:72:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1359 -> j
-    73:75:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1359:1361 -> j
+    27:27:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3324 -> i
+    28:28:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3328:3328 -> i
+    1:32:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1236:1267 -> j
+    33:33:boolean com.android.tools.r8.ir.optimize.CodeRewriter.checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1216:1216 -> j
+    33:33:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1269 -> j
+    34:40: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
+    34:40:boolean com.android.tools.r8.ir.optimize.CodeRewriter.checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1218 -> j
+    34:40:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1269 -> j
+    41:44:boolean com.android.tools.r8.ir.optimize.CodeRewriter.checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1218:1221 -> j
+    41:44:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1269 -> j
+    45:65:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1270:1290 -> j
+    66:66:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(java.util.Set):1204:1204 -> j
+    66:66:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1291 -> j
+    67:68:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1292:1293 -> j
+    69:69:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(java.util.Set):1204:1204 -> j
+    69:69:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1294 -> j
+    70:71:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1296:1297 -> j
+    72:72:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> j
+    72:72:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1297 -> j
+    73:75: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:2: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:958 -> k
-    2:2:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):954 -> k
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isSwitchRewritingEnabled():1496:1496 -> k
-    3:3: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 -> k
-    3:3:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):954 -> k
-    4:4:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):961:961 -> k
-    4:4:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):954 -> k
-    5:13:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitchFull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):1020:1028 -> k
-    5:13:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):964 -> k
-    5:13:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):954 -> k
-    14:42: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):1195:1223 -> k
-    14:42:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitchFull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):1030 -> k
-    14:42:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):964 -> k
-    14:42:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):954 -> k
-    43:72:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitchFull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):1032:1061 -> k
-    43:72:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):964 -> k
-    43:72:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):954 -> k
-    73:73:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> k
-    73:73:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitchFull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):1061 -> k
-    73:73:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):964 -> k
-    73:73:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):954 -> k
-    74:77:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitchFull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):1061:1064 -> k
-    74:77:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):964 -> k
-    74:77:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):954 -> k
-    1:1:void rewriteSwitchForMaxInt(com.android.tools.r8.ir.code.IRCode):968:968 -> l
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.canHaveSwitchMaxIntBug():1899:1899 -> l
-    2:2:void rewriteSwitchForMaxInt(com.android.tools.r8.ir.code.IRCode):968 -> l
-    3:3:void rewriteSwitchForMaxInt(com.android.tools.r8.ir.code.IRCode):968:968 -> l
-    4:29:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitchForMaxIntOnly(com.android.tools.r8.ir.code.IRCode):976:1001 -> l
-    4:29:void rewriteSwitchForMaxInt(com.android.tools.r8.ir.code.IRCode):970 -> l
-    30:49:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitchForMaxIntOnly(com.android.tools.r8.ir.code.IRCode):995:1014 -> l
-    30:49:void rewriteSwitchForMaxInt(com.android.tools.r8.ir.code.IRCode):970 -> l
-    1:34:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):252:285 -> m
-    35:35:boolean com.android.tools.r8.ir.code.Value.isConstZero():791:791 -> m
-    35:35:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):287 -> m
-    36:44:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):289:297 -> m
-    45:45:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):42:42 -> m
-    45:45:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):297 -> m
-    46:92:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):301:347 -> 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):3280:3304 -> m
-    93:117:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):340 -> m
-    118:172:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):353:407 -> m
-    173:173:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> m
-    173:173:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):407 -> m
-    174:177:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):407:410 -> m
-    1:17:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3571:3587 -> n
-    18:18:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1133:1133 -> n
-    18:18:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3594 -> n
-    19:34:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3595:3610 -> n
-    1:43:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1873:1915 -> 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):1916 -> o
-    45:54:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1917:1926 -> o
-    55:55:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():38:38 -> o
-    55:55:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1926 -> o
-    56:56:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):38:38 -> o
-    56:56:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1927 -> o
-    57:71:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1928:1942 -> o
-    72:72:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpIfFloatBug():1671:1671 -> o
-    72:72:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1943 -> 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):1943 -> o
-    74:74:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1946:1946 -> o
-    75:76:void com.android.tools.r8.ir.optimize.CodeRewriter.forEachUse(com.android.tools.r8.ir.code.Instruction,java.util.function.Consumer):1973:1974 -> o
-    75:76:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1946 -> o
-    77:86:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1960:1969 -> o
-    1:12:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2197:2208 -> p
-    13:29:boolean com.android.tools.r8.ir.optimize.CodeRewriter.allowNewFilledArrayConstruction(com.android.tools.r8.ir.code.Instruction):2173:2189 -> p
-    13:29:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2209 -> p
-    30:61:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2212:2243 -> p
-    62:78:short[] com.android.tools.r8.ir.optimize.CodeRewriter.computeArrayFilledData(com.android.tools.r8.ir.code.ConstInstruction[],int,int):2093:2109 -> p
-    62:78:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2244 -> p
-    79:125:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2248:2294 -> p
-    1:2:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2542:2543 -> q
-    1:6:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2331:2336 -> r
-    7:7:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalWrite():0:0 -> r
-    7:7:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2336 -> r
-    8:13:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2337:2342 -> r
-    14:36: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):2300:2322 -> r
-    14:36:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2344 -> r
-    37:49:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2345:2357 -> r
-    50:50: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):2327:2327 -> r
-    50:50:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2344 -> r
-    1:9:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2548:2556 -> s
-    10:24:boolean com.android.tools.r8.ir.optimize.CodeRewriter.flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3335:3349 -> s
-    10:24:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2557 -> s
-    25:27: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 -> s
-    25:27:boolean com.android.tools.r8.ir.optimize.CodeRewriter.flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3350 -> s
-    25:27:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2557 -> s
-    28:28:boolean com.android.tools.r8.ir.optimize.CodeRewriter.flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3351:3351 -> s
-    28:28:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2557 -> s
-    29:39:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3308:3318 -> s
-    29:39:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2558 -> s
-    40:42: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 -> s
-    40:42:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3319 -> s
-    40:42:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2558 -> s
-    43:47:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3320:3324 -> s
-    43:47:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2558 -> s
-    48:50: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 -> s
-    48:50:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3325 -> s
-    48:50:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2558 -> s
-    51:51:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3326:3326 -> s
-    51:51:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2558 -> s
-    52:54:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3157:3159 -> s
-    52:54:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2562 -> s
-    55:55:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():878:878 -> s
-    55:55:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3159 -> s
-    55:55:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2562 -> s
-    56:90:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3160:3194 -> s
-    56:90:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2562 -> s
-    91:91:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1559:1559 -> s
-    91:91:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3195 -> s
-    91:91:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2562 -> s
-    92:113:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3197:3218 -> s
-    92:113:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2562 -> s
-    114:121:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2564:2571 -> s
-    122:127:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2600:2605 -> s
-    122:127:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2572 -> s
-    128:128:boolean com.android.tools.r8.ir.code.If.isNullTest():93:93 -> s
-    128:128:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2609 -> s
-    128:128:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2572 -> s
-    129:146:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2610:2627 -> s
-    129:146:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2572 -> s
-    147:147: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):2793:2793 -> s
-    147:147:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2628 -> s
-    147:147:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2572 -> s
-    148:175:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2633:2660 -> s
-    148:175:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2572 -> s
-    176:176:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2650:2650 -> s
-    176:176:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2572 -> s
-    177:177: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):2793:2793 -> s
-    177:177:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2651 -> s
-    177:177:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2572 -> s
-    178:178:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2639:2639 -> s
-    178:178:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2572 -> s
-    179:179: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):2793:2793 -> s
-    179:179:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2640 -> s
-    179:179:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2572 -> s
-    180:196:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2577:2593 -> s
-    197:197:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> s
-    197:197:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2593 -> s
-    198:201:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2593:2596 -> s
-    1:30:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1678:1707 -> t
-    1:31:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1718:1748 -> u
-    32:32:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> u
-    32:32:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1748 -> u
-    33:51:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1748:1766 -> u
-    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):1834:1847 -> u
-    52:65:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1767 -> u
-    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 -> u
-    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):1847 -> u
-    66:66:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1767 -> u
-    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):1848:1848 -> u
-    67:67:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1767 -> u
-    68:68:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> u
-    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):1848 -> u
-    68:68:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1767 -> u
-    69:79: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):1849:1859 -> u
-    69:79:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1767 -> u
-    80:92:boolean com.android.tools.r8.ir.code.BasicBlock.hasPathTo(com.android.tools.r8.ir.code.BasicBlock):1926:1938 -> u
-    80:92: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):1859 -> u
-    80:92:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1767 -> u
-    93:93: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):1862:1862 -> u
-    93:93:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1767 -> u
-    94:99:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.optimize.CodeRewriter.binopWithLit8OrLit16Constant(com.android.tools.r8.ir.code.Instruction):1805:1810 -> u
-    94:99:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1769 -> u
-    100:110:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1770:1780 -> u
-    111:111:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.optimize.CodeRewriter.binopWithLit8OrLit16Constant(com.android.tools.r8.ir.code.Instruction):1812:1812 -> u
-    111:111:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1769 -> u
-    112:112:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1786:1786 -> u
-    1:7:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3845:3851 -> v
-    8:8:boolean com.android.tools.r8.ir.code.Instruction.isNeg():0:0 -> v
-    8:8:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3851 -> v
-    9:41:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3852:3884 -> v
-com.android.tools.r8.ir.optimize.CodeRewriter$1 -> com.android.tools.r8.internal.w7$a:
+    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():788:788 -> 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):42:42 -> 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):3221:3245 -> 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):3512:3528 -> m
+    18:18:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1128:1128 -> m
+    18:18:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3535 -> m
+    19:34:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3536:3551 -> 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():38:38 -> 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):38:38 -> 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():1797:1797 -> 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:12:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2138:2149 -> o
+    13:29:boolean com.android.tools.r8.ir.optimize.CodeRewriter.allowNewFilledArrayConstruction(com.android.tools.r8.ir.code.Instruction):2114:2130 -> o
+    13:29:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2150 -> o
+    30:61:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2153:2184 -> o
+    62:78:short[] com.android.tools.r8.ir.optimize.CodeRewriter.computeArrayFilledData(com.android.tools.r8.ir.code.ConstInstruction[],int,int):2034:2050 -> o
+    62:78:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2185 -> o
+    79:125:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2189:2235 -> o
+    1:2:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2483:2484 -> p
+    1:6:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2272:2277 -> q
+    7:7:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalWrite():0:0 -> q
+    7:7:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2277 -> q
+    8:13:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2278:2283 -> q
+    14:36: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 -> q
+    14:36:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2285 -> q
+    37:49:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2286:2298 -> q
+    50:50: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 -> q
+    50:50:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2285 -> q
+    1:9:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2489:2497 -> r
+    10:24:boolean com.android.tools.r8.ir.optimize.CodeRewriter.flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3276:3290 -> r
+    10:24:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2498 -> r
+    25:27: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
+    25:27:boolean com.android.tools.r8.ir.optimize.CodeRewriter.flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3291 -> r
+    25:27:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2498 -> r
+    28:28:boolean com.android.tools.r8.ir.optimize.CodeRewriter.flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3292:3292 -> r
+    28:28:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2498 -> r
+    29:39:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3249:3259 -> r
+    29:39:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2499 -> r
+    40:42: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
+    40:42:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3260 -> r
+    40:42:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2499 -> r
+    43:47:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3261:3265 -> r
+    43:47:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2499 -> r
+    48:50: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
+    48:50:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3266 -> r
+    48:50:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2499 -> r
+    51:51:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3267:3267 -> r
+    51:51:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2499 -> r
+    52:54:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3098:3100 -> r
+    52:54:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2503 -> r
+    55:55:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():875:875 -> r
+    55:55:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3100 -> r
+    55:55:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2503 -> r
+    56:90:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3101:3135 -> r
+    56:90:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2503 -> r
+    91:91:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1559:1559 -> r
+    91:91:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3136 -> r
+    91:91:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2503 -> r
+    92:113:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3138:3159 -> r
+    92:113:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2503 -> r
+    114:121:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2505:2512 -> r
+    122:127:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2541:2546 -> r
+    122:127:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2513 -> r
+    128:128:boolean com.android.tools.r8.ir.code.If.isNullTest():93:93 -> r
+    128:128:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2550 -> r
+    128:128:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2513 -> r
+    129:146:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2551:2568 -> r
+    129:146:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2513 -> r
+    147:147: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):2734:2734 -> r
+    147:147:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2569 -> r
+    147:147:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2513 -> r
+    148:175:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2574:2601 -> r
+    148:175:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2513 -> r
+    176:176:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2591:2591 -> r
+    176:176:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2513 -> r
+    177:177: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):2734:2734 -> r
+    177:177:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2592 -> r
+    177:177:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2513 -> r
+    178:178:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2580:2580 -> r
+    178:178:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2513 -> r
+    179:179: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):2734:2734 -> r
+    179:179:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2581 -> r
+    179:179:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2513 -> r
+    180:196:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2518:2534 -> r
+    197:197:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> r
+    197:197:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2534 -> r
+    198:201:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2534:2537 -> r
+    1:30:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1619:1648 -> s
+    1:31:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1659:1689 -> 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):1689 -> t
+    33:51:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1689:1707 -> 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):1775:1788 -> t
+    52:65:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1708 -> 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):1788 -> t
+    66:66:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1708 -> 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):1789:1789 -> t
+    67:67:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1708 -> 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):1789 -> t
+    68:68:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1708 -> t
+    69:79: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:1800 -> t
+    69:79:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1708 -> t
+    80:92:boolean com.android.tools.r8.ir.code.BasicBlock.hasPathTo(com.android.tools.r8.ir.code.BasicBlock):1926:1938 -> t
+    80:92: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 -> t
+    80:92:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1708 -> t
+    93:93: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 -> t
+    93:93:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1708 -> t
+    94:99:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.optimize.CodeRewriter.binopWithLit8OrLit16Constant(com.android.tools.r8.ir.code.Instruction):1746:1751 -> t
+    94:99:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1710 -> t
+    100:110:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1711:1721 -> t
+    111:111:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.optimize.CodeRewriter.binopWithLit8OrLit16Constant(com.android.tools.r8.ir.code.Instruction):1753:1753 -> t
+    111:111:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1710 -> t
+    112:112:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1727:1727 -> t
+    1:7:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3786:3792 -> 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):3792 -> u
+    9:41:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3793:3825 -> u
+com.android.tools.r8.ir.optimize.CodeRewriter$1 -> com.android.tools.r8.internal.h7$a:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
-    1:1:void <clinit>():2633:2633 -> <clinit>
-com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence -> com.android.tools.r8.internal.w7$b:
+    1:1:void <clinit>():2574:2574 -> <clinit>
+com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence -> com.android.tools.r8.internal.h7$b:
     com.android.tools.r8.utils.InternalOptions options -> b
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():2364:2364 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.optimize.CodeRewriter$1):2364:2364 -> <init>
-    2:3:void <init>(com.android.tools.r8.utils.InternalOptions):2368:2369 -> <init>
-    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):2364:2364 -> 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):2377 -> a
-    2:2:boolean doEquivalent(java.lang.Object,java.lang.Object):2364 -> 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):2377:2377 -> a
-    3:3:boolean doEquivalent(java.lang.Object,java.lang.Object):2364 -> a
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1643:1643 -> 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):2377 -> a
-    4:4:boolean doEquivalent(java.lang.Object,java.lang.Object):2364 -> 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):2381:2396 -> a
-    5:20:boolean doEquivalent(java.lang.Object,java.lang.Object):2364 -> a
-    21:21:int doHash(java.lang.Object):2364:2364 -> a
-    22:36:int com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence.doHash(com.android.tools.r8.ir.code.Instruction):2407:2421 -> a
-    22:36:int doHash(java.lang.Object):2364 -> a
-    37:42:boolean identicalValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):2428:2433 -> a
-    43:47:int getHashCode(com.android.tools.r8.ir.code.Value):2439:2443 -> a
-com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult -> com.android.tools.r8.internal.w7$c:
+    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.optimize.CodeRewriter$CSEExpressionEquivalence.doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2318:2318 -> a
+    2:2:boolean doEquivalent(java.lang.Object,java.lang.Object):2305 -> a
+    3:3:boolean com.android.tools.r8.ir.code.Instruction.isCmp():0:0 -> 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 -> a
+    3:3:boolean doEquivalent(java.lang.Object,java.lang.Object):2305 -> 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:2318 -> a
+    4:4:boolean doEquivalent(java.lang.Object,java.lang.Object):2305 -> a
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1769:1769 -> a
+    5:5: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
+    5:5:boolean doEquivalent(java.lang.Object,java.lang.Object):2305 -> a
+    6:21: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
+    6:21:boolean doEquivalent(java.lang.Object,java.lang.Object):2305 -> a
+    22:22:int doHash(java.lang.Object):2305:2305 -> a
+    23:37:int com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence.doHash(com.android.tools.r8.ir.code.Instruction):2348:2362 -> a
+    23:37:int doHash(java.lang.Object):2305 -> a
+    38:43:boolean identicalValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):2369:2374 -> a
+    44:48:int getHashCode(com.android.tools.r8.ir.code.Value):2380:2384 -> a
+com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult -> com.android.tools.r8.internal.h7$c:
     boolean $assertionsDisabled -> a
     boolean anyAffectedValues -> b
     boolean anySimplifications -> c
-    1:1:void <clinit>():2522:2522 -> <clinit>
-    1:1:void <init>(boolean,boolean,com.android.tools.r8.ir.optimize.CodeRewriter$1):2522:2522 -> <init>
-    2:5:void <init>(boolean,boolean):2526:2529 -> <init>
-    1:1:boolean anyAffectedValues():2533:2533 -> a
-    1:1:boolean anySimplifications():2537:2537 -> b
-com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder -> com.android.tools.r8.internal.w7$d:
+    1:1:void <clinit>():2463:2463 -> <clinit>
+    1:1:void <init>(boolean,boolean,com.android.tools.r8.ir.optimize.CodeRewriter$1):2463:2463 -> <init>
+    2:5:void <init>(boolean,boolean):2467:2470 -> <init>
+    1:1:boolean anyAffectedValues():2474:2474 -> a
+    1:1:boolean anySimplifications():2478:2478 -> b
+com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder -> com.android.tools.r8.internal.h7$d:
     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
@@ -42348,24 +42600,24 @@
     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):1133:1133 -> a
+    10:10:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1128:1128 -> 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.w7$e:
+com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult -> com.android.tools.r8.internal.h7$e:
     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>():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.w7$f:
+com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder -> com.android.tools.r8.internal.h7$f:
     com.android.tools.r8.ir.code.Position position -> b
     int blockNumber -> a
     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.w7$g:
+com.android.tools.r8.ir.optimize.CodeRewriter$Interval -> com.android.tools.r8.internal.h7$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList keys -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():757:757 -> <clinit>
@@ -42390,12 +42642,12 @@
     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.w7$h:
+com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult -> com.android.tools.r8.internal.h7$h:
     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>():1366:1367 -> <clinit>
-    1:1:void <init>(java.lang.String,int):1365:1365 -> <init>
-com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder -> com.android.tools.r8.internal.w7$i:
+    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.h7$i:
     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
@@ -42410,7 +42662,7 @@
     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.r8:
+com.android.tools.r8.ir.optimize.ConstantCanonicalizer -> com.android.tools.r8.internal.T7:
     com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> b
     int numberOfConstClassCanonicalization -> f
     int numberOfEffectivelyFinalFieldCanonicalization -> g
@@ -42443,36 +42695,39 @@
     45:45:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):142:142 -> a
     46:46:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
     46:46:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):147 -> a
-    47:60:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):148:161 -> a
-    61:61:boolean com.android.tools.r8.graph.DexEncodedField.isEnum():200:200 -> a
-    61:61:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):163 -> a
-    62:68:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):164:170 -> a
-    69:70:boolean com.android.tools.r8.ir.optimize.ConstantCanonicalizer.constantUsedByInvokeRange(com.android.tools.r8.ir.code.Instruction):292:293 -> a
-    69:70:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):178 -> a
-    71:130:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):181:240 -> a
-    131:133: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):49:51 -> a
-    131:133:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):240 -> a
-    134:134:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):257:257 -> a
-    135:158:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):231:254 -> a
-    159:164:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):243:248 -> a
-    165:165:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):247:247 -> a
-    166:168:com.android.tools.r8.ir.code.DexItemBasedConstString com.android.tools.r8.ir.code.DexItemBasedConstString.copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DexItemBasedConstString):54:56 -> a
-    166:168:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):247 -> a
-    169:172:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):225:228 -> a
-    173:175:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.ConstClass.copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstClass):46:48 -> a
-    173:175:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):228 -> a
-    176:176:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):259:259 -> a
-    177:188:void com.android.tools.r8.ir.optimize.ConstantCanonicalizer.insertCanonicalizedConstant(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):277:288 -> a
-    177:188:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):260 -> a
-    189:192:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):261:264 -> a
-    193:194:boolean com.android.tools.r8.ir.code.Value.hasUserThatMatches(java.util.function.Predicate):423:424 -> a
-    193:194:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):264 -> a
-    195:203:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):265:273 -> a
-    204:204:java.util.List lambda$canonicalize$1(com.android.tools.r8.ir.code.Instruction):182:182 -> a
-    205:205:boolean lambda$canonicalize$2(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):199:199 -> a
-    206:206: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
+    47:54:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):148:155 -> a
+    55:55:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    55:55:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):160 -> a
+    56:56:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):161:161 -> a
+    57:57:boolean com.android.tools.r8.graph.DexEncodedField.isEnum():190:190 -> a
+    57:57:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):163 -> a
+    58:64:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):164:170 -> a
+    65:66:boolean com.android.tools.r8.ir.optimize.ConstantCanonicalizer.constantUsedByInvokeRange(com.android.tools.r8.ir.code.Instruction):292:293 -> a
+    65:66:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):178 -> a
+    67:126:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):181:240 -> a
+    127:129: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):49:51 -> a
+    127:129:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):240 -> a
+    130:130:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):257:257 -> a
+    131:154:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):231:254 -> a
+    155:160:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):243:248 -> a
+    161:161:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):247:247 -> a
+    162:164:com.android.tools.r8.ir.code.DexItemBasedConstString com.android.tools.r8.ir.code.DexItemBasedConstString.copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DexItemBasedConstString):52:54 -> a
+    162:164:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):247 -> a
+    165:168:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):225:228 -> a
+    169:171:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.ConstClass.copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstClass):46:48 -> a
+    169:171:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):228 -> a
+    172:172:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):259:259 -> a
+    173:184:void com.android.tools.r8.ir.optimize.ConstantCanonicalizer.insertCanonicalizedConstant(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):277:288 -> a
+    173:184:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):260 -> a
+    185:188:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):261:264 -> a
+    189:190:boolean com.android.tools.r8.ir.code.Value.hasUserThatMatches(java.util.function.Predicate):420:421 -> a
+    189:190:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):264 -> a
+    191:199:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):265:273 -> a
+    200:200:java.util.List lambda$canonicalize$1(com.android.tools.r8.ir.code.Instruction):182:182 -> a
+    201:201:boolean lambda$canonicalize$2(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):199:199 -> a
+    202:202: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.q8:
+com.android.tools.r8.ir.optimize.ConstantCanonicalizer$1 -> com.android.tools.r8.internal.S7:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():95:95 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.optimize.ConstantCanonicalizer):95:95 -> <init>
@@ -42488,7 +42743,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.Q8:
+com.android.tools.r8.ir.optimize.DeadCodeRemover -> com.android.tools.r8.internal.p8:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> c
     boolean $assertionsDisabled -> a
@@ -42515,16 +42770,21 @@
     52:56:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):56:60 -> a
     57:63:void updateWorklist(java.util.Queue,com.android.tools.r8.ir.code.Value):84:90 -> a
     64:67:boolean removeUnneededCatchHandlers(com.android.tools.r8.ir.code.IRCode):158:161 -> a
-    68:100:java.util.Collection com.android.tools.r8.ir.optimize.DeadCodeRemover.getDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):190:222 -> a
-    68:100:boolean removeUnneededCatchHandlers(com.android.tools.r8.ir.code.IRCode):162 -> a
-    101:120:boolean removeUnneededCatchHandlers(com.android.tools.r8.ir.code.IRCode):163:182 -> a
+    68:93:java.util.Collection com.android.tools.r8.ir.optimize.DeadCodeRemover.getDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):190:215 -> a
+    68:93:boolean removeUnneededCatchHandlers(com.android.tools.r8.ir.code.IRCode):162 -> a
+    94:94:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    94:94:java.util.Collection com.android.tools.r8.ir.optimize.DeadCodeRemover.getDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):215 -> a
+    94:94:boolean removeUnneededCatchHandlers(com.android.tools.r8.ir.code.IRCode):162 -> a
+    95:102:java.util.Collection com.android.tools.r8.ir.optimize.DeadCodeRemover.getDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):215:222 -> a
+    95:102:boolean removeUnneededCatchHandlers(com.android.tools.r8.ir.code.IRCode):162 -> a
+    103:122:boolean removeUnneededCatchHandlers(com.android.tools.r8.ir.code.IRCode):163:182 -> a
     1:9:boolean verifyNoDeadCode(com.android.tools.r8.ir.code.IRCode):64:72 -> b
     10:14:boolean verifyNoDeadCode(com.android.tools.r8.ir.code.IRCode):70:74 -> b
     15:15:boolean com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult.isDeadIfOutValueIsDead():0:0 -> b
     15:15:boolean verifyNoDeadCode(com.android.tools.r8.ir.code.IRCode):74 -> b
     16:16:boolean verifyNoDeadCode(com.android.tools.r8.ir.code.IRCode):75:75 -> b
     17:17:boolean verifyNoDeadCode(com.android.tools.r8.ir.code.IRCode):74:74 -> b
-com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult -> com.android.tools.r8.internal.Q8$a:
+com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult -> com.android.tools.r8.internal.p8$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>():227:235 -> <clinit>
@@ -42535,11 +42795,11 @@
     boolean isMaybeDead() -> c
     boolean isNotDead() -> d
     1:1:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult notDead():248:248 -> e
-com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$1 -> com.android.tools.r8.internal.N8:
+com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$1 -> com.android.tools.r8.internal.m8:
     1:1:void <init>():228:228 -> <init>
-com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$2 -> com.android.tools.r8.internal.O8:
+com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$2 -> com.android.tools.r8.internal.n8:
     1:1:void <init>():236:236 -> <init>
-com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$3 -> com.android.tools.r8.internal.P8:
+com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$3 -> com.android.tools.r8.internal.o8:
     com.android.tools.r8.ir.code.Value val$inValueRequiredToBeDead -> c
     1:1:void <init>(com.android.tools.r8.ir.code.Value):252:252 -> <init>
     1:1:java.lang.Iterable getValuesRequiredToBeDead():265:265 -> b
@@ -42562,115 +42822,104 @@
     19:47: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):274:302 -> a
     48:50:boolean isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):93:95 -> a
     48:50: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):270 -> a
-    51:87: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):123:159 -> a
-    88:88:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():726:726 -> a
-    88:88:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition):124 -> a
-    88:88:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass):136 -> a
+    51:85: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):123:157 -> a
+    86:86:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInSameFeatureOrBothInBase(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):114:114 -> a
+    86:86: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):157 -> a
+    87:87: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:159 -> a
+    88:88:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass):101:101 -> a
     88:88: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 -> a
-    89:89:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition):124:124 -> a
-    89:89:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass):136 -> a
-    89:89: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 -> a
-    90:90:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass):136:136 -> a
-    90:90: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 -> a
-    91:138: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):160:207 -> a
-    139:142: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):206:209 -> a
-    143:143: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):208:208 -> a
-    144:148:boolean inlineeRefersToClassesNotInMainDex(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):214:218 -> a
-    149:149:boolean inlineeRefersToClassesNotInMainDex(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):217:217 -> a
-    150:150:com.android.tools.r8.graph.ProgramMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):259:259 -> a
-    151:174: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):311:334 -> a
-    175:184: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):346:355 -> a
-    185:196: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):371:382 -> a
-    197:206: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):379:388 -> a
-    207:222: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):387:402 -> a
-    223:223: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):381:381 -> a
-    224:226:void ensureMethodProcessed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):412:414 -> a
-    227:227:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    227:227:void ensureMethodProcessed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):414 -> a
-    228:228:void ensureMethodProcessed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):416:416 -> a
-    229:229: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):887:887 -> a
-    229:229:void ensureMethodProcessed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):416 -> a
-    230:230: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):881:881 -> a
-    230:230:void ensureMethodProcessed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):416 -> a
-    231:242:boolean allowInliningOfInvokeInInlinee(com.android.tools.r8.ir.optimize.Inliner$InlineAction,int,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):425:436 -> a
-    243:338:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):455:550 -> a
-    339:344:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):557:562 -> a
-    345:345: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):574:574 -> a
-    346:348:boolean willExceedInstructionBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):585:587 -> a
-    346:348: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):577 -> a
-    349:349: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):578:578 -> a
-    350:366: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):672:688 -> a
-    350:366: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):579 -> a
-    367:399: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):607:639 -> a
-    400:400:void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason):698:698 -> a
+    89:136: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):160:207 -> a
+    137:140: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):206:209 -> a
+    141:141: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):208:208 -> a
+    142:146:boolean inlineeRefersToClassesNotInMainDex(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):214:218 -> a
+    147:147:boolean inlineeRefersToClassesNotInMainDex(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):217:217 -> a
+    148:148:com.android.tools.r8.graph.ProgramMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):259:259 -> a
+    149:172: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):311:334 -> a
+    173:182: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):346:355 -> a
+    183:194: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):371:382 -> a
+    195:204: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):379:388 -> a
+    205:220: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):387:402 -> a
+    221:221: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):381:381 -> a
+    222:224:void ensureMethodProcessed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):412:414 -> a
+    225:225:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    225:225:void ensureMethodProcessed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):414 -> a
+    226:226:void ensureMethodProcessed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):416:416 -> a
+    227:227: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):886:886 -> a
+    227:227:void ensureMethodProcessed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):416 -> a
+    228:228: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):880:880 -> a
+    228:228:void ensureMethodProcessed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):416 -> a
+    229:240:boolean allowInliningOfInvokeInInlinee(com.android.tools.r8.ir.optimize.Inliner$InlineAction,int,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):425:436 -> a
+    241:336:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):455:550 -> a
+    337:342:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):557:562 -> a
+    343:343: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):574:574 -> a
+    344:346:boolean willExceedInstructionBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):585:587 -> a
+    344:346: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):577 -> a
+    347:347: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):578:578 -> a
+    348:364: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):672:688 -> a
+    348:364: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):579 -> a
+    365:397: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):607:639 -> a
+    398:398:void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason):698:698 -> a
     1:1:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):224:224 -> b
     2:13:int computeInstructionLimit(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):237:248 -> b
     2:13:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):225 -> b
     14:21:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):226:233 -> b
-com.android.tools.r8.ir.optimize.Devirtualizer -> com.android.tools.r8.internal.L9:
+com.android.tools.r8.ir.optimize.Devirtualizer -> com.android.tools.r8.internal.i9:
     com.android.tools.r8.graph.AppView appView -> b
-    com.android.tools.r8.shaking.MainDexTracingResult mainDexTracingResult -> c
-    com.android.tools.r8.utils.InternalOptions options -> d
+    com.android.tools.r8.utils.InternalOptions options -> c
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():48:48 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexTracingResult):55:58 -> <init>
-    1:5:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):62:66 -> a
+    1:1:void <clinit>():47:47 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.AppView):52:54 -> <init>
+    1:5:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):58:62 -> a
     6:6:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> a
-    6:6:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):66 -> a
-    7:30:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):67:90 -> a
+    6:6:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):62 -> a
+    7:30:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):63:86 -> a
     31:31:boolean com.android.tools.r8.ir.code.Instruction.isInvokeInterface():0:0 -> a
-    31:31:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):90 -> a
-    32:34:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):91:93 -> a
+    31:31:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):86 -> a
+    32:34:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):87:89 -> a
     35:35:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Assume.getAliasForOutValue():169:169 -> a
-    35:35:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):93 -> a
-    36:41:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):94:99 -> a
+    35:35:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):89 -> a
+    36:41:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):90:95 -> a
     42:42:boolean com.android.tools.r8.ir.code.Instruction.isCheckCast():0:0 -> a
-    42:42:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):99 -> a
-    43:63:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):100:120 -> a
-    64:64:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):119:119 -> a
+    42:42:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):95 -> a
+    43:63:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):96:116 -> a
+    64:64:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):115:115 -> a
     65:65:boolean com.android.tools.r8.ir.code.Instruction.isInvokeSuper():0:0 -> a
-    65:65:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):127 -> a
-    66:79:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):128:141 -> a
-    80:89:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):137:146 -> a
-    90:98:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):145:153 -> a
-    99:99: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):323:323 -> a
-    99:99:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):154 -> a
-    100:100:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):552:552 -> a
-    100:100: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):323 -> a
-    100:100:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):154 -> a
-    101:107: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):328:334 -> a
-    101:107:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):154 -> a
+    65:65:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):123 -> a
+    66:79:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):124:137 -> a
+    80:89:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):133:142 -> a
+    90:98:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):141:149 -> a
+    99:99: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):312:312 -> a
+    99:99:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):150 -> a
+    100:100:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):502:502 -> a
+    100:100: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):312 -> a
+    100:100:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):150 -> a
+    101:107: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):317:323 -> a
+    101:107:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):150 -> a
     108:108: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
-    108:108: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):334 -> a
-    108:108:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):154 -> a
-    109:109: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):335:335 -> a
-    109:109:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):154 -> a
-    110:117:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):156:163 -> a
-    118:132:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):158:172 -> a
-    133:162:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.optimize.Devirtualizer.rebindVirtualInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):354:383 -> a
-    133:162:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):172 -> a
-    163:163:boolean com.android.tools.r8.graph.AccessFlags.isAtLeastAsVisibleAs(com.android.tools.r8.graph.AccessFlags):114:114 -> a
-    163:163:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.optimize.Devirtualizer.rebindVirtualInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):383 -> a
-    163:163:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):172 -> a
-    164:171:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.optimize.Devirtualizer.rebindVirtualInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):387:394 -> a
-    164:171:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):172 -> a
-    172:174:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):174:174 -> a
-    175:175:boolean com.android.tools.r8.ir.code.Instruction.isInvokeInterface():0:0 -> a
-    175:175:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):180 -> a
-    176:217:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):183:224 -> a
-    218:281:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):223:286 -> a
-    282:282:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> a
-    282:282:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):286 -> a
-    283:298:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):288:303 -> a
-    299:303:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):302:306 -> a
-    304:304:com.android.tools.r8.ir.optimize.AssumeRemover com.android.tools.r8.ir.optimize.AssumeRemover.removeMarkedInstructions():99:99 -> a
-    304:304:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):312 -> a
-    305:307:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):313:315 -> a
-    308:308:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    308:308:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):315 -> a
-    309:311:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):315:317 -> a
-    312:317:boolean isRebindingNewClassIntoMainDex(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):399:404 -> a
-com.android.tools.r8.ir.optimize.DynamicTypeOptimization -> com.android.tools.r8.internal.Da:
+    108:108: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):323 -> a
+    108:108:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):150 -> a
+    109:109: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):324:324 -> a
+    109:109:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):150 -> a
+    110:116:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):151:157 -> a
+    117:131:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):152:166 -> a
+    132:172:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.optimize.Devirtualizer.rebindVirtualInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):343:383 -> a
+    132:172:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):166 -> a
+    173:175:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):168:168 -> a
+    176:176:boolean com.android.tools.r8.ir.code.Instruction.isInvokeInterface():0:0 -> a
+    176:176:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):174 -> a
+    177:213:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode) -> a
+    214:277:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):212:275 -> a
+    278:278:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> a
+    278:278:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):275 -> a
+    279:294:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):277:292 -> a
+    295:299:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):291:295 -> a
+    300:300:com.android.tools.r8.ir.optimize.AssumeRemover com.android.tools.r8.ir.optimize.AssumeRemover.removeMarkedInstructions():90:90 -> a
+    300:300:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):301 -> a
+    301:303:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):302:304 -> a
+    304:304:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
+    304:304:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):304 -> a
+    305:307:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):304:306 -> a
+com.android.tools.r8.ir.optimize.DynamicTypeOptimization -> com.android.tools.r8.internal.Z9:
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():19:19 -> <clinit>
@@ -42696,7 +42945,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):78:90 -> 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):71 -> a
     19:22:com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod):139:142 -> a
-com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer -> com.android.tools.r8.internal.me:
+com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer -> com.android.tools.r8.internal.zd:
     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
@@ -42735,7 +42984,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.le:
+com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer$1 -> com.android.tools.r8.internal.yd:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():97:97 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer):97:97 -> <init>
@@ -42762,116 +43011,138 @@
     2:27:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexTracingResult,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):92:117 -> <init>
     boolean lambda$performInliningImpl$1(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> a
     1:9:boolean neverInline(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.WhyAreYouNotInliningReporter):125:133 -> a
-    10:24:boolean neverInline(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.WhyAreYouNotInliningReporter):132:146 -> a
-    25:31:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):193:199 -> a
-    32:32:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():878:878 -> a
-    32:32:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):199 -> a
-    33:33:boolean isDoubleInlineSelectedTarget(com.android.tools.r8.graph.ProgramMethod):209:209 -> a
-    34:46:void recordDoubleInliningCandidate(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):225:237 -> a
-    47:48:com.android.tools.r8.utils.collections.ProgramMethodSet methodsToRevisit():243:244 -> a
-    49:55:void performForcedInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):864:870 -> a
-    56:56:void performForcedInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):865:865 -> a
-    57:63:void 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,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):897:903 -> a
-    64:64:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int,int,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):939:939 -> a
-    64:64:void 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,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):899 -> a
-    65:68:void 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,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):905:908 -> a
-    69:71:com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy createDefaultInliningReasonStrategy(com.android.tools.r8.ir.conversion.MethodProcessor):913:915 -> a
-    72:72:com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy lambda$createDefaultInliningReasonStrategy$0(com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):916:916 -> a
-    73:73:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int,int):930:930 -> a
-    74:74:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int,int,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):939:939 -> a
-    74:74:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int,int):925 -> a
-    75:108: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):957:990 -> a
-    109:115:boolean tryInlineMethodWithoutSideEffects(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,com.android.tools.r8.ir.optimize.AssumeRemover):1129:1135 -> a
-    109:115: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):989 -> a
-    116:125:boolean tryInlineMethodWithoutSideEffects(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,com.android.tools.r8.ir.optimize.AssumeRemover):1134:1143 -> a
-    116:125: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):989 -> a
-    126:146: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):995:1015 -> a
-    147:157:com.android.tools.r8.graph.DexType getDowncastTypeIfNeeded(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):1166:1176 -> a
-    147:157: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):1019 -> a
-    158:158: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):1021:1021 -> a
-    159:159: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
-    159:159: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):1021 -> a
-    160:169: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):1022:1031 -> a
-    170:198: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):1030:1058 -> a
-    199:225: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):1057:1083 -> a
-    226:240: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):1189:1203 -> a
-    226:240: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 -> a
-    241:241: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):1086:1086 -> a
-    242:242:boolean com.android.tools.r8.graph.DexEncodedMethod.isBridge():489:489 -> a
-    242:242: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):1086 -> a
-    243:243: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):1086:1086 -> a
-    244:244:boolean com.android.tools.r8.graph.DexEncodedMethod.isBridge():489:489 -> a
-    244:244: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):1086 -> a
-    245: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):1087:1106 -> a
-    265:267:java.lang.Object com.android.tools.r8.utils.IteratorUtils.previousUntil(java.util.ListIterator,java.util.function.Predicate):81:83 -> a
-    265:267: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 -> a
-    268:268: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):1107:1107 -> a
-    269:269:java.lang.Object com.android.tools.r8.utils.IteratorUtils.previousUntil(java.util.ListIterator,java.util.function.Predicate):87:87 -> a
-    269:269: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 -> a
-    270:270:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
-    270:270: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):1109 -> a
-    271:281: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):1110:1120 -> a
-    282:288:boolean containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1148:1154 -> a
-    282:288:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):166 -> a
-    289:289:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    289:289:boolean containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1155 -> a
-    289:289:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):166 -> a
-    290:291:boolean containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1155:1156 -> a
-    290:291:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):166 -> a
-    292:304:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):167:179 -> a
-    305:307:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget instructionAllowedForInlining(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):158:160 -> a
-    305:307:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):181 -> a
-    308:308:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):187:187 -> a
-    309:312:void insertAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.Set,com.android.tools.r8.utils.Timing):1213:1216 -> a
-    313:318:void applyMemberValuePropagationToInlinee(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.Set):1224:1229 -> a
-    319:319:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    319:319:void applyMemberValuePropagationToInlinee(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.Set):1229 -> a
-    320:322:void applyMemberValuePropagationToInlinee(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.Set):1229:1231 -> a
-    323:326:void rewindBlockIteratorToFirstInlineeBlock(java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):1237:1240 -> a
+    10:26:boolean neverInline(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.WhyAreYouNotInliningReporter):132:148 -> a
+    27:27:boolean neverInline(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.WhyAreYouNotInliningReporter):136:136 -> a
+    28:34:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):195:201 -> a
+    35:35:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():875:875 -> a
+    35:35:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):201 -> a
+    36:36:boolean isDoubleInlineSelectedTarget(com.android.tools.r8.graph.ProgramMethod):211:211 -> a
+    37:49:void recordDoubleInliningCandidate(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):227:239 -> a
+    50:51:com.android.tools.r8.utils.collections.ProgramMethodSet methodsToRevisit():245:246 -> a
+    52:58:void performForcedInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):863:869 -> a
+    59:59:void performForcedInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):864:864 -> a
+    60:66:void 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,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):896:902 -> a
+    67:67:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int,int,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):938:938 -> a
+    67:67:void 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,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):898 -> a
+    68:71:void 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,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):904:907 -> a
+    72:74:com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy createDefaultInliningReasonStrategy(com.android.tools.r8.ir.conversion.MethodProcessor):912:914 -> a
+    75:75:com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy lambda$createDefaultInliningReasonStrategy$0(com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):915:915 -> a
+    76:76:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int,int):929:929 -> a
+    77:77:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int,int,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):938:938 -> a
+    77:77:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int,int):924 -> a
+    78:116: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):956:994 -> a
+    117:143: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):993:1019 -> a
+    144:154:com.android.tools.r8.graph.DexType getDowncastTypeIfNeeded(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):1146:1156 -> a
+    144:154: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):1023 -> a
+    155:155: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):1025:1025 -> a
+    156:156: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
+    156:156: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):1025 -> a
+    157:166: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):1026:1035 -> a
+    167:195: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):1034:1062 -> a
+    196:222: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):1061:1087 -> a
+    223:237: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):1169:1183 -> a
+    223:237: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):1087 -> a
+    238:238: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):1090:1090 -> a
+    239:239:boolean com.android.tools.r8.graph.DexEncodedMethod.isBridge():498:498 -> a
+    239:239: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):1090 -> a
+    240:240: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):1090:1090 -> a
+    241:241:boolean com.android.tools.r8.graph.DexEncodedMethod.isBridge():498:498 -> a
+    241:241: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):1090 -> a
+    242:261: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):1091:1110 -> a
+    262:264:java.lang.Object com.android.tools.r8.utils.IteratorUtils.previousUntil(java.util.ListIterator,java.util.function.Predicate):81:83 -> a
+    262: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):1110 -> 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):1111:1111 -> a
+    266:266:java.lang.Object com.android.tools.r8.utils.IteratorUtils.previousUntil(java.util.ListIterator,java.util.function.Predicate):87:87 -> 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):1110 -> a
+    267:267:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
+    267:267: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):1113 -> a
+    268:278: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):1114:1124 -> a
+    279:285:boolean containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1128:1134 -> a
+    279:285:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):168 -> a
+    286:286:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    286:286:boolean containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1134 -> a
+    286:286:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):168 -> a
+    287:287:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    287:287:boolean containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1135 -> a
+    287:287:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):168 -> a
+    288:289:boolean containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1135:1136 -> a
+    288:289:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):168 -> a
+    290:302:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):169:181 -> a
+    303:305:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget instructionAllowedForInlining(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):160:162 -> a
+    303:305:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):183 -> a
+    306:306:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):189:189 -> a
+    307:310:void insertAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.Set,com.android.tools.r8.utils.Timing):1193:1196 -> a
+    311:316:void applyMemberValuePropagationToInlinee(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.Set):1204:1209 -> a
+    317:317:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
+    317:317:void applyMemberValuePropagationToInlinee(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.Set):1209 -> a
+    318:320:void applyMemberValuePropagationToInlinee(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.Set):1209:1211 -> a
+    321:324:void rewindBlockIteratorToFirstInlineeBlock(java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):1217:1220 -> a
     java.util.Collection codeOptimizationsForPostProcessing() -> b
-    1:7:boolean satisfiesRequirementsForDoubleInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):214:220 -> b
-    8:13:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):814:819 -> b
+    1:7:boolean satisfiesRequirementsForDoubleInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):216:222 -> b
+    8:13:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):813:818 -> b
     14:14:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> b
-    14:14:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):825 -> b
-    15:22:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):831:838 -> b
-    1:1:boolean isDoubleInliningEnabled():153:153 -> c
+    14:14:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):824 -> b
+    15:22:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):830:837 -> b
+    1:1:boolean isDoubleInliningEnabled():155:155 -> c
 com.android.tools.r8.ir.optimize.Inliner$Constraint -> com.android.tools.r8.ir.optimize.c$a:
     com.android.tools.r8.ir.optimize.Inliner$Constraint SUBCLASS -> e
     com.android.tools.r8.ir.optimize.Inliner$Constraint PACKAGE -> d
     com.android.tools.r8.ir.optimize.Inliner$Constraint SAMENEST -> c
     com.android.tools.r8.ir.optimize.Inliner$Constraint SAMECLASS -> b
     com.android.tools.r8.ir.optimize.Inliner$Constraint NEVER -> a
-    int value -> h
+    int value -> i
+    boolean $assertionsDisabled -> h
     com.android.tools.r8.ir.optimize.Inliner$Constraint[] $VALUES -> g
     com.android.tools.r8.ir.optimize.Inliner$Constraint ALWAYS -> f
-    1:18:void <clinit>():260:260 -> <clinit>
-    43:47:void <clinit>():285:289 -> <clinit>
-    1:2:void <init>(java.lang.String,int,int):280:281 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.Inliner$Constraint[] values():260:260 -> a
-    2:2:com.android.tools.r8.ir.optimize.Inliner$Constraint meet(com.android.tools.r8.ir.optimize.Inliner$Constraint):293:293 -> a
-    1:1:boolean isSet(int):300:300 -> d
+    1:18:void <clinit>():262:262 -> <clinit>
+    43:47:void <clinit>():287:291 -> <clinit>
+    1:2:void <init>(java.lang.String,int,int):282:283 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.Inliner$Constraint[] values():262:262 -> a
+    2:2:com.android.tools.r8.ir.optimize.Inliner$Constraint meet(com.android.tools.r8.ir.optimize.Inliner$Constraint):295:295 -> a
+    1:1:boolean isSet(int):302:302 -> d
 com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget -> com.android.tools.r8.ir.optimize.c$b:
     com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget ALWAYS -> b
     com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget NEVER -> a
     com.android.tools.r8.ir.optimize.Inliner$Constraint constraint -> d
     boolean $assertionsDisabled -> c
     com.android.tools.r8.graph.DexType targetHolder -> e
-    1:9:void <clinit>():318:326 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint):328:331 -> <init>
-    5:9:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint,com.android.tools.r8.graph.DexType):334:338 -> <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):361:384 -> a
-    25:36: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):390:401 -> a
-    37:87: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):406:456 -> a
-    88:98:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):533:543 -> a
-    88:98: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):456 -> a
-    99:106: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):457:464 -> a
-    107:122:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):510:525 -> a
-    107:122: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
-    123:156: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):468:501 -> a
-    1:5:boolean equals(java.lang.Object):351:355 -> equals
-    1:4:int hashCode():343:346 -> hashCode
-    5:5:int com.android.tools.r8.graph.DexType.computeHashCode():83:83 -> hashCode
-    5:5:int hashCode():346 -> hashCode
+    1:9:void <clinit>():320:328 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint):330:333 -> <init>
+    5:9:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint,com.android.tools.r8.graph.DexType):336:340 -> <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):363:386 -> 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):392:397 -> a
+    31:31:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> 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):400 -> 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):402:403 -> 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):408:458 -> a
+    85:85:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):535:535 -> 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):458 -> a
+    86:86:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    86:86:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):536 -> 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):458 -> a
+    87:92:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):537:542 -> 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):458 -> a
+    93:93:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    93:93:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):542 -> 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):458 -> a
+    94:96:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):543:545 -> 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):458 -> 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):459:466 -> a
+    105:105:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    105:105:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):512 -> 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):466 -> a
+    106:113:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):514:521 -> 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):466 -> a
+    114:114:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    114:114:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):521 -> 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):466 -> a
+    115:119:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):523:527 -> a
+    115:119: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):466 -> a
+    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):470:503 -> a
+    1:5:boolean equals(java.lang.Object):353:357 -> equals
+    1:4:int hashCode():345:348 -> hashCode
+    5:5:int com.android.tools.r8.graph.DexType.computeHashCode():88:88 -> hashCode
+    5:5:int hashCode():348 -> hashCode
 com.android.tools.r8.ir.optimize.Inliner$InlineAction -> com.android.tools.r8.ir.optimize.c$c:
     boolean shouldSynthesizeInitClass -> e
     com.android.tools.r8.ir.optimize.Inliner$Reason reason -> d
@@ -42879,42 +43150,45 @@
     boolean $assertionsDisabled -> a
     com.android.tools.r8.graph.ProgramMethod target -> b
     com.android.tools.r8.ir.code.Invoke invoke -> c
-    1:1:void <clinit>():569:569 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.optimize.Inliner$Reason):578:581 -> <init>
-    1:2:void setShouldSynthesizeInitClass():585:586 -> a
-    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):601:609 -> a
-    12:23:void synthesizeInitClass(com.android.tools.r8.ir.code.IRCode):757:768 -> 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):610 -> 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):620:621 -> a
-    26:26:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():505:505 -> 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):621 -> a
-    27: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):621:624 -> a
-    31:54:void synthesizeNullCheckForReceiver(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod):773:796 -> 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):626 -> 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):631:633 -> 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):632:638 -> a
-    65:65:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1159:1159 -> 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):639 -> 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):639:649 -> a
-    77:77:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1159:1159 -> 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):654 -> 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):654:654 -> 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):653:660 -> 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):658:671 -> 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):1155:1155 -> 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):673 -> a
-    102:141: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):674:713 -> a
-    142:183: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):712:753 -> a
-    184:184:com.android.tools.r8.ir.code.Value lambda$buildInliningIR$0(com.android.tools.r8.ir.code.BasicBlock):676:676 -> a
-    1:2:void setShouldSynthesizeNullCheckForReceiver():590:591 -> b
+    1:1:void <clinit>():571:571 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.optimize.Inliner$Reason):580:583 -> <init>
+    1:2:void setShouldSynthesizeInitClass():587:588 -> a
+    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):603:611 -> a
+    12:23:void synthesizeInitClass(com.android.tools.r8.ir.code.IRCode):756:767 -> 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):612 -> 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):622:623 -> a
+    26:26:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():518:518 -> 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):623 -> a
+    27: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):623:626 -> a
+    31:54:void synthesizeNullCheckForReceiver(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod):772:795 -> 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):628 -> 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):633:635 -> 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):634:640 -> a
+    65:65:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1154:1154 -> 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):641 -> 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):641:651 -> a
+    77:77:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1154:1154 -> 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):656 -> 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):656:656 -> 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):655:662 -> 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):660:673 -> 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):1150:1150 -> 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):675 -> 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):676:677 -> 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):679 -> a
+    105: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):683:715 -> a
+    138:176: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):714:752 -> a
+    177:177:com.android.tools.r8.ir.code.Value lambda$buildInliningIR$0(com.android.tools.r8.ir.code.BasicBlock):678:678 -> a
+    1:2:void setShouldSynthesizeNullCheckForReceiver():592:593 -> 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):806:808 -> <init>
-com.android.tools.r8.ir.optimize.Inliner$InliningInfo -> com.android.tools.r8.internal.Ff:
+    1:3:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.Inliner$Reason):805:807 -> <init>
+com.android.tools.r8.ir.optimize.Inliner$InliningInfo -> com.android.tools.r8.internal.Re:
     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):852:854 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):851:853 -> <init>
 com.android.tools.r8.ir.optimize.Inliner$Reason -> com.android.tools.r8.ir.optimize.c$d:
     com.android.tools.r8.ir.optimize.Inliner$Reason SIMPLE -> e
     com.android.tools.r8.ir.optimize.Inliner$Reason NEVER -> f
@@ -42922,9 +43196,9 @@
     com.android.tools.r8.ir.optimize.Inliner$Reason DUAL_CALLER -> d
     com.android.tools.r8.ir.optimize.Inliner$Reason FORCE -> a
     com.android.tools.r8.ir.optimize.Inliner$Reason ALWAYS -> b
-    1:6:void <clinit>():556:561 -> <clinit>
-    1:1:void <init>(java.lang.String,int):555:555 -> <init>
-    1:1:boolean mustBeInlined():565:565 -> a
+    1:6:void <clinit>():558:563 -> <clinit>
+    1:1:void <init>(java.lang.String,int):557:557 -> <init>
+    1:1:boolean mustBeInlined():567:567 -> a
 com.android.tools.r8.ir.optimize.InliningConstraints -> com.android.tools.r8.ir.optimize.e:
     com.android.tools.r8.graph.GraphLens graphLens -> d
     com.android.tools.r8.graph.AppView appView -> b
@@ -42963,7 +43237,7 @@
     58:63:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):340:345 -> a
     64:64:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):342:342 -> a
     65:71:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean):350:356 -> a
-    72:73:com.android.tools.r8.graph.ResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveMethod(com.android.tools.r8.graph.DexMethod,boolean):599:600 -> a
+    72:73:com.android.tools.r8.graph.ResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveMethod(com.android.tools.r8.graph.DexMethod,boolean):549:550 -> a
     72:73:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean):356 -> a
     74:79:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean):357:362 -> a
     80:80:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean):361:361 -> a
@@ -42976,7 +43250,10 @@
     1:1:com.android.tools.r8.graph.GraphLens getGraphLens():58:58 -> c
     2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):130:130 -> c
     3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInstancePut(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):142:142 -> c
-    4:20:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):203:219 -> c
+    4:15:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):203:214 -> c
+    16:16:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> c
+    16:16:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):214 -> c
+    17:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):215:219 -> c
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):138:138 -> d
     2:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):258:260 -> d
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticGet(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):308:308 -> d
@@ -42985,7 +43262,7 @@
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeNewArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):195:195 -> f
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewArrayEmpty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):284:284 -> g
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):292:292 -> h
-com.android.tools.r8.ir.optimize.InliningOracle -> com.android.tools.r8.internal.If:
+com.android.tools.r8.ir.optimize.InliningOracle -> com.android.tools.r8.internal.Ue:
     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
@@ -42998,7 +43275,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.ig:
+com.android.tools.r8.ir.optimize.InstructionEquivalence -> com.android.tools.r8.internal.uf:
     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
@@ -43006,7 +43283,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.kq:
+com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool -> com.android.tools.r8.internal.hp:
     com.android.tools.r8.com.google.common.base.Equivalence equivalence -> b
     java.util.Set interfaces -> d
     java.util.Set subTypes -> e
@@ -43036,111 +43313,117 @@
     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.xq:
+com.android.tools.r8.ir.optimize.MemberValuePropagation -> com.android.tools.r8.internal.wp:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> a
     com.android.tools.r8.graph.AppView appView -> c
     java.util.Set warnedFields -> e
     com.android.tools.r8.utils.Reporter reporter -> d
     boolean $assertionsDisabled -> b
-    1:3:void <clinit>():49:51 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):59:59 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.AppView):57:61 -> <init>
-    1:12:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):82:93 -> a
-    1:12:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):154 -> a
-    13:13:com.android.tools.r8.ir.analysis.value.SingleNumberValue com.android.tools.r8.ir.analysis.value.AbstractValueFactory.createNullValue():37:37 -> a
-    13:13:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):94 -> a
-    13:13:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):154 -> a
-    14:34:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):94:114 -> a
-    14:34:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):154 -> a
-    35:53:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):111:129 -> a
-    35:53:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):154 -> a
-    54:54:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):124:124 -> a
-    54:54:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):154 -> a
-    55:56:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):157:158 -> a
-    57:59:void com.android.tools.r8.ir.optimize.MemberValuePropagation.setValueRangeFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.Value):141:143 -> a
-    57:59:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):158 -> a
-    60:69:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):162:171 -> a
-    70:70:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
-    70:70:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):173 -> a
-    71:71:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):174:174 -> a
-    72:72:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    72:72:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):175 -> a
-    73:75:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):176:178 -> a
-    76:83:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):177:184 -> a
-    84: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):279:287 -> a
-    93:102: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):286:295 -> a
-    103:103:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():209:209 -> a
-    103:103: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):296 -> a
-    104:104:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    104:104: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):296 -> a
-    105:105:boolean com.android.tools.r8.graph.DexClassAndField.isProgramField():0:0 -> a
-    105:105:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndField):65 -> a
-    105:105: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):300 -> a
-    106:109:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndField):66:69 -> a
-    106: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):300 -> a
-    110:112: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):305:307 -> a
-    113:113:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():49:49 -> a
-    113:113: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):312 -> a
-    114:118: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):312:316 -> a
-    119:119:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():209:209 -> a
-    119:119: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):316 -> a
-    120:126: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):318:324 -> a
-    127:127:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():209:209 -> a
-    127:127: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):327 -> a
-    128:132: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:333 -> a
-    133:156: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):331:354 -> a
-    157:157:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
-    157:157: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):358 -> a
-    158:162: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):359:363 -> a
-    163:178: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:377 -> a
-    179:179:java.lang.Boolean lambda$rewriteFieldGetWithConstantValues$0(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):287:287 -> a
-    180:187:void run(com.android.tools.r8.ir.code.IRCode):422:429 -> a
-    188:188:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    188:188:void run(com.android.tools.r8.ir.code.IRCode):429 -> a
-    189:192:void run(com.android.tools.r8.ir.code.IRCode):429:432 -> a
-    193:204:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):440:451 -> a
-    205:224: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):197:216 -> a
-    205:224:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):450 -> a
-    225:225:boolean com.android.tools.r8.graph.DexClassAndMethod.isProgramMethod():0:0 -> a
-    225:225:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndMethod):73 -> a
-    225:225: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):221 -> a
-    225:225:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):450 -> a
-    226:229:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndMethod):74:77 -> a
-    226:229: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):221 -> a
-    226:229:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):450 -> a
-    230:231: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):226:227 -> a
-    230:231:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):450 -> a
-    232:232:com.android.tools.r8.ir.analysis.value.SingleNumberValue com.android.tools.r8.ir.analysis.value.AbstractValueFactory.createNullValue():37:37 -> a
-    232:232: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):227 -> a
-    232:232:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):450 -> a
-    233:255: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):230:252 -> a
-    233:255:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):450 -> a
-    256:272: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):251:267 -> a
-    256:272:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):450 -> a
-    273:275:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):452:454 -> a
-    276:279:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):453:456 -> a
-    280:280: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):384:384 -> a
-    280:280:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):456 -> a
-    281:281:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():209:209 -> a
-    281:281: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):385 -> a
-    281:281:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):456 -> a
-    282:282:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.type():94:94 -> a
-    282:282: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):392 -> a
-    282:282:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):456 -> a
-    283:287: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):392:396 -> a
-    283:287:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):456 -> a
-    288:289:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):457:458 -> a
-    290:290: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):401:401 -> a
-    290:290:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):458 -> a
-    291:291:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():209:209 -> a
-    291:291: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):402 -> a
-    291:291:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):458 -> a
-    292:292:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.type():94:94 -> a
-    292:292: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):409 -> a
-    292:292:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):458 -> a
-    293:297: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):409:413 -> a
-    293:297:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):458 -> a
-com.android.tools.r8.ir.optimize.MethodPoolCollection -> com.android.tools.r8.internal.dr:
+    1:3:void <clinit>():47:49 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):88:88 -> <init>
+    2:37:void <init>(com.android.tools.r8.graph.AppView):55:90 -> <init>
+    1:8:com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup lookupMemberRule(com.android.tools.r8.graph.DexDefinition):117:124 -> a
+    9:9: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):194:194 -> a
+    10:33:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):131:154 -> a
+    10:33: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):194 -> a
+    34:52:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):151:169 -> a
+    34:52: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):194 -> a
+    53:53:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):164:164 -> a
+    53:53: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):194 -> a
+    54:54: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):197:197 -> a
+    55:57:void com.android.tools.r8.ir.optimize.MemberValuePropagation.setValueRangeFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.Value):181:183 -> a
+    55:57: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):197 -> a
+    58:67: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):200:209 -> a
+    68:68:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    68:68: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):211 -> a
+    69:71: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):212:214 -> a
+    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):213:220 -> 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):322:329 -> 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):328:331 -> a
+    92:92:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():199:199 -> 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):336 -> 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):336 -> a
+    94:98:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexEncodedField) -> 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):340 -> a
+    99:101: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):345:347 -> a
+    102:102:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():46:46 -> a
+    102:102: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):353 -> a
+    103:107: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):353:357 -> a
+    108:108:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():199:199 -> a
+    108:108: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):357 -> a
+    109:112: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):359:362 -> a
+    113:113:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():199:199 -> a
+    113:113: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):365 -> a
+    114:118: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):367:371 -> a
+    119:142: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):369:392 -> a
+    143:143:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
+    143:143: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):396 -> a
+    144:148: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):397:401 -> a
+    149:163: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):400:414 -> a
+    164:164:java.lang.Boolean lambda$rewriteFieldGetWithConstantValues$0(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):329:329 -> a
+    165:172:void run(com.android.tools.r8.ir.code.IRCode):459:466 -> a
+    173:173:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
+    173:173:void run(com.android.tools.r8.ir.code.IRCode):466 -> a
+    174:177:void run(com.android.tools.r8.ir.code.IRCode):466:469 -> a
+    178:189:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):477:488 -> a
+    190:190:boolean com.android.tools.r8.ir.code.Instruction.hasUnusedOutValue():133:133 -> a
+    190:190: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):233 -> a
+    190:190:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):487 -> a
+    191:197: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):237:243 -> a
+    191:197:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):487 -> a
+    198:198:com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup com.android.tools.r8.ir.optimize.MemberValuePropagation.lookupMemberRule(com.android.tools.r8.graph.DexClassAndMethod):110:110 -> a
+    198:198: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):244 -> a
+    198:198:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):487 -> a
+    199:217: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):249:267 -> a
+    199:217:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):487 -> a
+    218:218:boolean com.android.tools.r8.graph.DexClassAndMethod.isProgramMethod():0:0 -> a
+    218:218:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndMethod):102 -> a
+    218:218: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):274 -> a
+    218:218:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):487 -> a
+    219:222:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndMethod):103:106 -> a
+    219:222: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):274 -> a
+    219:222:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):487 -> a
+    223:242: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):279:298 -> a
+    223:242:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):487 -> a
+    243:257: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):297:311 -> a
+    243:257:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):487 -> a
+    258:260:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):489:491 -> a
+    261:264:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):490:493 -> a
+    265:265: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):421:421 -> a
+    265:265:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):493 -> a
+    266:266:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():199:199 -> a
+    266:266: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):422 -> a
+    266:266:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):493 -> a
+    267:267:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.type():88:88 -> a
+    267:267: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):429 -> a
+    267:267:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):493 -> a
+    268:272: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):429:433 -> a
+    268:272:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):493 -> a
+    273:274:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):494:495 -> a
+    275:275: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):438:438 -> a
+    275:275:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):495 -> a
+    276:276:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():199:199 -> a
+    276:276: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):439 -> a
+    276:276:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):495 -> a
+    277:277:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.type():88:88 -> a
+    277:277: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):446 -> a
+    277:277:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):495 -> a
+    278:282: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):446:450 -> a
+    278:282:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):495 -> a
+com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup -> com.android.tools.r8.internal.up:
+    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):68:70 -> <init>
+    1:5:boolean equals(java.lang.Object):75:79 -> equals
+    1:1:int hashCode():84:84 -> hashCode
+com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType -> com.android.tools.r8.internal.vp:
+    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>():58:60 -> <clinit>
+    1:1:void <init>(java.lang.String,int):57:57 -> <init>
+com.android.tools.r8.ir.optimize.MethodPoolCollection -> com.android.tools.r8.internal.cq:
     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
@@ -43178,8 +43461,10 @@
     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:void com.android.tools.r8.ir.optimize.MemberPoolCollection.addNonNull(java.util.Collection,java.lang.Object):231:231 -> a
+    32:32:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> 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
     1:13:void com.android.tools.r8.ir.optimize.MemberPoolCollection.buildAll(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):49:61 -> b
     14:18:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.buildForHierarchy(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):67:71 -> b
     19:26:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.buildForHierarchy(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):70:77 -> b
@@ -43193,25 +43478,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:void com.android.tools.r8.ir.optimize.MemberPoolCollection.addNonNull(java.util.Collection,java.lang.Object):231:231 -> b
+    43:43:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> 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:45:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSuperTypesInclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):128:129 -> b
-    46:46:void com.android.tools.r8.ir.optimize.MemberPoolCollection.addNonNull(java.util.Collection,java.lang.Object):231:231 -> b
-    46:46:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSuperTypesInclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):129 -> b
-    47:47:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$2(java.util.Deque,com.android.tools.r8.graph.DexType):143:143 -> 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):273:273 -> 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:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$2(java.util.Deque,com.android.tools.r8.graph.DexType):143 -> 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):273:273 -> 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:void com.android.tools.r8.ir.optimize.MemberPoolCollection.addNonNull(java.util.Collection,java.lang.Object):231:231 -> c
+    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> 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:void com.android.tools.r8.ir.optimize.MemberPoolCollection.addNonNull(java.util.Collection,java.lang.Object):231:231 -> d
+    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> 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:25:void lambda$computeMemberPoolForClass$4(com.android.tools.r8.graph.DexClass):56:80 -> f
-com.android.tools.r8.ir.optimize.MoveEliminator -> com.android.tools.r8.internal.rr:
+    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):273:273 -> 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):273:273 -> 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.oq:
     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>
@@ -43219,47 +43520,74 @@
     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.js:
-    com.android.tools.r8.graph.AppView appView -> a
-    1:2:void <init>(com.android.tools.r8.graph.AppView):35:36 -> <init>
-    1:2:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):40:41 -> a
-    3:8:void com.android.tools.r8.ir.optimize.NestReducer.removeNests():50:55 -> a
-    3:8:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):42 -> a
-    9:11:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):44:46 -> a
-    12:24:void reduceNests(java.util.concurrent.ExecutorService):62:74 -> a
-    25:30:boolean lambda$processNestHost$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.NestMemberClassAttribute):84:89 -> a
-    31:31:boolean lambda$processNestHost$0(com.android.tools.r8.graph.DexProgramClass):90:90 -> a
-    32:32:boolean com.android.tools.r8.utils.IterableUtils.hasNext(java.lang.Iterable):67:67 -> a
-    32:32:boolean lambda$processNestHost$0(com.android.tools.r8.graph.DexProgramClass):90 -> a
-    1:2:void processNestHost(com.android.tools.r8.graph.DexProgramClass):78:79 -> b
-    3:3:boolean com.android.tools.r8.utils.IterableUtils.hasNext(java.lang.Iterable):67:67 -> b
-    3:3:void processNestHost(com.android.tools.r8.graph.DexProgramClass):79 -> b
-    4:19:void processNestHost(com.android.tools.r8.graph.DexProgramClass):79:94 -> b
-    1:4:void processNestMember(com.android.tools.r8.graph.DexProgramClass):99:102 -> c
-com.android.tools.r8.ir.optimize.NestUtils -> com.android.tools.r8.internal.ks:
+com.android.tools.r8.ir.optimize.NestReducer -> com.android.tools.r8.internal.dr:
+    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):273:273 -> 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
+    25:25:void com.android.tools.r8.ir.optimize.NestReducer.processNestFrom(com.android.tools.r8.graph.DexClass):65:65 -> a
+    25:25:java.lang.Object lambda$run$0(com.android.tools.r8.graph.DexProgramClass):56 -> a
+    26:27:void com.android.tools.r8.ir.optimize.NestReducer.reportMissingNestHost(com.android.tools.r8.graph.DexClass):93:94 -> a
+    26:27:void com.android.tools.r8.ir.optimize.NestReducer.processNestFrom(com.android.tools.r8.graph.DexClass):67 -> a
+    26:27:java.lang.Object lambda$run$0(com.android.tools.r8.graph.DexProgramClass):56 -> a
+    28:28:void com.android.tools.r8.ir.optimize.NestReducer.processNestFrom(com.android.tools.r8.graph.DexClass):68:68 -> a
+    28:28:java.lang.Object lambda$run$0(com.android.tools.r8.graph.DexProgramClass):56 -> a
+    29:29:void com.android.tools.r8.ir.optimize.NestReducer.reportMissingNestHost(com.android.tools.r8.graph.DexClass):96:96 -> a
+    29:29:void com.android.tools.r8.ir.optimize.NestReducer.processNestFrom(com.android.tools.r8.graph.DexClass):67 -> a
+    29:29:java.lang.Object lambda$run$0(com.android.tools.r8.graph.DexProgramClass):56 -> a
+    30:35:void com.android.tools.r8.ir.optimize.NestReducer.processNestFrom(com.android.tools.r8.graph.DexClass):71:76 -> a
+    30:35:java.lang.Object lambda$run$0(com.android.tools.r8.graph.DexProgramClass):56 -> a
+    36:44:void com.android.tools.r8.ir.optimize.NestReducer.reportIncompleteNest(com.android.tools.r8.graph.DexClass):101:109 -> a
+    36:44:void com.android.tools.r8.ir.optimize.NestReducer.processNestFrom(com.android.tools.r8.graph.DexClass):80 -> a
+    36:44:java.lang.Object lambda$run$0(com.android.tools.r8.graph.DexProgramClass):56 -> a
+    45:50:void com.android.tools.r8.ir.optimize.NestReducer.processNestFrom(com.android.tools.r8.graph.DexClass):82:87 -> a
+    45:50:java.lang.Object lambda$run$0(com.android.tools.r8.graph.DexProgramClass):56 -> a
+    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):273:273 -> 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
+    55:55:void com.android.tools.r8.ir.optimize.NestReducer.clearNestAttributes(com.android.tools.r8.graph.DexClass):117:117 -> a
+    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.er:
     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
-    15:15:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1030:1030 -> a
+    15:15:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1025:1025 -> a
     15:15:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):47 -> a
     16:22:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):48:54 -> a
     23:23:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
     23:23:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):54 -> a
-    24:31:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):55:62 -> a
-    32:32:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
-    32:32:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):61 -> a
-    33:34:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):64:65 -> a
-    35:35:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
-    35:35:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):64 -> a
-    36:36:boolean com.android.tools.r8.ir.code.Instruction.isInvokeInterface():0:0 -> a
-    36:36:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):68 -> a
-    37:41:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):68:72 -> a
-    42:42:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
-    42:42:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):72 -> a
-    43:53:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):73:83 -> a
-    54:54:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
-    54:54: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.Hu:
+    24:24:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    24:24:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89 -> a
+    24:24:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):54 -> a
+    25:32:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):55:62 -> a
+    33:33:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
+    33:33:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):61 -> a
+    34:35:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):64:65 -> a
+    36:36:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
+    36:36:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):64 -> a
+    37:37:boolean com.android.tools.r8.ir.code.Instruction.isInvokeInterface():0:0 -> a
+    37:37:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):68 -> a
+    38:42:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):68:72 -> a
+    43:43:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
+    43:43:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):72 -> a
+    44:44:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    44:44:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89 -> a
+    44:44:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):72 -> a
+    45:55:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):73:83 -> a
+    56:56:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
+    56:56: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.At:
     java.util.List candidateMethodLists -> b
     java.util.Map outlineSites -> c
     java.util.Map generatedOutlines -> d
@@ -43267,154 +43595,151 @@
     java.util.function.Consumer outlineMethodIdentifierGenerator -> g
     boolean $assertionsDisabled -> a
     com.android.tools.r8.ir.optimize.InliningConstraints inliningConstraints -> f
-    1:1:void <clinit>():101:101 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):1270:1270 -> <init>
-    2:1170:void <init>(com.android.tools.r8.graph.AppView):104:1272 -> <init>
-    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.Outliner):101:101 -> a
-    2:3:void lambda$createOutlineMethodIdentifierGenerator$0(java.util.Map,com.android.tools.r8.ir.code.IRCode):1285:1286 -> a
+    1:1:void <clinit>():112:112 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):1286:1286 -> <init>
+    2:1175:void <init>(com.android.tools.r8.graph.AppView):115:1288 -> <init>
+    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.Outliner):112:112 -> a
+    2:3:void lambda$createOutlineMethodIdentifierGenerator$0(java.util.Map,com.android.tools.r8.ir.code.IRCode):1301:1302 -> a
     4:4:boolean com.android.tools.r8.graph.Code.isOutlineCode():0:0 -> a
-    4:4:void lambda$createOutlineMethodIdentifierGenerator$0(java.util.Map,com.android.tools.r8.ir.code.IRCode):1286 -> a
-    5:10:void lambda$createOutlineMethodIdentifierGenerator$0(java.util.Map,com.android.tools.r8.ir.code.IRCode):1286:1291 -> a
-    11:11:void lambda$selectMethodsForOutlining$1(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramMethod,int):1328:1328 -> a
-    12:12:java.util.List buildOutlineMethods():1343:1343 -> a
-    13:18:java.util.List com.android.tools.r8.ir.optimize.Outliner.selectOutlines():1379:1384 -> a
-    13:18:java.util.List buildOutlineMethods():1347 -> a
-    19:22:java.util.List buildOutlineMethods():1348:1351 -> a
-    23:26:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.optimize.Outliner.findDeterministicRepresentative(java.util.List):1392:1395 -> a
-    23:26:java.util.List buildOutlineMethods():1352 -> a
-    27:33:java.util.List buildOutlineMethods():1353:1359 -> a
-    34:51:java.util.List buildOutlineMethods():1356:1373 -> a
-    52:52:void lambda$buildOutlineMethods$3(com.android.tools.r8.ir.optimize.Outliner$Outline,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1363:1363 -> a
-    53:60:void lambda$buildOutlineMethods$3(com.android.tools.r8.ir.optimize.Outliner$Outline,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1362:1369 -> a
-    61:61:void lambda$buildOutlineMethods$3(com.android.tools.r8.ir.optimize.Outliner$Outline,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1368:1368 -> a
-    62:62:com.android.tools.r8.graph.Code lambda$buildOutlineMethods$2(com.android.tools.r8.ir.optimize.Outliner$Outline,com.android.tools.r8.graph.DexMethod):1366:1366 -> a
-    63:63:void applyOutliningCandidate(com.android.tools.r8.ir.code.IRCode):1403:1403 -> a
-    64:64:boolean com.android.tools.r8.graph.Code.isOutlineCode():0:0 -> a
-    64:64:void applyOutliningCandidate(com.android.tools.r8.ir.code.IRCode):1403 -> a
-    65:71:void applyOutliningCandidate(com.android.tools.r8.ir.code.IRCode):1403:1409 -> a
-    1:1:com.android.tools.r8.ir.optimize.InliningConstraints access$100(com.android.tools.r8.ir.optimize.Outliner):101:101 -> b
-    2:3:void identifyOutlineSites(com.android.tools.r8.ir.code.IRCode):1304:1305 -> b
-    4:4:boolean com.android.tools.r8.graph.Code.isOutlineCode():0:0 -> b
-    4:4:void identifyOutlineSites(com.android.tools.r8.ir.code.IRCode):1305 -> b
-    5:8:void identifyOutlineSites(com.android.tools.r8.ir.code.IRCode):1305:1308 -> b
-    9:10:boolean checkAllOutlineSitesFoundAgain():1414:1415 -> b
-    1:1:java.util.List access$200(com.android.tools.r8.ir.optimize.Outliner):101:101 -> c
-    2:5:void createOutlineMethodIdentifierGenerator():1280:1283 -> c
-    1:1:java.util.Map access$300(com.android.tools.r8.ir.optimize.Outliner):101:101 -> d
-    2:3:java.util.function.Consumer getOutlineMethodIdentifierGenerator():1299:1300 -> d
-    1:1:java.util.Map access$400(com.android.tools.r8.ir.optimize.Outliner):101:101 -> e
-    2:27:com.android.tools.r8.utils.collections.ProgramMethodSet selectMethodsForOutlining():1313:1338 -> e
-com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction -> com.android.tools.r8.internal.Du:
+    4:4:void lambda$createOutlineMethodIdentifierGenerator$0(java.util.Map,com.android.tools.r8.ir.code.IRCode):1302 -> a
+    5:10:void lambda$createOutlineMethodIdentifierGenerator$0(java.util.Map,com.android.tools.r8.ir.code.IRCode):1302:1307 -> a
+    11:11:void lambda$selectMethodsForOutlining$1(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramMethod,int):1344:1344 -> a
+    12:17:java.util.List com.android.tools.r8.ir.optimize.Outliner.selectOutlines():1422:1427 -> a
+    12:17:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1362 -> a
+    18:26:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1363:1371 -> a
+    27:27:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.optimize.Outliner$Outline.buildMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):586:586 -> a
+    27:27:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1372 -> a
+    28:36:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1373:1381 -> a
+    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):277:277 -> a
+    37:37:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1381 -> a
+    38:74:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1381:1417 -> a
+    75:75:void applyOutliningCandidate(com.android.tools.r8.ir.code.IRCode):1434:1434 -> a
+    76:76:boolean com.android.tools.r8.graph.Code.isOutlineCode():0:0 -> a
+    76:76:void applyOutliningCandidate(com.android.tools.r8.ir.code.IRCode):1434 -> a
+    77:83:void applyOutliningCandidate(com.android.tools.r8.ir.code.IRCode):1434:1440 -> a
+    84:85:boolean checkAllOutlineSitesFoundAgain():1445:1446 -> a
+    1:1:com.android.tools.r8.ir.optimize.InliningConstraints access$100(com.android.tools.r8.ir.optimize.Outliner):112:112 -> b
+    2:5:void createOutlineMethodIdentifierGenerator():1296:1299 -> b
+    6:7:void identifyOutlineSites(com.android.tools.r8.ir.code.IRCode):1320:1321 -> b
+    8:8:boolean com.android.tools.r8.graph.Code.isOutlineCode():0:0 -> b
+    8:8:void identifyOutlineSites(com.android.tools.r8.ir.code.IRCode):1321 -> b
+    9:12:void identifyOutlineSites(com.android.tools.r8.ir.code.IRCode):1321:1324 -> b
+    1:1:java.util.List access$200(com.android.tools.r8.ir.optimize.Outliner):112:112 -> c
+    2:3:java.util.function.Consumer getOutlineMethodIdentifierGenerator():1315:1316 -> c
+    1:1:java.util.Map access$300(com.android.tools.r8.ir.optimize.Outliner):112:112 -> d
+    2:27:com.android.tools.r8.utils.collections.ProgramMethodSet selectMethodsForOutlining():1329:1354 -> d
+    1:1:java.util.Map access$400(com.android.tools.r8.ir.optimize.Outliner):112:112 -> e
+com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction -> com.android.tools.r8.internal.wt:
     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):203:204 -> <init>
+    1:2:void <init>(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType,com.android.tools.r8.ir.code.NumericType):214:215 -> <init>
     java.lang.String getDetailsString() -> a
-    1:1:com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction fromInstruction(com.android.tools.r8.ir.code.Binop):208:208 -> a
-    2:3:com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType.fromInstruction(com.android.tools.r8.ir.code.Instruction):131:132 -> a
-    2:3:com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction fromInstruction(com.android.tools.r8.ir.code.Binop):209 -> a
+    1:1:com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction fromInstruction(com.android.tools.r8.ir.code.Binop):219:219 -> a
+    2:3:com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType.fromInstruction(com.android.tools.r8.ir.code.Instruction):142:143 -> a
+    2:3:com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction fromInstruction(com.android.tools.r8.ir.code.Binop):220 -> a
     4:4:boolean com.android.tools.r8.ir.code.Instruction.isSub():0:0 -> a
-    4:4:com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType.fromInstruction(com.android.tools.r8.ir.code.Instruction):134 -> a
-    4:4:com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction fromInstruction(com.android.tools.r8.ir.code.Binop):209 -> a
-    5:5:com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType.fromInstruction(com.android.tools.r8.ir.code.Instruction):135:135 -> a
-    5:5:com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction fromInstruction(com.android.tools.r8.ir.code.Binop):209 -> a
+    4:4:com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType.fromInstruction(com.android.tools.r8.ir.code.Instruction):145 -> a
+    4:4:com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction fromInstruction(com.android.tools.r8.ir.code.Binop):220 -> a
+    5:5:com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType.fromInstruction(com.android.tools.r8.ir.code.Instruction):146:146 -> a
+    5:5:com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction fromInstruction(com.android.tools.r8.ir.code.Binop):220 -> a
     6:6:boolean com.android.tools.r8.ir.code.Instruction.isMul():0:0 -> a
-    6:6:com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType.fromInstruction(com.android.tools.r8.ir.code.Instruction):137 -> a
-    6:6:com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction fromInstruction(com.android.tools.r8.ir.code.Binop):209 -> a
-    7:7:com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType.fromInstruction(com.android.tools.r8.ir.code.Instruction):138:138 -> a
-    7:7:com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction fromInstruction(com.android.tools.r8.ir.code.Binop):209 -> a
+    6:6:com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType.fromInstruction(com.android.tools.r8.ir.code.Instruction):148 -> a
+    6:6:com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction fromInstruction(com.android.tools.r8.ir.code.Binop):220 -> a
+    7:7:com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType.fromInstruction(com.android.tools.r8.ir.code.Instruction):149:149 -> a
+    7:7:com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction fromInstruction(com.android.tools.r8.ir.code.Binop):220 -> a
     8:8:boolean com.android.tools.r8.ir.code.Instruction.isDiv():0:0 -> a
-    8:8:com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType.fromInstruction(com.android.tools.r8.ir.code.Instruction):140 -> a
-    8:8:com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction fromInstruction(com.android.tools.r8.ir.code.Binop):209 -> a
-    9:9:com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType.fromInstruction(com.android.tools.r8.ir.code.Instruction):141:141 -> a
-    9:9:com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction fromInstruction(com.android.tools.r8.ir.code.Binop):209 -> a
+    8:8:com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType.fromInstruction(com.android.tools.r8.ir.code.Instruction):151 -> a
+    8:8:com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction fromInstruction(com.android.tools.r8.ir.code.Binop):220 -> a
+    9:9:com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType.fromInstruction(com.android.tools.r8.ir.code.Instruction):152:152 -> a
+    9:9:com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction fromInstruction(com.android.tools.r8.ir.code.Binop):220 -> a
     10:10:boolean com.android.tools.r8.ir.code.Instruction.isRem():0:0 -> a
-    10:10:com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType.fromInstruction(com.android.tools.r8.ir.code.Instruction):143 -> a
-    10:10:com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction fromInstruction(com.android.tools.r8.ir.code.Binop):209 -> a
-    11:17:com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType.fromInstruction(com.android.tools.r8.ir.code.Instruction):144:150 -> a
-    11:17:com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction fromInstruction(com.android.tools.r8.ir.code.Binop):209 -> a
-    18:18:com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction fromInstruction(com.android.tools.r8.ir.code.Binop):210:210 -> a
-    19:19:com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType.fromInstruction(com.android.tools.r8.ir.code.Instruction):152:152 -> a
-    19:19:com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction fromInstruction(com.android.tools.r8.ir.code.Binop):209 -> a
-    20:20:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):229:229 -> a
-    21:21:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):179:179 -> a
-    21:21:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):230 -> a
-    22:27:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):232:237 -> a
-    28:32:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):262:266 -> a
-    33:33:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():562:562 -> a
-    33:33:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):268 -> a
-    34:36:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):270:270 -> a
-    39:39:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):273:273 -> a
-    40:40:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():562:562 -> a
-    40:40:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):275 -> a
-    41:60:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):275:294 -> a
-    61:61:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):291:291 -> a
-    62:62:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):288:288 -> a
-    63:63:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):285:285 -> a
-    64:64:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):282:282 -> a
-    65:82:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):279:296 -> a
-    1:1:java.lang.String getInstructionName():247:247 -> b
+    10:10:com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType.fromInstruction(com.android.tools.r8.ir.code.Instruction):154 -> a
+    10:10:com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction fromInstruction(com.android.tools.r8.ir.code.Binop):220 -> a
+    11:17:com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType.fromInstruction(com.android.tools.r8.ir.code.Instruction):155:161 -> a
+    11:17:com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction fromInstruction(com.android.tools.r8.ir.code.Binop):220 -> a
+    18:18:com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction fromInstruction(com.android.tools.r8.ir.code.Binop):221:221 -> a
+    19:19:com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType.fromInstruction(com.android.tools.r8.ir.code.Instruction):163:163 -> a
+    19:19:com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction fromInstruction(com.android.tools.r8.ir.code.Binop):220 -> a
+    20:20:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):240:240 -> a
+    21:21:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):190:190 -> a
+    21:21:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):241 -> a
+    22:27:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):243:248 -> a
+    28:32:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):273:277 -> a
+    33:33:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():573:573 -> a
+    33:33:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):279 -> a
+    34:36:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):281:281 -> a
+    39:39:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):284:284 -> a
+    40:40:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():573:573 -> a
+    40:40:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):286 -> a
+    41:60:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):286:305 -> a
+    61:61:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):302:302 -> a
+    62:62:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):299:299 -> a
+    63:63:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):296:296 -> a
+    64:64:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):293:293 -> a
+    65:82:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):290:307 -> a
+    1:1:java.lang.String getInstructionName():258:258 -> b
     boolean hasOutValue() -> c
     int numberOfInputs() -> d
-    1:5:boolean equals(java.lang.Object):220:224 -> equals
-    1:1:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.hashCode():175:175 -> hashCode
-    1:1:int hashCode():215 -> hashCode
-    2:2:int hashCode():215:215 -> hashCode
-com.android.tools.r8.ir.optimize.Outliner$InvokeOutlineInstruction -> com.android.tools.r8.internal.Eu:
+    1:5:boolean equals(java.lang.Object):231:235 -> equals
+    1:1:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.hashCode():186:186 -> hashCode
+    1:1:int hashCode():226 -> hashCode
+    2:2:int hashCode():226:226 -> hashCode
+com.android.tools.r8.ir.optimize.Outliner$InvokeOutlineInstruction -> com.android.tools.r8.internal.xt:
     com.android.tools.r8.graph.DexProto proto -> g
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> e
     boolean hasOutValue -> f
     com.android.tools.r8.graph.DexMethod method -> d
     boolean hasReceiver -> h
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():365:365 -> <clinit>
-    1:7:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,boolean,com.android.tools.r8.ir.code.ValueType[],com.android.tools.r8.graph.DexProto):378:384 -> <init>
-    1:9:com.android.tools.r8.ir.optimize.Outliner$InvokeOutlineInstruction fromInstruction(com.android.tools.r8.ir.code.InvokeMethod):388:396 -> a
+    1:1:void <clinit>():376:376 -> <clinit>
+    1:7:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,boolean,com.android.tools.r8.ir.code.ValueType[],com.android.tools.r8.graph.DexProto):389:395 -> <init>
+    1:9:com.android.tools.r8.ir.optimize.Outliner$InvokeOutlineInstruction fromInstruction(com.android.tools.r8.ir.code.InvokeMethod):399:407 -> a
     10:10:boolean com.android.tools.r8.ir.code.Instruction.isInvokePolymorphic():0:0 -> a
-    10:10:com.android.tools.r8.ir.optimize.Outliner$InvokeOutlineInstruction fromInstruction(com.android.tools.r8.ir.code.InvokeMethod):398 -> a
-    11:11:com.android.tools.r8.ir.optimize.Outliner$InvokeOutlineInstruction fromInstruction(com.android.tools.r8.ir.code.InvokeMethod):398:398 -> a
-    12:12:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):424:424 -> a
-    13:13:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):179:179 -> a
-    13:13:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):425 -> a
-    14:33:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):427:446 -> a
-    34:34:java.lang.String getDetailsString():452:452 -> a
-    35:37:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):481:483 -> a
-    38:38:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():562:562 -> a
-    38:38:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):485 -> a
-    39:44:com.android.tools.r8.ir.code.ValueTypeConstraint com.android.tools.r8.ir.optimize.Outliner$InvokeOutlineInstruction.getArgumentConstraint(int):471:476 -> a
-    39:44:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):487 -> a
-    45:50:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):487:492 -> a
-    51:51:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():562:562 -> a
-    51:51:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):494 -> a
-    52:55:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):494:497 -> a
+    10:10:com.android.tools.r8.ir.optimize.Outliner$InvokeOutlineInstruction fromInstruction(com.android.tools.r8.ir.code.InvokeMethod):409 -> a
+    11:11:com.android.tools.r8.ir.optimize.Outliner$InvokeOutlineInstruction fromInstruction(com.android.tools.r8.ir.code.InvokeMethod):409:409 -> a
+    12:12:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):435:435 -> a
+    13:13:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):190:190 -> a
+    13:13:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):436 -> a
+    14:33:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):438:457 -> a
+    34:34:java.lang.String getDetailsString():463:463 -> a
+    35:37:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):492:494 -> a
+    38:38:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():573:573 -> a
+    38:38:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):496 -> a
+    39:44:com.android.tools.r8.ir.code.ValueTypeConstraint com.android.tools.r8.ir.optimize.Outliner$InvokeOutlineInstruction.getArgumentConstraint(int):482:487 -> a
+    39:44:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):498 -> a
+    45:50:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):498:503 -> a
+    51:51:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():573:573 -> a
+    51:51:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):505 -> a
+    52:55:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):505:508 -> a
     56:56: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
-    56:56:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):497 -> a
-    57:57:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):498:498 -> a
-    1:1:java.lang.String getInstructionName():457:457 -> b
-    1:1:boolean hasOutValue():462:462 -> c
-    1:1:int numberOfInputs():467:467 -> d
-    1:8:boolean equals(java.lang.Object):412:419 -> equals
-    1:1:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.hashCode():175:175 -> hashCode
-    1:1:int hashCode():403 -> hashCode
-    2:6:int hashCode():403:407 -> hashCode
-com.android.tools.r8.ir.optimize.Outliner$NewInstanceOutlineInstruction -> com.android.tools.r8.internal.Fu:
+    56:56:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):508 -> a
+    57:57:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):509:509 -> a
+    1:1:java.lang.String getInstructionName():468:468 -> b
+    1:1:boolean hasOutValue():473:473 -> c
+    1:1:int numberOfInputs():478:478 -> d
+    1:8:boolean equals(java.lang.Object):423:430 -> equals
+    1:1:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.hashCode():186:186 -> hashCode
+    1:1:int hashCode():414 -> hashCode
+    2:6:int hashCode():414:418 -> hashCode
+com.android.tools.r8.ir.optimize.Outliner$NewInstanceOutlineInstruction -> com.android.tools.r8.internal.yt:
     com.android.tools.r8.graph.DexType clazz -> c
-    1:2:void <init>(com.android.tools.r8.graph.DexType):305:306 -> <init>
-    1:1:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):326:326 -> a
-    2:2:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):179:179 -> a
-    2:2:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):327 -> a
-    3:4:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):329:330 -> a
-    5:5:java.lang.String getDetailsString():335:335 -> a
-    6:7:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):355:356 -> a
-    8:8:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():562:562 -> a
-    8:8:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):358 -> a
-    9:11:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):358:360 -> a
-    1:1:java.lang.String getInstructionName():340:340 -> b
+    1:2:void <init>(com.android.tools.r8.graph.DexType):316:317 -> <init>
+    1:1:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):337:337 -> a
+    2:2:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):190:190 -> a
+    2:2:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):338 -> a
+    3:4:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):340:341 -> a
+    5:5:java.lang.String getDetailsString():346:346 -> a
+    6:7:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):366:367 -> a
+    8:8:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():573:573 -> a
+    8:8:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):369 -> a
+    9:11:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):369:371 -> a
+    1:1:java.lang.String getInstructionName():351:351 -> b
     boolean hasOutValue() -> c
     int numberOfInputs() -> d
-    1:5:boolean equals(java.lang.Object):311:315 -> equals
-    1:1:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.hashCode():175:175 -> hashCode
-    1:1:int hashCode():321 -> hashCode
-    2:2:int hashCode():321:321 -> hashCode
-com.android.tools.r8.ir.optimize.Outliner$Outline -> com.android.tools.r8.internal.Gu:
+    1:5:boolean equals(java.lang.Object):322:326 -> equals
+    1:1:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.hashCode():186:186 -> hashCode
+    1:1:int hashCode():332 -> hashCode
+    2:2:int hashCode():332:332 -> hashCode
+com.android.tools.r8.ir.optimize.Outliner$Outline -> com.android.tools.r8.internal.zt:
     java.util.List argumentTypes -> b
     java.util.List templateInstructions -> d
     java.util.List argumentMap -> c
@@ -43422,49 +43747,49 @@
     com.android.tools.r8.ir.optimize.Outliner this$0 -> g
     boolean $assertionsDisabled -> a
     com.android.tools.r8.graph.DexType returnType -> e
-    1:1:void <clinit>():525:525 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.optimize.Outliner,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.DexType,int,int):542:542 -> <init>
-    2:29:void <init>(com.android.tools.r8.ir.optimize.Outliner,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.DexType,int,int):529:556 -> <init>
-    30:30:void <init>(com.android.tools.r8.ir.optimize.Outliner,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.DexType,int,int):550:550 -> <init>
-    1:5:com.android.tools.r8.graph.DexProto buildProto():566:570 -> a
-    1:1:int compareTo(java.lang.Object):525:525 -> compareTo
-    2:7:int com.android.tools.r8.ir.optimize.Outliner$Outline.compareTo(com.android.tools.r8.ir.optimize.Outliner$Outline):618:623 -> compareTo
-    2:7:int compareTo(java.lang.Object):525 -> compareTo
-    8:8:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():562:562 -> compareTo
-    8:8:int com.android.tools.r8.ir.optimize.Outliner$Outline.compareTo(com.android.tools.r8.ir.optimize.Outliner$Outline):623 -> compareTo
-    8:8:int compareTo(java.lang.Object):525 -> compareTo
-    9:40:int com.android.tools.r8.ir.optimize.Outliner$Outline.compareTo(com.android.tools.r8.ir.optimize.Outliner$Outline):623:654 -> compareTo
-    9:40:int compareTo(java.lang.Object):525 -> compareTo
-    1:18:boolean equals(java.lang.Object):575:592 -> equals
-    1:6:int hashCode():600:605 -> hashCode
-    1:37:java.lang.String toString():661:697 -> toString
-com.android.tools.r8.ir.optimize.Outliner$OutlineCode -> com.android.tools.r8.internal.Hu$a:
+    1:1:void <clinit>():536:536 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.optimize.Outliner,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.DexType,int,int):553:553 -> <init>
+    2:29:void <init>(com.android.tools.r8.ir.optimize.Outliner,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.DexType,int,int):540:567 -> <init>
+    30:30:void <init>(com.android.tools.r8.ir.optimize.Outliner,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.DexType,int,int):561:561 -> <init>
+    1:5:com.android.tools.r8.graph.DexProto buildProto():577:581 -> a
+    1:1:int compareTo(java.lang.Object):536:536 -> compareTo
+    2:7:int com.android.tools.r8.ir.optimize.Outliner$Outline.compareTo(com.android.tools.r8.ir.optimize.Outliner$Outline):634:639 -> compareTo
+    2:7:int compareTo(java.lang.Object):536 -> compareTo
+    8:8:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():573:573 -> compareTo
+    8:8:int com.android.tools.r8.ir.optimize.Outliner$Outline.compareTo(com.android.tools.r8.ir.optimize.Outliner$Outline):639 -> compareTo
+    8:8:int compareTo(java.lang.Object):536 -> compareTo
+    9:40:int com.android.tools.r8.ir.optimize.Outliner$Outline.compareTo(com.android.tools.r8.ir.optimize.Outliner$Outline):639:670 -> compareTo
+    9:40:int compareTo(java.lang.Object):536 -> compareTo
+    1:18:boolean equals(java.lang.Object):591:608 -> equals
+    1:6:int hashCode():616:621 -> hashCode
+    1:37:java.lang.String toString():677:713 -> toString
+com.android.tools.r8.ir.optimize.Outliner$OutlineCode -> com.android.tools.r8.internal.At$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):1575:1576 -> <init>
+    1:2:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.ir.optimize.Outliner$Outline):1606:1607 -> <init>
     boolean isEmptyVoidMethod() -> B
     java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper) -> a
-    1:2: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):1607:1608 -> a
-    3:3:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):1618:1618 -> a
-    4:4:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):1623:1623 -> a
-    1:1:boolean computeEquals(java.lang.Object):1633:1633 -> g
-    1:1:int computeHashCode():1628:1628 -> t
-    1:1:java.lang.String toString():1613:1613 -> toString
+    1:2: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):1638:1639 -> a
+    3:3:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):1649:1649 -> a
+    4:4:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):1654:1654 -> a
+    1:1:boolean computeEquals(java.lang.Object):1664:1664 -> g
+    1:1:int computeHashCode():1659:1659 -> t
+    1:1:java.lang.String toString():1644:1644 -> toString
     int estimatedDexCodeSizeUpperBoundInBytes() -> x
     int estimatedSizeForInlining() -> y
-com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction -> com.android.tools.r8.internal.Ju:
+com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction -> com.android.tools.r8.internal.Ct:
     com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType type -> b
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():116:116 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType):158:159 -> <init>
+    1:1:void <clinit>():127:127 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType):169:170 -> <init>
     int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction) -> a
     int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int) -> a
     java.lang.String getDetailsString() -> a
-    1:8:com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction fromInstruction(com.android.tools.r8.ir.code.Instruction):163:170 -> a
+    1:8:com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction fromInstruction(com.android.tools.r8.ir.code.Instruction):174:181 -> a
     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.Iu:
+com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType -> com.android.tools.r8.internal.Bt:
     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
@@ -43473,73 +43798,73 @@
     com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType REM -> e
     com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType INVOKE -> f
     com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType NEW -> g
-    1:7:void <clinit>():122:128 -> <clinit>
-    8:8:void <clinit>():121:121 -> <clinit>
-    1:1:void <init>(java.lang.String,int):121:121 -> <init>
-com.android.tools.r8.ir.optimize.Outliner$OutlineMethodIdentifier -> com.android.tools.r8.internal.Ku:
+    1:7:void <clinit>():133:139 -> <clinit>
+    8:8:void <clinit>():132:132 -> <clinit>
+    1:1:void <init>(java.lang.String,int):132:132 -> <init>
+com.android.tools.r8.ir.optimize.Outliner$OutlineMethodIdentifier -> com.android.tools.r8.internal.Dt:
     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):1140:1142 -> <init>
-    1:3:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1147:1149 -> a
-    4:5:com.android.tools.r8.utils.collections.LongLivedProgramMethodMultisetBuilder addOutlineMethodList(com.android.tools.r8.ir.optimize.Outliner$Outline):1153:1154 -> a
-com.android.tools.r8.ir.optimize.Outliner$OutlineRewriter -> com.android.tools.r8.internal.Lu:
+    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):1156:1158 -> <init>
+    1:3:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1163:1165 -> a
+    4:5:com.android.tools.r8.utils.collections.LongLivedProgramMethodMultisetBuilder addOutlineMethodList(com.android.tools.r8.ir.optimize.Outliner$Outline):1169:1170 -> a
+com.android.tools.r8.ir.optimize.Outliner$OutlineRewriter -> com.android.tools.r8.internal.Et:
     java.util.ListIterator blocksIterator -> s
     java.util.List toRemove -> t
     com.android.tools.r8.ir.optimize.Outliner this$0 -> v
     com.android.tools.r8.ir.code.IRCode code -> r
     int argumentsMapIndex -> u
     boolean $assertionsDisabled -> q
-    1:1:void <clinit>():1174:1174 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.List):1185:1189 -> <init>
-    1:60:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1194:1253 -> a
-    61:63:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.Outliner$Outline):1260:1262 -> a
-    64:65:int com.android.tools.r8.utils.ListUtils.firstIndexMatching(java.util.List,java.util.function.Predicate):52:53 -> a
-    64:65:java.util.Optional com.android.tools.r8.utils.ListUtils.removeFirstMatch(java.util.List,java.util.function.Predicate):118 -> a
-    64:65:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.Outliner$Outline):1261 -> a
-    66:68:java.util.Optional com.android.tools.r8.utils.ListUtils.removeFirstMatch(java.util.List,java.util.function.Predicate):120:122 -> a
-    66:68:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.Outliner$Outline):1261 -> a
-    69:69:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.Outliner$Outline):1264:1264 -> a
-    70:74:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.Outliner$Outline):1261:1265 -> a
-    75:75:boolean lambda$removeMethodFromOutlineList$0(com.android.tools.r8.graph.ProgramMethod):1263:1263 -> a
-com.android.tools.r8.ir.optimize.Outliner$OutlineSiteIdentifier -> com.android.tools.r8.internal.Mu:
+    1:1:void <clinit>():1190:1190 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.List):1201:1205 -> <init>
+    1:60:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1210:1269 -> a
+    61:63:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.Outliner$Outline):1276:1278 -> a
+    64:65:int com.android.tools.r8.utils.ListUtils.firstIndexMatching(java.util.List,java.util.function.Predicate):22:23 -> a
+    64:65:java.util.Optional com.android.tools.r8.utils.ListUtils.removeFirstMatch(java.util.List,java.util.function.Predicate):80 -> a
+    64:65:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.Outliner$Outline):1277 -> a
+    66:68:java.util.Optional com.android.tools.r8.utils.ListUtils.removeFirstMatch(java.util.List,java.util.function.Predicate):82:84 -> a
+    66:68:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.Outliner$Outline):1277 -> a
+    69:69:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.Outliner$Outline):1280:1280 -> a
+    70:74:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.Outliner$Outline):1277:1281 -> a
+    75:75:boolean lambda$removeMethodFromOutlineList$0(com.android.tools.r8.graph.ProgramMethod):1279:1279 -> a
+com.android.tools.r8.ir.optimize.Outliner$OutlineSiteIdentifier -> com.android.tools.r8.internal.Ft:
     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):1161:1162 -> <init>
-    1:3:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1167:1169 -> a
-    4:4:java.util.List lambda$handle$0(com.android.tools.r8.ir.optimize.Outliner$Outline):1168:1168 -> a
-com.android.tools.r8.ir.optimize.Outliner$OutlineSourceCode -> com.android.tools.r8.internal.Nu:
+    1:2:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.BasicBlock):1177:1178 -> <init>
+    1:3:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1183:1185 -> a
+    4:4:java.util.List lambda$handle$0(com.android.tools.r8.ir.optimize.Outliner$Outline):1184:1184 -> a
+com.android.tools.r8.ir.optimize.Outliner$OutlineSourceCode -> com.android.tools.r8.internal.Gt:
     com.android.tools.r8.ir.optimize.Outliner this$0 -> e
     int argumentMapIndex -> d
     boolean $assertionsDisabled -> a
     com.android.tools.r8.ir.code.Position position -> c
     com.android.tools.r8.ir.optimize.Outliner$Outline outline -> b
-    1:1:void <clinit>():1420:1420 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.ir.optimize.Outliner$Outline,com.android.tools.r8.graph.DexMethod):1426:1426 -> <init>
-    2:6:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.ir.optimize.Outliner$Outline,com.android.tools.r8.graph.DexMethod):1424:1428 -> <init>
+    1:1:void <clinit>():1451:1451 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.ir.optimize.Outliner$Outline,com.android.tools.r8.graph.DexMethod):1457:1457 -> <init>
+    2:6:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.ir.optimize.Outliner$Outline,com.android.tools.r8.graph.DexMethod):1455:1459 -> <init>
     void buildPostlude(com.android.tools.r8.ir.conversion.IRBuilder) -> a
     com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,int) -> a
     com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int) -> a
     boolean verifyLocalInScope(com.android.tools.r8.graph.DebugLocalInfo) -> a
-    1:1:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):1464:1464 -> a
-    2:2:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):1495:1495 -> a
-    3:7:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1506:1510 -> a
-    8:8:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():562:562 -> a
-    8:8:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1510 -> a
-    9:18:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1510:1519 -> a
-    19:19:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):1525:1525 -> a
-    20:20:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):1531:1531 -> a
+    1:1:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):1495:1495 -> a
+    2:2:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):1526:1526 -> a
+    3:7:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1537:1541 -> a
+    8:8:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():573:573 -> a
+    8:8:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1541 -> a
+    9:18:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1541:1550 -> a
+    19:19:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):1556:1556 -> a
+    20:20:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):1562:1562 -> a
     com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder) -> b
     void setUp() -> b
-    1:1:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):1546:1546 -> b
+    1:1:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):1577:1577 -> b
     com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int) -> c
     boolean verifyCurrentInstructionCanThrow() -> c
-    1:12:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):1478:1489 -> c
-    1:1:int instructionCount():1433:1433 -> d
-    2:2:int getMoveExceptionRegister(int):1541:1541 -> d
+    1:12:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):1509:1520 -> c
+    1:1:int instructionCount():1464:1464 -> d
+    2:2:int getMoveExceptionRegister(int):1572:1572 -> d
     int instructionOffset(int) -> e
-    1:1:com.android.tools.r8.ir.code.Position getCurrentPosition():1551:1551 -> e
+    1:1:com.android.tools.r8.ir.code.Position getCurrentPosition():1582:1582 -> e
     boolean verifyRegister(int) -> f
     int instructionIndex(int) -> g
-com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter -> com.android.tools.r8.internal.Ou:
+com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter -> com.android.tools.r8.internal.Ht:
     com.android.tools.r8.graph.DexType returnType -> l
     int returnValueUsersLeft -> n
     int pendingNewInstanceIndex -> o
@@ -43556,103 +43881,100 @@
     boolean $assertionsDisabled -> a
     com.android.tools.r8.ir.optimize.Outliner this$0 -> p
     com.android.tools.r8.ir.code.BasicBlock block -> c
-    1:1:void <clinit>():705:705 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.BasicBlock):724:724 -> <init>
-    2:19:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.BasicBlock):710:727 -> <init>
+    1:1:void <clinit>():721:721 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.BasicBlock):740:740 -> <init>
+    2:19:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.BasicBlock):726:743 -> <init>
     void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline) -> a
-    1:4:java.util.List getInstructionArray():731:734 -> a
-    5:10:java.util.List orderedInValues(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):756:761 -> a
-    11:11:com.android.tools.r8.graph.DexType argumentTypeFromInvoke(com.android.tools.r8.ir.code.InvokeMethod,int):910:910 -> a
+    1:4:java.util.List getInstructionArray():747:750 -> a
+    5:10:java.util.List orderedInValues(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):772:777 -> a
+    11:11:com.android.tools.r8.graph.DexType argumentTypeFromInvoke(com.android.tools.r8.ir.code.InvokeMethod,int):926:926 -> a
     12:12:boolean com.android.tools.r8.ir.code.Instruction.isInvokePolymorphic():0:0 -> a
-    12:12:com.android.tools.r8.graph.DexType argumentTypeFromInvoke(com.android.tools.r8.ir.code.InvokeMethod,int):910 -> a
-    13:13:com.android.tools.r8.graph.DexType argumentTypeFromInvoke(com.android.tools.r8.ir.code.InvokeMethod,int):912:912 -> a
+    12:12:com.android.tools.r8.graph.DexType argumentTypeFromInvoke(com.android.tools.r8.ir.code.InvokeMethod,int):926 -> a
+    13:13:com.android.tools.r8.graph.DexType argumentTypeFromInvoke(com.android.tools.r8.ir.code.InvokeMethod,int):928:928 -> a
     14:14:boolean com.android.tools.r8.ir.code.Instruction.isInvokePolymorphic():0:0 -> a
-    14:14:com.android.tools.r8.graph.DexType argumentTypeFromInvoke(com.android.tools.r8.ir.code.InvokeMethod,int):915 -> a
-    15:20:com.android.tools.r8.graph.DexType argumentTypeFromInvoke(com.android.tools.r8.ir.code.InvokeMethod,int):917:922 -> a
-    21:36:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):927:942 -> a
-    37:48:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):948:959 -> a
-    49:49:boolean com.android.tools.r8.ir.analysis.type.InterfaceCollection.hasSingleKnownInterface():140:140 -> a
-    49:49:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):959 -> a
-    50:61:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):960:971 -> a
-    62:62:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBoolean():0:0 -> a
-    62:62:boolean com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement.hasDexType():64 -> a
-    62:62:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):971 -> a
-    63:63:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isByte():0:0 -> a
-    63:63:boolean com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement.hasDexType():65 -> a
-    63:63:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):971 -> a
-    64:64:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isShort():0:0 -> a
-    64:64:boolean com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement.hasDexType():66 -> a
-    64:64:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):971 -> a
-    65:65:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isChar():0:0 -> a
-    65:65:boolean com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement.hasDexType():67 -> a
-    65:65:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):971 -> a
-    66:66:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> a
-    66:66:boolean com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement.hasDexType():68 -> a
-    66:66:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):971 -> a
-    67:67:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isFloat():0:0 -> a
-    67:67:boolean com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement.hasDexType():69 -> a
-    67:67:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):971 -> a
-    68:68:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isLong():0:0 -> a
-    68:68:boolean com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement.hasDexType():70 -> a
-    68:68:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):971 -> a
-    69:69:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDouble():0:0 -> a
-    69:69:boolean com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement.hasDexType():71 -> a
-    69:69:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):971 -> a
-    70:71:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):971:972 -> a
-    72:72:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> a
-    72:72:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):973 -> a
-    73:76:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):976:979 -> a
-    77:84:void updateReturnValueState(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):1060:1067 -> a
-    85:89:void adjustReturnValueUsersLeft(int):1072:1076 -> a
-    90:119:void candidate(int,int):1083:1112 -> a
-    1:1:void invalidateInstructionArray():739:739 -> b
-    2:12:void reset(int):1117:1127 -> b
-    1:5:void process():745:749 -> c
-    6:9:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.processInstruction(com.android.tools.r8.ir.code.Instruction):772:775 -> c
-    6:9:void process():749 -> c
+    14:14:com.android.tools.r8.graph.DexType argumentTypeFromInvoke(com.android.tools.r8.ir.code.InvokeMethod,int):931 -> a
+    15:20:com.android.tools.r8.graph.DexType argumentTypeFromInvoke(com.android.tools.r8.ir.code.InvokeMethod,int):933:938 -> a
+    21:36:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):943:958 -> a
+    37:60:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):964:987 -> a
+    61:61:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBoolean():0:0 -> a
+    61:61:boolean com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement.hasDexType():64 -> a
+    61:61:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):987 -> a
+    62:62:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isByte():0:0 -> a
+    62:62:boolean com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement.hasDexType():65 -> a
+    62:62:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):987 -> a
+    63:63:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isShort():0:0 -> a
+    63:63:boolean com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement.hasDexType():66 -> a
+    63:63:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):987 -> a
+    64:64:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isChar():0:0 -> a
+    64:64:boolean com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement.hasDexType():67 -> a
+    64:64:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):987 -> a
+    65:65:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> a
+    65:65:boolean com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement.hasDexType():68 -> a
+    65:65:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):987 -> a
+    66:66:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isFloat():0:0 -> a
+    66:66:boolean com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement.hasDexType():69 -> a
+    66:66:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):987 -> a
+    67:67:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isLong():0:0 -> a
+    67:67:boolean com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement.hasDexType():70 -> a
+    67:67:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):987 -> a
+    68:68:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDouble():0:0 -> a
+    68:68:boolean com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement.hasDexType():71 -> a
+    68:68:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):987 -> a
+    69:70:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):987:988 -> a
+    71:71:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> a
+    71:71:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):989 -> a
+    72:75:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):992:995 -> a
+    76:83:void updateReturnValueState(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):1076:1083 -> a
+    84:88:void adjustReturnValueUsersLeft(int):1088:1092 -> a
+    89:118:void candidate(int,int):1099:1128 -> a
+    1:1:void invalidateInstructionArray():755:755 -> b
+    2:12:void reset(int):1133:1143 -> b
+    1:5:void process():761:765 -> c
+    6:9:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.processInstruction(com.android.tools.r8.ir.code.Instruction):788:791 -> c
+    6:9:void process():765 -> c
     10:10:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> c
-    10:10:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.processInstruction(com.android.tools.r8.ir.code.Instruction):782 -> c
-    10:10:void process():749 -> c
-    11:100:boolean com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.canIncludeInstruction(com.android.tools.r8.ir.code.Instruction):815:904 -> c
-    11:100:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.processInstruction(com.android.tools.r8.ir.code.Instruction):789 -> c
-    11:100:void process():749 -> c
-    101:101:boolean com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.canIncludeInstruction(com.android.tools.r8.ir.code.Instruction):899:899 -> c
-    101:101:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.processInstruction(com.android.tools.r8.ir.code.Instruction):789 -> c
-    101:101:void process():749 -> c
-    102:102:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.processInstruction(com.android.tools.r8.ir.code.Instruction):793:793 -> c
-    102:102:void process():749 -> c
+    10:10:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.processInstruction(com.android.tools.r8.ir.code.Instruction):798 -> c
+    10:10:void process():765 -> c
+    11:100:boolean com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.canIncludeInstruction(com.android.tools.r8.ir.code.Instruction):831:920 -> c
+    11:100:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.processInstruction(com.android.tools.r8.ir.code.Instruction):805 -> c
+    11:100:void process():765 -> c
+    101:101:boolean com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.canIncludeInstruction(com.android.tools.r8.ir.code.Instruction):915:915 -> c
+    101:101:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.processInstruction(com.android.tools.r8.ir.code.Instruction):805 -> c
+    101:101:void process():765 -> c
+    102:102:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.processInstruction(com.android.tools.r8.ir.code.Instruction):809:809 -> c
+    102:102:void process():765 -> c
     103:103:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> c
-    103:103:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.includeInstruction(com.android.tools.r8.ir.code.Instruction):987 -> c
-    103:103:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.processInstruction(com.android.tools.r8.ir.code.Instruction):796 -> c
-    103:103:void process():749 -> c
-    104:130:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.includeInstruction(com.android.tools.r8.ir.code.Instruction):988:1014 -> c
-    104:130:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.processInstruction(com.android.tools.r8.ir.code.Instruction):796 -> c
-    104:130:void process():749 -> c
-    131:141:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.includeInstruction(com.android.tools.r8.ir.code.Instruction):1012:1022 -> c
-    131:141:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.processInstruction(com.android.tools.r8.ir.code.Instruction):796 -> c
-    131:141:void process():749 -> c
+    103:103:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.includeInstruction(com.android.tools.r8.ir.code.Instruction):1003 -> c
+    103:103:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.processInstruction(com.android.tools.r8.ir.code.Instruction):812 -> c
+    103:103:void process():765 -> c
+    104:130:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.includeInstruction(com.android.tools.r8.ir.code.Instruction):1004:1030 -> c
+    104:130:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.processInstruction(com.android.tools.r8.ir.code.Instruction):812 -> c
+    104:130:void process():765 -> c
+    131:141:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.includeInstruction(com.android.tools.r8.ir.code.Instruction):1028:1038 -> c
+    131:141:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.processInstruction(com.android.tools.r8.ir.code.Instruction):812 -> c
+    131:141:void process():765 -> c
     142:142:boolean com.android.tools.r8.ir.code.Instruction.isInvokePolymorphic():0:0 -> c
-    142:142:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.includeInstruction(com.android.tools.r8.ir.code.Instruction):1022 -> c
-    142:142:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.processInstruction(com.android.tools.r8.ir.code.Instruction):796 -> c
-    142:142:void process():749 -> c
-    143:148:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.includeInstruction(com.android.tools.r8.ir.code.Instruction):1034:1039 -> c
-    143:148:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.processInstruction(com.android.tools.r8.ir.code.Instruction):796 -> c
-    143:148:void process():749 -> c
-    149:152:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.includeInstruction(com.android.tools.r8.ir.code.Instruction):1038:1041 -> c
-    149:152:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.processInstruction(com.android.tools.r8.ir.code.Instruction):796 -> c
-    149:152:void process():749 -> c
-    153:180:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.includeInstruction(com.android.tools.r8.ir.code.Instruction):1023:1050 -> c
-    153:180:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.processInstruction(com.android.tools.r8.ir.code.Instruction):796 -> c
-    153:180:void process():749 -> c
-    181:187:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.includeInstruction(com.android.tools.r8.ir.code.Instruction):1048:1054 -> c
-    181:187:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.processInstruction(com.android.tools.r8.ir.code.Instruction):796 -> c
-    181:187:void process():749 -> c
-    188:188:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.includeInstruction(com.android.tools.r8.ir.code.Instruction):1052:1052 -> c
-    188:188:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.processInstruction(com.android.tools.r8.ir.code.Instruction):796 -> c
-    188:188:void process():749 -> c
-    189:199:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.processInstruction(com.android.tools.r8.ir.code.Instruction):798:808 -> c
-    189:199:void process():749 -> c
-com.android.tools.r8.ir.optimize.PeepholeOptimizer -> com.android.tools.r8.internal.ev:
+    142:142:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.includeInstruction(com.android.tools.r8.ir.code.Instruction):1038 -> c
+    142:142:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.processInstruction(com.android.tools.r8.ir.code.Instruction):812 -> c
+    142:142:void process():765 -> c
+    143:148:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.includeInstruction(com.android.tools.r8.ir.code.Instruction):1050:1055 -> c
+    143:148:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.processInstruction(com.android.tools.r8.ir.code.Instruction):812 -> c
+    143:148:void process():765 -> c
+    149:152:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.includeInstruction(com.android.tools.r8.ir.code.Instruction):1054:1057 -> c
+    149:152:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.processInstruction(com.android.tools.r8.ir.code.Instruction):812 -> c
+    149:152:void process():765 -> c
+    153:180:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.includeInstruction(com.android.tools.r8.ir.code.Instruction):1039:1066 -> c
+    153:180:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.processInstruction(com.android.tools.r8.ir.code.Instruction):812 -> c
+    153:180:void process():765 -> c
+    181:187:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.includeInstruction(com.android.tools.r8.ir.code.Instruction):1064:1070 -> c
+    181:187:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.processInstruction(com.android.tools.r8.ir.code.Instruction):812 -> c
+    181:187:void process():765 -> c
+    188:188:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.includeInstruction(com.android.tools.r8.ir.code.Instruction):1068:1068 -> c
+    188:188:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.processInstruction(com.android.tools.r8.ir.code.Instruction):812 -> c
+    188:188:void process():765 -> c
+    189:199:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.processInstruction(com.android.tools.r8.ir.code.Instruction):814:824 -> c
+    189:199:void process():765 -> c
+com.android.tools.r8.ir.optimize.PeepholeOptimizer -> com.android.tools.r8.internal.Xt:
     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
@@ -43684,7 +44006,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():1159:1159 -> a
+    269:269:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1154:1154 -> 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
@@ -43726,7 +44048,7 @@
     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.gv:
+com.android.tools.r8.ir.optimize.PhiOptimizations -> com.android.tools.r8.internal.Zt:
     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
@@ -43753,7 +44075,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.My:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination -> com.android.tools.r8.internal.Dx:
     java.util.Set affectedValues -> g
     com.android.tools.r8.ir.code.IRCode code -> e
     com.android.tools.r8.graph.AppView appView -> c
@@ -43763,141 +44085,122 @@
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
     com.android.tools.r8.graph.ProgramMethod method -> d
-    1:1:void <clinit>():56:56 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):76:76 -> <init>
-    2:15:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):67:80 -> <init>
+    1:1:void <clinit>():54:54 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):74:74 -> <init>
+    2:15:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):65:78 -> <init>
     1:1:boolean com.android.tools.r8.graph.DexClassAndField.isProgramField():0:0 -> a
-    1:1:boolean isFinal(com.android.tools.r8.graph.DexClassAndField):158 -> a
-    2:2:boolean isFinal(com.android.tools.r8.graph.DexClassAndField):161:161 -> a
-    3:3:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():204:204 -> a
-    3:3:boolean isFinal(com.android.tools.r8.graph.DexClassAndField):161 -> a
-    4:6:boolean isFinal(com.android.tools.r8.graph.DexClassAndField):162:164 -> a
-    7:7:java.util.Set access$000(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination):56:56 -> a
-    8:27:void handleInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect):344:363 -> a
-    28:28:void handleInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect):351:351 -> a
-    29:36:void lambda$handleInvokeDirect$0(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):366:373 -> a
-    37:37:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():204:204 -> a
-    37:37:void lambda$handleInvokeDirect$0(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):374 -> a
-    38:46:void lambda$handleInvokeDirect$0(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):375:383 -> a
-    47:47:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():204:204 -> a
-    47:47:void lambda$handleInvokeDirect$0(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):384 -> a
-    48:55:void lambda$handleInvokeDirect$0(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):385:392 -> a
-    56:56:void applyObjectState(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.value.ObjectState):430:430 -> a
-    57:61:void lambda$applyObjectState$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.value.AbstractValue):432:436 -> a
-    62:63:void killAllNonFinalActiveFields():444:445 -> a
-    64:75:void killNonFinalActiveFields(com.android.tools.r8.ir.code.FieldInstruction):449:460 -> a
-    76:76:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    76:76:void killNonFinalActiveFields(com.android.tools.r8.ir.code.FieldInstruction):462 -> a
-    77:80:void killNonFinalActiveFields(com.android.tools.r8.ir.code.FieldInstruction):463:466 -> a
-    81:81:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
-    81:81:void killNonFinalActiveFields(com.android.tools.r8.ir.code.FieldInstruction):468 -> a
-    82:82:void killNonFinalActiveFields(com.android.tools.r8.ir.code.FieldInstruction):469:469 -> a
-    1:1:com.android.tools.r8.graph.AppView access$100(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination):56:56 -> b
-    2:23:void run():180:201 -> b
-    24:30:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination.resolveField(com.android.tools.r8.graph.DexField):168:174 -> b
-    24:30:void run():202 -> b
-    31:31:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):282:282 -> b
-    31:31:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination.resolveField(com.android.tools.r8.graph.DexField):174 -> b
-    31:31:void run():202 -> b
-    32:32:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.toProgramFieldOrNull(com.android.tools.r8.graph.DexEncodedField):291:291 -> b
-    32:32:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):282 -> b
-    32:32:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination.resolveField(com.android.tools.r8.graph.DexField):174 -> b
-    32:32:void run():202 -> b
-    33:33:void run():203:203 -> b
+    1:1:boolean isFinal(com.android.tools.r8.graph.DexClassAndField):156 -> a
+    2:2:boolean isFinal(com.android.tools.r8.graph.DexClassAndField):159:159 -> a
+    3:3:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():194:194 -> a
+    3:3:boolean isFinal(com.android.tools.r8.graph.DexClassAndField):159 -> a
+    4:6:boolean isFinal(com.android.tools.r8.graph.DexClassAndField):160:162 -> a
+    7:7:java.util.Set access$000(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination):54:54 -> a
+    8:27:void handleInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect):359:378 -> a
+    28:28:void handleInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect):366:366 -> a
+    29:36:void lambda$handleInvokeDirect$0(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):381:388 -> a
+    37:37:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():194:194 -> a
+    37:37:void lambda$handleInvokeDirect$0(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):389 -> a
+    38:46:void lambda$handleInvokeDirect$0(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):390:398 -> a
+    47:47:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():194:194 -> a
+    47:47:void lambda$handleInvokeDirect$0(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):399 -> a
+    48:55:void lambda$handleInvokeDirect$0(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):400:407 -> a
+    56:57:void killAllNonFinalActiveFields():413:414 -> a
+    58:69:void killNonFinalActiveFields(com.android.tools.r8.ir.code.FieldInstruction):418:429 -> a
+    70:70:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    70:70:void killNonFinalActiveFields(com.android.tools.r8.ir.code.FieldInstruction):431 -> a
+    71:74:void killNonFinalActiveFields(com.android.tools.r8.ir.code.FieldInstruction):432:435 -> a
+    75:75:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
+    75:75:void killNonFinalActiveFields(com.android.tools.r8.ir.code.FieldInstruction):437 -> a
+    76:76:void killNonFinalActiveFields(com.android.tools.r8.ir.code.FieldInstruction):438:438 -> a
+    1:1:com.android.tools.r8.graph.AppView access$100(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination):54:54 -> b
+    2:23:void run():178:199 -> b
+    24:30:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination.resolveField(com.android.tools.r8.graph.DexField):166:172 -> b
+    24:30:void run():200 -> b
+    31:31:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):232:232 -> b
+    31:31:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination.resolveField(com.android.tools.r8.graph.DexField):172 -> b
+    31:31:void run():200 -> b
+    32:32:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.toProgramFieldOrNull(com.android.tools.r8.graph.DexEncodedField):241:241 -> b
+    32:32:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):232 -> b
+    32:32:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination.resolveField(com.android.tools.r8.graph.DexField):172 -> b
+    32:32:void run():200 -> b
+    33:33:void run():201:201 -> b
     34:34:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> b
-    34:34:void run():208 -> b
-    35:46:void run():209:220 -> b
-    47:60:void run():219:232 -> b
-    61:61:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():204:204 -> b
-    61:61:void run():232 -> b
-    62:63:void run():232:233 -> b
-    64:69:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination.verifyWasInstanceInitializer():330:335 -> b
-    64:69:void run():234 -> b
-    70:74:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination.verifyWasInstanceInitializer():334:338 -> b
-    70:74:void run():234 -> b
-    75:78:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination.verifyWasInstanceInitializer():336:339 -> b
-    75:78:void run():234 -> b
-    79:81:void run():235:237 -> b
+    34:34:void run():206 -> b
+    35:46:void run():207:218 -> b
+    47:60:void run():217:230 -> b
+    61:61:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():194:194 -> b
+    61:61:void run():230 -> b
+    62:63:void run():230:231 -> b
+    64:69:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination.verifyWasInstanceInitializer():345:350 -> b
+    64:69:void run():232 -> b
+    70:74:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination.verifyWasInstanceInitializer():349:353 -> b
+    70:74:void run():232 -> b
+    75:78:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination.verifyWasInstanceInitializer():351:354 -> b
+    75:78:void run():232 -> b
+    79:81:void run():233:235 -> b
     82:82:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> b
-    82:82:void run():239 -> b
-    83:83:void run():240:240 -> b
-    84:94:void com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField):399:409 -> b
-    84:94:void run():240 -> b
-    95:95:boolean com.android.tools.r8.ir.code.StaticGet.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):141:141 -> b
-    95:95:void com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField):409 -> b
-    95:95:void run():240 -> b
-    96:96:boolean com.android.tools.r8.ir.code.StaticGet.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):147:147 -> b
-    96:96:boolean com.android.tools.r8.ir.code.StaticGet.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):141 -> b
-    96:96:void com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField):409 -> b
-    96:96:void run():240 -> b
-    97:107:void com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField):410:420 -> b
-    97:107:void run():240 -> b
-    108:108:boolean com.android.tools.r8.graph.AppView.hasLiveness():568:568 -> b
-    108:108:void com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField):420 -> b
-    108:108:void run():240 -> b
-    109:111:void com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField):422:424 -> b
-    109:111:void run():240 -> b
-    112:119:void run():241:248 -> b
-    120:120:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():204:204 -> b
-    120:120:void run():248 -> b
-    121:123:void run():248:248 -> b
-    125:127:void run():250:252 -> b
-    128:128:void run():204:204 -> b
-    129:129:boolean com.android.tools.r8.ir.code.Instruction.isInitClass():0:0 -> b
-    129:129:void run():255 -> b
-    130:136:void run():256:262 -> b
-    137:137:boolean com.android.tools.r8.ir.code.Instruction.isMonitor():0:0 -> b
-    137:137:void run():263 -> b
-    138:143:void run():264:269 -> b
-    144:144:boolean com.android.tools.r8.ir.code.Instruction.isInvokeCustom():0:0 -> b
-    144:144:void run():269 -> b
-    145:159:void run():271:285 -> b
-    160:160:boolean com.android.tools.r8.ir.code.Instruction.isArrayLength():0:0 -> b
-    160:160:void run():286 -> b
-    161:161:void run():287:287 -> b
-    162:162:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> b
-    162:162:void run():288 -> b
-    163:163:void run():289:289 -> b
-    164:164:boolean com.android.tools.r8.ir.code.Instruction.isCheckCast():0:0 -> b
-    164:164:void run():290 -> b
-    165:165:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> b
-    165:165:void run():291 -> b
-    166:166:boolean com.android.tools.r8.ir.code.Instruction.isConstMethodHandle():0:0 -> b
-    166:166:void run():292 -> b
-    167:167:boolean com.android.tools.r8.ir.code.Instruction.isConstMethodType():0:0 -> b
-    167:167:void run():293 -> b
-    168:168:void run():294:294 -> b
-    169:169:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> b
-    169:169:void run():295 -> b
-    170:170:void run():296:296 -> b
-    171:171:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> b
-    171:171:void run():297 -> b
-    172:173:void run():298:299 -> b
-    174:174:boolean com.android.tools.r8.ir.code.Instruction.isInstanceOf():0:0 -> b
-    174:174:void run():300 -> b
-    175:175:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMultiNewArray():0:0 -> b
-    175:175:void run():301 -> b
-    176:176:boolean com.android.tools.r8.ir.code.Instruction.isInvokeNewArray():0:0 -> b
-    176:176:void run():302 -> b
-    177:177:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> b
-    177:177:void run():303 -> b
-    178:178:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> b
-    178:178:void run():304 -> b
-    179:179:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayFilledData():0:0 -> b
-    179:179:void run():305 -> b
-    180:183:void run():306:309 -> b
-    184:210:void run():284:310 -> b
-    211:211:void run():270:270 -> b
-    212:212:boolean com.android.tools.r8.ir.code.BasicBlock.hasUniqueNormalSuccessorWithUniquePredecessor():198:198 -> b
-    212:212:void run():313 -> b
-    213:223:void run():314:324 -> b
-    224:224:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> b
-    224:224:void run():324 -> b
-    225:227:void run():324:326 -> b
-    1:1:com.android.tools.r8.graph.ProgramMethod access$200(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination):56:56 -> c
-    1:1:com.android.tools.r8.ir.code.IRCode access$300(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination):56:56 -> d
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$1 -> com.android.tools.r8.internal.Fy:
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState -> com.android.tools.r8.internal.Gy:
+    82:82:void run():237 -> b
+    83:108:void run():238:263 -> b
+    109:109:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():194:194 -> b
+    109:109:void run():263 -> b
+    110:112:void run():263:263 -> b
+    114:116:void run():265:267 -> b
+    117:117:void run():202:202 -> b
+    118:118:boolean com.android.tools.r8.ir.code.Instruction.isInitClass():0:0 -> b
+    118:118:void run():270 -> b
+    119:125:void run():271:277 -> b
+    126:126:boolean com.android.tools.r8.ir.code.Instruction.isMonitor():0:0 -> b
+    126:126:void run():278 -> b
+    127:132:void run():279:284 -> b
+    133:133:boolean com.android.tools.r8.ir.code.Instruction.isInvokeCustom():0:0 -> b
+    133:133:void run():284 -> b
+    134:148:void run():286:300 -> b
+    149:149:boolean com.android.tools.r8.ir.code.Instruction.isArrayLength():0:0 -> b
+    149:149:void run():301 -> b
+    150:150:void run():302:302 -> b
+    151:151:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> b
+    151:151:void run():303 -> b
+    152:152:void run():304:304 -> b
+    153:153:boolean com.android.tools.r8.ir.code.Instruction.isCheckCast():0:0 -> b
+    153:153:void run():305 -> b
+    154:154:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> b
+    154:154:void run():306 -> b
+    155:155:boolean com.android.tools.r8.ir.code.Instruction.isConstMethodHandle():0:0 -> b
+    155:155:void run():307 -> b
+    156:156:boolean com.android.tools.r8.ir.code.Instruction.isConstMethodType():0:0 -> b
+    156:156:void run():308 -> b
+    157:157:void run():309:309 -> b
+    158:158:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> b
+    158:158:void run():310 -> b
+    159:159:void run():311:311 -> b
+    160:160:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> b
+    160:160:void run():312 -> b
+    161:162:void run():313:314 -> b
+    163:163:boolean com.android.tools.r8.ir.code.Instruction.isInstanceOf():0:0 -> b
+    163:163:void run():315 -> b
+    164:164:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMultiNewArray():0:0 -> b
+    164:164:void run():316 -> b
+    165:165:boolean com.android.tools.r8.ir.code.Instruction.isInvokeNewArray():0:0 -> b
+    165:165:void run():317 -> b
+    166:166:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> b
+    166:166:void run():318 -> b
+    167:167:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> b
+    167:167:void run():319 -> b
+    168:168:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayFilledData():0:0 -> b
+    168:168:void run():320 -> b
+    169:172:void run():321:324 -> b
+    173:199:void run():299:325 -> b
+    200:200:void run():285:285 -> b
+    201:201:boolean com.android.tools.r8.ir.code.BasicBlock.hasUniqueNormalSuccessorWithUniquePredecessor():198:198 -> b
+    201:201:void run():328 -> b
+    202:212:void run():329:339 -> b
+    213:213:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> b
+    213:213:void run():339 -> b
+    214:216:void run():339:341 -> b
+    1:1:com.android.tools.r8.graph.ProgramMethod access$200(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination):54:54 -> c
+    1:1:com.android.tools.r8.ir.code.IRCode access$300(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination):54:54 -> d
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$1 -> com.android.tools.r8.internal.wx:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState -> com.android.tools.r8.internal.xx:
     java.util.LinkedHashSet initializedClasses -> d
     java.util.LinkedHashMap nonFinalInstanceFieldValues -> e
     java.util.LinkedHashMap finalInstanceFieldValues -> b
@@ -43905,113 +44208,113 @@
     int maxCapacity -> g
     java.util.LinkedHashMap nonFinalStaticFieldValues -> f
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():593:593 -> <clinit>
-    1:2:void <init>(int):607:608 -> <init>
-    3:24:void <init>(int,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):612:633 -> <init>
-    1:1:int access$700(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):593:593 -> a
-    2:2:void clearNonFinalInstanceFields():639:639 -> a
-    3:7:com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldValue getInstanceFieldValue(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject):656:660 -> a
-    8:12:com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldValue getStaticFieldValue(com.android.tools.r8.graph.DexField):665:669 -> a
-    13:13:void intersectFieldValues(java.util.Map,java.util.Map):702:702 -> a
-    14:14:boolean lambda$intersectFieldValues$0(java.util.Map,java.util.Map$Entry):702:702 -> a
-    15:15:void intersectInitializedClasses(java.util.Set,java.util.Set):707:707 -> a
-    16:16:boolean isClassInitialized(com.android.tools.r8.graph.DexType):711:711 -> a
-    17:17:boolean isEmpty(java.util.Map):727:727 -> a
-    18:18:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):734:734 -> a
+    1:1:void <clinit>():562:562 -> <clinit>
+    1:2:void <init>(int):576:577 -> <init>
+    3:24:void <init>(int,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):581:602 -> <init>
+    1:1:int access$700(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):562:562 -> a
+    2:2:void clearNonFinalInstanceFields():608:608 -> a
+    3:7:com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldValue getInstanceFieldValue(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject):625:629 -> a
+    8:12:com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldValue getStaticFieldValue(com.android.tools.r8.graph.DexField):634:638 -> a
+    13:13:void intersectFieldValues(java.util.Map,java.util.Map):671:671 -> a
+    14:14:boolean lambda$intersectFieldValues$0(java.util.Map,java.util.Map$Entry):671:671 -> a
+    15:15:void intersectInitializedClasses(java.util.Set,java.util.Set):676:676 -> a
+    16:16:boolean isClassInitialized(com.android.tools.r8.graph.DexType):680:680 -> a
+    17:17:boolean isEmpty(java.util.Map):696:696 -> a
+    18:18:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):703:703 -> a
     19:19:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
-    19:19:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):735 -> a
-    20:21:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):736:737 -> a
-    22:23:void com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState.removeFinalInstanceField(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject):792:793 -> a
-    22:23:void com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState.removeInstanceField(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject):787 -> a
-    22:23:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):738 -> a
-    24:25:void com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState.removeNonFinalInstanceField(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject):798:799 -> a
-    24:25:void com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState.removeInstanceField(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject):788 -> a
-    24:25:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):738 -> a
+    19:19:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):704 -> a
+    20:21:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):705:706 -> a
+    22:23:void com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState.removeFinalInstanceField(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject):761:762 -> a
+    22:23:void com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState.removeInstanceField(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject):756 -> a
+    22:23:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):707 -> a
+    24:25:void com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState.removeNonFinalInstanceField(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject):767:768 -> a
+    24:25:void com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState.removeInstanceField(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject):757 -> a
+    24:25:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):707 -> a
     26:26:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    26:26:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):739 -> a
-    27:28:void com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState.removeFinalStaticField(com.android.tools.r8.graph.DexField):815:816 -> a
-    27:28:void com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState.removeStaticField(com.android.tools.r8.graph.DexField):810 -> a
-    27:28:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):740 -> a
-    29:30:void com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState.removeNonFinalStaticField(com.android.tools.r8.graph.DexField):821:822 -> a
-    29:30:void com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState.removeStaticField(com.android.tools.r8.graph.DexField):811 -> a
-    29:30:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):740 -> a
-    31:32:void com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState.killActiveInitializedClassesForExceptionalExit(com.android.tools.r8.ir.code.InitClass):745:746 -> a
-    31:32:void access$600(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState,com.android.tools.r8.ir.code.InitClass):593 -> a
-    33:40:void reduceSize(int):759:766 -> a
-    41:44:int reduceSize(int,java.util.Set):773:776 -> a
-    45:45:int reduceSize(int,java.util.Map):783:783 -> a
-    46:46:boolean lambda$removeNonFinalInstanceFields$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject):805:805 -> a
-    47:51:void putFinalInstanceField(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldValue):827:831 -> a
-    52:56:void putFinalStaticField(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldValue):835:839 -> a
-    1:1:void clearNonFinalStaticFields():643:643 -> b
-    2:25:void intersect(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):673:696 -> b
-    26:30:void markClassAsInitialized(com.android.tools.r8.graph.DexType):751:755 -> b
-    31:32:void removeNonFinalInstanceFields(com.android.tools.r8.graph.DexField):804:805 -> b
-    33:38:void putNonFinalInstanceField(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldValue):843:848 -> b
-    39:44:void putNonFinalStaticField(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldValue):852:857 -> b
-    45:45:int size(java.util.Map):873:873 -> b
-    1:4:void ensureCapacityForNewElement():647:650 -> c
-    5:6:void removeNonFinalStaticField(com.android.tools.r8.graph.DexField):821:822 -> c
-    1:2:boolean isEmpty():715:716 -> d
-    3:3:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState.isEmpty(java.util.Set):723:723 -> d
-    3:3:boolean isEmpty():717 -> d
-    4:6:boolean isEmpty():717:719 -> d
-    1:2:int size():861:862 -> e
-    3:3:int com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState.size(java.util.Set):869:869 -> e
-    3:3:int size():863 -> e
-    4:6:int size():863:865 -> e
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockStates -> com.android.tools.r8.internal.Hy:
+    26:26:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):708 -> a
+    27:28:void com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState.removeFinalStaticField(com.android.tools.r8.graph.DexField):784:785 -> a
+    27:28:void com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState.removeStaticField(com.android.tools.r8.graph.DexField):779 -> a
+    27:28:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):709 -> a
+    29:30:void com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState.removeNonFinalStaticField(com.android.tools.r8.graph.DexField):790:791 -> a
+    29:30:void com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState.removeStaticField(com.android.tools.r8.graph.DexField):780 -> a
+    29:30:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):709 -> a
+    31:32:void com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState.killActiveInitializedClassesForExceptionalExit(com.android.tools.r8.ir.code.InitClass):714:715 -> a
+    31:32:void access$600(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState,com.android.tools.r8.ir.code.InitClass):562 -> a
+    33:40:void reduceSize(int):728:735 -> a
+    41:44:int reduceSize(int,java.util.Set):742:745 -> a
+    45:45:int reduceSize(int,java.util.Map):752:752 -> a
+    46:46:boolean lambda$removeNonFinalInstanceFields$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject):774:774 -> a
+    47:51:void putFinalInstanceField(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldValue):796:800 -> a
+    52:56:void putFinalStaticField(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldValue):804:808 -> a
+    1:1:void clearNonFinalStaticFields():612:612 -> b
+    2:25:void intersect(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):642:665 -> b
+    26:30:void markClassAsInitialized(com.android.tools.r8.graph.DexType):720:724 -> b
+    31:32:void removeNonFinalInstanceFields(com.android.tools.r8.graph.DexField):773:774 -> b
+    33:38:void putNonFinalInstanceField(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldValue):812:817 -> b
+    39:44:void putNonFinalStaticField(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldValue):821:826 -> b
+    45:45:int size(java.util.Map):842:842 -> b
+    1:4:void ensureCapacityForNewElement():616:619 -> c
+    5:6:void removeNonFinalStaticField(com.android.tools.r8.graph.DexField):790:791 -> c
+    1:2:boolean isEmpty():684:685 -> d
+    3:3:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState.isEmpty(java.util.Set):692:692 -> d
+    3:3:boolean isEmpty():686 -> d
+    4:6:boolean isEmpty():686:688 -> d
+    1:2:int size():830:831 -> e
+    3:3:int com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState.size(java.util.Set):838:838 -> e
+    3:3:int size():832 -> e
+    4:6:int size():832:834 -> e
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockStates -> com.android.tools.r8.internal.yx:
     java.util.LinkedHashMap activeStateAtExit -> b
     boolean $assertionsDisabled -> a
     int capacity -> c
-    1:1:void <clinit>():473:473 -> <clinit>
-    1:6:void <init>():473:478 -> <init>
-    1:11:void removeDeadBlockExitStates(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):545:555 -> a
-    12:13:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):563:564 -> a
-    14:39:void com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockStates.ensureCapacity(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):515:540 -> a
-    14:39:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):567 -> a
-    40:42:int com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockStates.size():584:586 -> a
-    40:42:void com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockStates.ensureCapacity(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):540 -> a
-    40:42:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):567 -> a
-    43:43:void com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockStates.ensureCapacity(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):540:540 -> a
-    43:43:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):567 -> a
-    44:46:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):568:570 -> a
-    47:51:void removeState(com.android.tools.r8.ir.code.BasicBlock):574:578 -> a
+    1:1:void <clinit>():442:442 -> <clinit>
+    1:6:void <init>():442:447 -> <init>
+    1:11:void removeDeadBlockExitStates(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):514:524 -> a
+    12:13:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):532:533 -> a
+    14:39:void com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockStates.ensureCapacity(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):484:509 -> a
+    14:39:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):536 -> a
+    40:42:int com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockStates.size():553:555 -> a
+    40:42:void com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockStates.ensureCapacity(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):509 -> a
+    40:42:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):536 -> a
+    43:43:void com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockStates.ensureCapacity(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):509:509 -> a
+    43:43:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):536 -> a
+    44:46:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):537:539 -> a
+    47:51:void removeState(com.android.tools.r8.ir.code.BasicBlock):543:547 -> a
     52:52:boolean com.android.tools.r8.ir.code.BasicBlock.isEntry():587:587 -> a
-    52:52:com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState computeActiveStateOnBlockEntry(com.android.tools.r8.ir.code.BasicBlock,int):481 -> a
-    53:75:com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState computeActiveStateOnBlockEntry(com.android.tools.r8.ir.code.BasicBlock,int):482:504 -> a
+    52:52:com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState computeActiveStateOnBlockEntry(com.android.tools.r8.ir.code.BasicBlock,int):450 -> a
+    53:75:com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState computeActiveStateOnBlockEntry(com.android.tools.r8.ir.code.BasicBlock,int):451:473 -> a
     76:76:boolean com.android.tools.r8.ir.code.Instruction.isInitClass():0:0 -> a
-    76:76:com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState computeActiveStateOnBlockEntry(com.android.tools.r8.ir.code.BasicBlock,int):505 -> a
-    77:77:com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState computeActiveStateOnBlockEntry(com.android.tools.r8.ir.code.BasicBlock,int):506:506 -> a
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$ExistingValue -> com.android.tools.r8.internal.Iy:
+    76:76:com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState computeActiveStateOnBlockEntry(com.android.tools.r8.ir.code.BasicBlock,int):474 -> a
+    77:77:com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState computeActiveStateOnBlockEntry(com.android.tools.r8.ir.code.BasicBlock,int):475:475 -> a
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$ExistingValue -> com.android.tools.r8.internal.zx:
     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):93:93 -> <init>
-    2:3:void <init>(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination,com.android.tools.r8.ir.code.Value):97:98 -> <init>
-    1:4:void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):103:106 -> a
-    1:1:java.lang.String toString():111:111 -> toString
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject -> com.android.tools.r8.internal.Jy:
+    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):91:91 -> <init>
+    2:3:void <init>(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination,com.android.tools.r8.ir.code.Value):95:96 -> <init>
+    1:4:void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):101:104 -> a
+    1:1:java.lang.String toString():109:109 -> toString
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject -> com.android.tools.r8.internal.Ax:
     com.android.tools.r8.graph.DexField field -> b
     com.android.tools.r8.ir.code.Value object -> c
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():132:132 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$1):132:132 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value):136:139 -> <init>
-    1:1:com.android.tools.r8.graph.DexField access$800(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject):132:132 -> a
-    1:5:boolean equals(java.lang.Object):149:153 -> equals
-    1:1:int hashCode():144:144 -> hashCode
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldValue -> com.android.tools.r8.internal.Ky:
+    1:1:void <clinit>():130:130 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$1):130:130 -> <init>
+    2:5:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value):134:137 -> <init>
+    1:1:com.android.tools.r8.graph.DexField access$800(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject):130:130 -> a
+    1:5:boolean equals(java.lang.Object):147:151 -> equals
+    1:1:int hashCode():142:142 -> hashCode
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldValue -> com.android.tools.r8.internal.Bx:
     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.Ly:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$MaterializableValue -> com.android.tools.r8.internal.Cx:
     com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination this$0 -> c
     com.android.tools.r8.ir.analysis.value.SingleValue value -> b
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():115:115 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination,com.android.tools.r8.ir.analysis.value.SingleValue,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$1):115:115 -> <init>
-    2:4:void <init>(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination,com.android.tools.r8.ir.analysis.value.SingleValue):119:121 -> <init>
-    1:3:void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):126:128 -> a
-    4:4:void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):127:127 -> a
-com.android.tools.r8.ir.optimize.ReflectionOptimizer -> com.android.tools.r8.internal.Dz:
+    1:1:void <clinit>():113:113 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination,com.android.tools.r8.ir.analysis.value.SingleValue,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$1):113:113 -> <init>
+    2:4:void <init>(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination,com.android.tools.r8.ir.analysis.value.SingleValue):117:119 -> <init>
+    1:3:void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):124:126 -> a
+    4:4:void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):125:125 -> a
+com.android.tools.r8.ir.optimize.ReflectionOptimizer -> com.android.tools.r8.internal.py:
     boolean $assertionsDisabled -> a
     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
@@ -44032,70 +44335,75 @@
     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:97: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
-    94:97:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.shaking.MainDexTracingResult):60 -> a
-    98:99:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.shaking.MainDexTracingResult):70:71 -> a
-    100:144: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:184 -> a
-    100:144:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.shaking.MainDexTracingResult):67 -> a
-    145:146:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.shaking.MainDexTracingResult):77:78 -> a
-    147:147:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    147:147:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.shaking.MainDexTracingResult):78 -> a
-    148:150:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.shaking.MainDexTracingResult):78:80 -> a
-    151:151:boolean lambda$rewriteGetClassOrForNameToConstClass$0(com.android.tools.r8.ir.code.Instruction):54:54 -> a
-    152:152: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
-    153:157: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
-    158:177: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
-    178:196: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
-    197: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):125: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.yB:
-    java.util.List serviceLoadMethods -> b
-    com.android.tools.r8.graph.AppView appView -> a
-    1:1:void <init>(com.android.tools.r8.graph.AppView):65:65 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.AppView):63:66 -> <init>
-    1:1:java.util.List getServiceLoadMethods():70:70 -> a
-    2:2:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessingId):74:74 -> a
-    3:3:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1030:1030 -> a
-    3:3:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessingId):75 -> a
-    4:30:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessingId):78:104 -> a
-    31:31:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
-    31:31:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessingId):104 -> a
-    32:94:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessingId):108:170 -> a
-    95:107:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessingId):169:181 -> a
-    108:110: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):173:175 -> a
-    111:118:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.ir.conversion.MethodProcessingId,com.android.tools.r8.graph.ProgramMethod):190:197 -> a
-    119:135:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.ir.conversion.MethodProcessingId,com.android.tools.r8.graph.ProgramMethod):194:210 -> a
-    136:136:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.ir.conversion.MethodProcessingId,com.android.tools.r8.graph.ProgramMethod):209:209 -> a
-    137:139:void lambda$createSynthesizedMethod$2(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.synthesis.SyntheticMethodBuilder):200:202 -> a
-    140:141:com.android.tools.r8.graph.Code lambda$createSynthesizedMethod$1(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexMethod):204:205 -> a
-    142:150:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):50:58 -> a
-    142:150:com.android.tools.r8.graph.Code lambda$createSynthesizedMethod$1(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexMethod):204 -> a
-    151:166:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):55:70 -> a
-    151:166:com.android.tools.r8.graph.Code lambda$createSynthesizedMethod$1(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexMethod):204 -> a
-    167:167:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):68:68 -> a
-    167:167:com.android.tools.r8.graph.Code lambda$createSynthesizedMethod$1(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexMethod):204 -> a
-    168:190:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):61:83 -> a
-    168:190:com.android.tools.r8.graph.Code lambda$createSynthesizedMethod$1(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexMethod):204 -> a
-    191:191:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):80:80 -> a
-    191:191:com.android.tools.r8.graph.Code lambda$createSynthesizedMethod$1(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexMethod):204 -> a
-    192:221:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):76:105 -> a
-    192:221:com.android.tools.r8.graph.Code lambda$createSynthesizedMethod$1(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexMethod):204 -> a
-    222:222:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):103:103 -> a
-    222:222:com.android.tools.r8.graph.Code lambda$createSynthesizedMethod$1(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexMethod):204 -> a
-    223:251:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):90:118 -> a
-    223:251:com.android.tools.r8.graph.Code lambda$createSynthesizedMethod$1(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexMethod):204 -> a
-com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter -> com.android.tools.r8.internal.xB:
+    94:95:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBaseOrSameFeatureAs(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):105:106 -> 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):273:273 -> 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:201: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:130 -> a
+    202: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):129:129 -> 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):119:119 -> a
+com.android.tools.r8.ir.optimize.ServiceLoaderRewriter -> com.android.tools.r8.internal.kA:
+    com.android.tools.r8.graph.AppView appView -> c
+    java.util.concurrent.atomic.AtomicReference synthesizedClass -> b
+    boolean $assertionsDisabled -> a
+    1:1:void <clinit>():72:72 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):81:81 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.AppView):77:82 -> <init>
+    1:1:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessingId):90:90 -> a
+    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1025:1025 -> a
+    2:2:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessingId):91 -> a
+    3:29:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessingId):94:120 -> a
+    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):273:273 -> 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
+    105:117: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):203:215 -> a
+    105:117: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
+    118:131: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):212:225 -> a
+    118:131: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
+    132:132: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):277:277 -> a
+    132:132: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):225 -> a
+    132:132: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
+    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: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:191 -> a
+    137:137: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
+    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):189 -> a
+    138:174:com.android.tools.r8.graph.DexProgramClass getOrSetSynthesizedClass():233:269 -> a
+    175:197: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.jA:
     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
-    1:4:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeStatic):243:246 -> <init>
+    1:4:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeStatic):303:306 -> <init>
     boolean lambda$perform$1(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.ir.code.Instruction) -> a
-    1:1:boolean lambda$perform$0(com.android.tools.r8.ir.code.Instruction):253:253 -> a
-    2:5:void com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter.clearGetClassLoader(com.android.tools.r8.ir.code.InvokeVirtual):269:272 -> a
-    2:5:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexMethod):252 -> a
-    6:18:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexMethod):253:265 -> a
-com.android.tools.r8.ir.optimize.SwitchCaseEliminator -> com.android.tools.r8.internal.kE:
+    1:1:boolean lambda$perform$0(com.android.tools.r8.ir.code.Instruction):313:313 -> a
+    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.WC:
     com.android.tools.r8.ir.code.BasicBlock alwaysHitTarget -> g
     int alwaysHitCase -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet switchCasesToBeRemoved -> i
@@ -44142,7 +44450,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.lE:
+com.android.tools.r8.ir.optimize.SwitchMapCollector -> com.android.tools.r8.internal.XC:
     com.android.tools.r8.graph.DexString switchMapPrefix -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexString kotlinSwitchMapPrefix -> c
@@ -44156,22 +44464,28 @@
     17:39:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):103:125 -> a
     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:60:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):125:144 -> a
-    61:61:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    61:61:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):145 -> a
-    62:74:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):148:160 -> a
-    75:75:boolean lambda$extractSwitchMap$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Instruction):122:122 -> a
-    76:76:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    76:76:boolean lambda$extractSwitchMap$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Instruction):122 -> a
-    77:77:boolean lambda$extractSwitchMap$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Instruction):122:122 -> 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.TF:
+    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):273:273 -> 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):273:273 -> 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:78:boolean lambda$extractSwitchMap$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Instruction):122:122 -> a
+    79:79:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    79:79:boolean lambda$extractSwitchMap$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Instruction):122 -> a
+    80:80:boolean lambda$extractSwitchMap$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Instruction):122:122 -> a
+    81:83:boolean maybeIsSwitchMap(com.android.tools.r8.graph.DexEncodedField):165:167 -> a
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization -> com.android.tools.r8.internal.jF:
     com.android.tools.r8.graph.AppView appView -> c
     com.android.tools.r8.utils.MethodSignatureEquivalence equivalence -> a
     boolean $assertionsDisabled -> b
     1:44:void <clinit>():45:88 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView):92:93 -> <init>
-    1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.type():94:94 -> a
+    1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.type():88:88 -> a
     1:1:void lambda$strenghtenOptimizationInfo$0(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexEncodedField):102 -> a
     2:3:void lambda$strenghtenOptimizationInfo$0(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexEncodedField):102:103 -> a
     4:13:com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization strenghtenOptimizationInfo():97:106 -> a
@@ -44201,12 +44515,12 @@
     247:247:com.android.tools.r8.graph.RewrittenPrototypeDescription getPrototypeChanges(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):303:303 -> a
     248:252:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):331:335 -> 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):311:326 -> b
-com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy -> com.android.tools.r8.internal.SF:
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy -> com.android.tools.r8.internal.iF:
     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>():48:49 -> <clinit>
     1:1:void <init>(java.lang.String,int):47:47 -> <init>
-com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$UninstantiatedTypeOptimizationGraphLens -> com.android.tools.r8.internal.TF$a:
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$UninstantiatedTypeOptimizationGraphLens -> com.android.tools.r8.internal.jF$a:
     java.util.Map removedArgumentsInfoPerMethod -> n
     boolean $assertionsDisabled -> l
     com.android.tools.r8.graph.AppView appView -> m
@@ -44215,7 +44529,7 @@
     7:15:void <init>(com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,java.util.Map,com.android.tools.r8.graph.AppView):61: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.gG:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector -> com.android.tools.r8.internal.wF:
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap methodMapping -> e
     com.android.tools.r8.ir.optimize.MethodPoolCollection methodPoolCollection -> d
     com.android.tools.r8.graph.AppView appView -> c
@@ -44249,26 +44563,26 @@
     1:8:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):211:218 -> b
     1:6:void processVirtualMethods(com.android.tools.r8.graph.DexProgramClass):248:253 -> c
     1:1:java.lang.Runnable runnableForClass(com.android.tools.r8.graph.DexProgramClass):207:207 -> d
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1 -> com.android.tools.r8.internal.dG:
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$CollectUsedArguments -> com.android.tools.r8.internal.eG:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1 -> com.android.tools.r8.internal.tF:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$CollectUsedArguments -> com.android.tools.r8.internal.uF:
     java.util.BitSet used -> a
     1:3:void <init>():332:334 -> <init>
     4:4:void <init>(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1):332:332 -> <init>
     1:1:java.util.BitSet getUsedArguments():337:337 -> a
     2:2:boolean register(int):342:342 -> a
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$GloballyUsedSignatures -> com.android.tools.r8.internal.fG:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$GloballyUsedSignatures -> com.android.tools.r8.internal.vF:
     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):173:174 -> <init>
     1:12:com.android.tools.r8.graph.DexMethod getNewSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto):183:194 -> a
     13: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):200:202 -> a
     16:16: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):201:201 -> a
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UnusedArgumentsGraphLens -> com.android.tools.r8.internal.gG$a:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UnusedArgumentsGraphLens -> com.android.tools.r8.internal.wF$a:
     java.util.Map removedArguments -> l
     1:1:void <init>(java.util.Map,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory,java.util.Map):66:66 -> <init>
     2:9:void <init>(java.util.Map,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory,java.util.Map):65:72 -> <init>
     1:3:com.android.tools.r8.graph.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):78:78 -> a
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UsedSignatures -> com.android.tools.r8.internal.hG:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UsedSignatures -> com.android.tools.r8.internal.xF:
     java.util.Set usedSignatures -> c
     com.android.tools.r8.utils.MethodSignatureEquivalence equivalence -> b
     com.android.tools.r8.ir.optimize.UnusedArgumentsCollector this$0 -> d
@@ -44289,109 +44603,95 @@
     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):162 -> 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):165:165 -> a
     29:29: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):164:164 -> a
-com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations -> com.android.tools.r8.internal.rG:
-    1:21: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):43:63 -> a
-    1:21: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):76 -> a
-    1:21:com.android.tools.r8.graph.Code lambda$synthesizeThrowClassCastExceptionIfNotNullMethod$2(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):67 -> a
-    22:32: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):60:70 -> a
-    22:32: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):76 -> a
-    22:32:com.android.tools.r8.graph.Code lambda$synthesizeThrowClassCastExceptionIfNotNullMethod$2(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):67 -> a
+com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations -> com.android.tools.r8.internal.HF:
+    1:21: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
+    1:21: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):78 -> a
+    1:21:com.android.tools.r8.graph.Code lambda$synthesizeThrowClassCastExceptionIfNotNullMethod$2(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):70 -> a
+    22:32: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
+    22:32: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):78 -> a
+    22:32:com.android.tools.r8.graph.Code lambda$synthesizeThrowClassCastExceptionIfNotNullMethod$2(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):70 -> a
     33:33:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> a
-    33:33: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):70 -> a
-    33:33: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):76 -> a
-    33:33:com.android.tools.r8.graph.Code lambda$synthesizeThrowClassCastExceptionIfNotNullMethod$2(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):67 -> a
-    34:35: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):70:71 -> a
-    34:35: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):76 -> a
-    34:35:com.android.tools.r8.graph.Code lambda$synthesizeThrowClassCastExceptionIfNotNullMethod$2(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):67 -> a
-    36:60: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):51:75 -> a
-    36:60: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):76 -> a
-    36:60:com.android.tools.r8.graph.Code lambda$synthesizeThrowClassCastExceptionIfNotNullMethod$2(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):67 -> a
-    61:78: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):53:70 -> a
-    79:83:void lambda$synthesizeThrowClassCastExceptionIfNotNullMethod$3(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder):64:68 -> a
-    1:15:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations.CfUtilityMethodsForCodeOptimizationsTemplates_throwIncompatibleClassChangeError(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):81:95 -> b
-    1:15:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations.getThrowIncompatibleClassChangeErrorCodeTemplate(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.InternalOptions):105 -> b
-    1:15:com.android.tools.r8.graph.Code lambda$synthesizeThrowIncompatibleClassChangeErrorMethod$4(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):96 -> b
-    16:16:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations.CfUtilityMethodsForCodeOptimizationsTemplates_throwIncompatibleClassChangeError(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):92:92 -> b
-    16:16:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations.getThrowIncompatibleClassChangeErrorCodeTemplate(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.InternalOptions):105 -> b
-    16:16:com.android.tools.r8.graph.Code lambda$synthesizeThrowIncompatibleClassChangeErrorMethod$4(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):96 -> b
-    17:30:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations.CfUtilityMethodsForCodeOptimizationsTemplates_throwIncompatibleClassChangeError(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):86:99 -> b
-    17:30:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations.getThrowIncompatibleClassChangeErrorCodeTemplate(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.InternalOptions):105 -> b
-    17:30:com.android.tools.r8.graph.Code lambda$synthesizeThrowIncompatibleClassChangeErrorMethod$4(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):96 -> b
-    31:48:com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations synthesizeThrowIncompatibleClassChangeErrorMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId):82:99 -> b
-    49:53:void lambda$synthesizeThrowIncompatibleClassChangeErrorMethod$5(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder):93:97 -> b
-    1:15:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations.CfUtilityMethodsForCodeOptimizationsTemplates_throwNoSuchMethodError(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):104:118 -> c
-    1:15:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations.getThrowNoSuchMethodErrorCodeTemplate(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.InternalOptions):133 -> c
-    1:15:com.android.tools.r8.graph.Code lambda$synthesizeThrowNoSuchMethodErrorMethod$6(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):124 -> c
-    16:16:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations.CfUtilityMethodsForCodeOptimizationsTemplates_throwNoSuchMethodError(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):115:115 -> c
-    16:16:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations.getThrowNoSuchMethodErrorCodeTemplate(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.InternalOptions):133 -> c
-    16:16:com.android.tools.r8.graph.Code lambda$synthesizeThrowNoSuchMethodErrorMethod$6(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):124 -> c
-    17:30:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations.CfUtilityMethodsForCodeOptimizationsTemplates_throwNoSuchMethodError(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):109:122 -> c
-    17:30:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations.getThrowNoSuchMethodErrorCodeTemplate(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.InternalOptions):133 -> c
-    17:30:com.android.tools.r8.graph.Code lambda$synthesizeThrowNoSuchMethodErrorMethod$6(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):124 -> c
-    31:47:com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations synthesizeThrowNoSuchMethodErrorMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId):111:127 -> c
-    48:51:void lambda$synthesizeThrowNoSuchMethodErrorMethod$7(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder):122:125 -> c
-    1:17:com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations synthesizeToStringIfNotNullMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId):26:42 -> d
-    18:21:void lambda$synthesizeToStringIfNotNullMethod$1(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder):37:40 -> d
-    22:41:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations.CfUtilityMethodsForCodeOptimizationsTemplates_toStringIfNotNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):127:146 -> d
-    22:41:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations.getToStringIfNotNullCodeTemplate(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.InternalOptions):48 -> d
-    22:41:com.android.tools.r8.graph.Code lambda$synthesizeToStringIfNotNullMethod$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):39 -> d
-    42:52:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations.CfUtilityMethodsForCodeOptimizationsTemplates_toStringIfNotNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):143:153 -> d
-    42:52:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations.getToStringIfNotNullCodeTemplate(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.InternalOptions):48 -> d
-    42:52:com.android.tools.r8.graph.Code lambda$synthesizeToStringIfNotNullMethod$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):39 -> d
-    53:53:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> d
-    53:53:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations.CfUtilityMethodsForCodeOptimizationsTemplates_toStringIfNotNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):153 -> d
-    53:53:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations.getToStringIfNotNullCodeTemplate(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.InternalOptions):48 -> d
-    53:53:com.android.tools.r8.graph.Code lambda$synthesizeToStringIfNotNullMethod$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):39 -> d
-    54:55:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations.CfUtilityMethodsForCodeOptimizationsTemplates_toStringIfNotNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):153:154 -> d
-    54:55:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations.getToStringIfNotNullCodeTemplate(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.InternalOptions):48 -> d
-    54:55:com.android.tools.r8.graph.Code lambda$synthesizeToStringIfNotNullMethod$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):39 -> d
-    56:79:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations.CfUtilityMethodsForCodeOptimizationsTemplates_toStringIfNotNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):135:158 -> d
-    56:79:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations.getToStringIfNotNullCodeTemplate(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.InternalOptions):48 -> d
-    56:79:com.android.tools.r8.graph.Code lambda$synthesizeToStringIfNotNullMethod$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):39 -> d
-com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$1 -> com.android.tools.r8.internal.qG:
-com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations -> com.android.tools.r8.internal.rG$a:
+    33:33: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
+    33:33: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):78 -> a
+    33:33:com.android.tools.r8.graph.Code lambda$synthesizeThrowClassCastExceptionIfNotNullMethod$2(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):70 -> a
+    34:35: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
+    34:35: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):78 -> a
+    34:35:com.android.tools.r8.graph.Code lambda$synthesizeThrowClassCastExceptionIfNotNullMethod$2(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):70 -> a
+    36:60: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
+    36:60: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):78 -> a
+    36:60:com.android.tools.r8.graph.Code lambda$synthesizeThrowClassCastExceptionIfNotNullMethod$2(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):70 -> a
+    61:80: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):53:72 -> a
+    81:81:void lambda$synthesizeThrowClassCastExceptionIfNotNullMethod$3(com.android.tools.r8.graph.DexProto,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.synthesis.SyntheticMethodBuilder):67:67 -> a
+    82:82:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.MethodAccessFlags.createPublicStaticSynthetic():79:79 -> a
+    82:82:void lambda$synthesizeThrowClassCastExceptionIfNotNullMethod$3(com.android.tools.r8.graph.DexProto,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.synthesis.SyntheticMethodBuilder):68 -> a
+    83:84:void lambda$synthesizeThrowClassCastExceptionIfNotNullMethod$3(com.android.tools.r8.graph.DexProto,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.synthesis.SyntheticMethodBuilder):68:69 -> a
+    1:19:com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations synthesizeToStringIfNotNullMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId):24:42 -> b
+    20:20:void lambda$synthesizeToStringIfNotNullMethod$1(com.android.tools.r8.graph.DexProto,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.synthesis.SyntheticMethodBuilder):38:38 -> b
+    21:21:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.MethodAccessFlags.createPublicStaticSynthetic():79:79 -> b
+    21:21:void lambda$synthesizeToStringIfNotNullMethod$1(com.android.tools.r8.graph.DexProto,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.synthesis.SyntheticMethodBuilder):39 -> b
+    22:23:void lambda$synthesizeToStringIfNotNullMethod$1(com.android.tools.r8.graph.DexProto,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.synthesis.SyntheticMethodBuilder):39:40 -> b
+    24:43:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations.CfUtilityMethodsForCodeOptimizationsTemplates_toStringIfNotNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):78:97 -> b
+    24:43:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations.getToStringIfNotNullCodeTemplate(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.InternalOptions):48 -> b
+    24:43:com.android.tools.r8.graph.Code lambda$synthesizeToStringIfNotNullMethod$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):40 -> b
+    44:54:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations.CfUtilityMethodsForCodeOptimizationsTemplates_toStringIfNotNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):94:104 -> b
+    44:54:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations.getToStringIfNotNullCodeTemplate(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.InternalOptions):48 -> b
+    44:54:com.android.tools.r8.graph.Code lambda$synthesizeToStringIfNotNullMethod$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):40 -> b
+    55:55:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> b
+    55:55:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations.CfUtilityMethodsForCodeOptimizationsTemplates_toStringIfNotNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):104 -> b
+    55:55:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations.getToStringIfNotNullCodeTemplate(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.InternalOptions):48 -> b
+    55:55:com.android.tools.r8.graph.Code lambda$synthesizeToStringIfNotNullMethod$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):40 -> b
+    56:57:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations.CfUtilityMethodsForCodeOptimizationsTemplates_toStringIfNotNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):104:105 -> b
+    56:57:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations.getToStringIfNotNullCodeTemplate(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.InternalOptions):48 -> b
+    56:57:com.android.tools.r8.graph.Code lambda$synthesizeToStringIfNotNullMethod$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):40 -> b
+    58:81:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations.CfUtilityMethodsForCodeOptimizationsTemplates_toStringIfNotNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):86:109 -> b
+    58:81:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations.getToStringIfNotNullCodeTemplate(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.InternalOptions):48 -> b
+    58:81:com.android.tools.r8.graph.Code lambda$synthesizeToStringIfNotNullMethod$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):40 -> b
+com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$1 -> com.android.tools.r8.internal.GF:
+com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations -> com.android.tools.r8.internal.HF$a:
     boolean $assertionsDisabled -> a
     com.android.tools.r8.graph.ProgramMethod method -> b
     boolean optimized -> c
-    1:1:void <clinit>():136:136 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$1):136:136 -> <init>
-    2:3:void <init>(com.android.tools.r8.graph.ProgramMethod):141:142 -> <init>
-    1:2:com.android.tools.r8.graph.ProgramMethod getMethod():146:147 -> a
-    3:4:void optimize(com.android.tools.r8.ir.conversion.MethodProcessor):151:152 -> a
-com.android.tools.r8.ir.optimize.classinliner.ClassInliner -> com.android.tools.r8.internal.h6:
+    1:1:void <clinit>():82:82 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$1):82:82 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.ProgramMethod):87:88 -> <init>
+    1:2:com.android.tools.r8.graph.ProgramMethod getMethod():92:93 -> a
+    3:4:void optimize(com.android.tools.r8.ir.conversion.MethodProcessor):97:98 -> 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>():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:95: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:230 -> a
-    96:96:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(java.util.Set):1209:1209 -> a
-    96: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):233 -> a
-    97:98: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
-    99:99:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    99: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):235 -> a
-    100:103: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:238 -> a
-    104:144: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):226:266 -> a
-    145:145:boolean lambda$processMethodCode$0(com.android.tools.r8.ir.code.Instruction):142:142 -> a
-    146:146:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    146:146:boolean lambda$processMethodCode$0(com.android.tools.r8.ir.code.Instruction):142 -> a
-    147:147: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
-    148:148: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
-    148:148: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
-    149:168: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:309 -> a
-    149:168: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
-    149:168: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
-    169:169: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
-    169:169: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
-    169:169: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
-    170:171: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
-    170:171: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.g6:
+    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):273:273 -> 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):1204:1204 -> 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.conversion.MethodProcessingId,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):235 -> a
+    101:132: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:266 -> a
+    133:133:boolean lambda$processMethodCode$0(com.android.tools.r8.ir.code.Instruction):142:142 -> a
+    134:134:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    134:134:boolean lambda$processMethodCode$0(com.android.tools.r8.ir.code.Instruction):142 -> a
+    135:135: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
+    136:136: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
+    136:136: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
+    137:156: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:309 -> a
+    137:156: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
+    137:156: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
+    157:157: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
+    157:157: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
+    157:157: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
+    158:159: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
+    158:159: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>():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.i6:
+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
@@ -44415,13 +44715,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.j6:
+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.k6:
+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
@@ -44433,13 +44733,13 @@
     2:10:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):42:50 -> <init>
     1:21:com.android.tools.r8.utils.OptionalBool computeReturnsReceiver():54:74 -> a
     22:35:com.android.tools.r8.utils.OptionalBool computeIsReceiverAlias(com.android.tools.r8.ir.code.Value):83:96 -> a
-    36:37:boolean com.android.tools.r8.ir.analysis.type.ClassTypeElement.isRelatedTo(com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.AppView):94:95 -> a
+    36:37:boolean com.android.tools.r8.ir.analysis.type.ClassTypeElement.isRelatedTo(com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.AppView):92:93 -> a
     36:37:com.android.tools.r8.utils.OptionalBool computeIsReceiverAlias(com.android.tools.r8.ir.code.Value):96 -> a
     38:73:com.android.tools.r8.utils.OptionalBool computeIsReceiverAlias(com.android.tools.r8.ir.code.Value):98:133 -> a
     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.l6:
+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
@@ -44468,7 +44768,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.sc:
+com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper -> com.android.tools.r8.internal.Lb:
     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
@@ -44488,7 +44788,7 @@
     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.Ef:
+com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor -> com.android.tools.r8.internal.Qe:
     com.android.tools.r8.graph.DexProgramClass eligibleClass -> l
     java.util.Map directInlinees -> q
     java.util.List indirectInlinees -> r
@@ -44508,266 +44808,263 @@
     com.android.tools.r8.ir.optimize.Inliner inliner -> f
     com.android.tools.r8.com.google.common.collect.ImmutableSet ALLOWED_ZERO_TEST_TYPES -> a
     boolean $assertionsDisabled -> c
-    1:11:void <clinit>():85:95 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Function,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):130:130 -> <init>
-    2:32:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Function,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):108:138 -> <init>
-    1:1:java.util.Map getDirectInlinees():146:146 -> a
-    2:10:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):231:239 -> a
+    1:11:void <clinit>():84:94 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Function,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):129:129 -> <init>
+    2:32:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Function,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):107:137 -> <init>
+    1:1:java.util.Map getDirectInlinees():145:145 -> a
+    2:10:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):230:238 -> a
     11:11:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
-    11:11:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):239 -> a
+    11:11:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):238 -> a
     12:12:boolean com.android.tools.r8.ir.code.Instruction.isCheckCast():0:0 -> a
-    12:12:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):239 -> a
+    12:12:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):238 -> a
     13:13:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
-    13:13:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):264 -> a
-    14:14:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):265:265 -> a
+    13:13:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):263 -> a
+    14:14:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):264:264 -> a
     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):265 -> a
-    16:20:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):269:273 -> a
-    21:21:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():209:209 -> a
-    21:21:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):274 -> a
-    22:23:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):280:281 -> a
+    15:15:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):264 -> a
+    16:20:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):268:272 -> a
+    21:21:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():199:199 -> a
+    21:21:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):273 -> a
+    22:23:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):279:280 -> 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):281 -> a
-    25:32:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):285:292 -> a
-    33:33:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():209:209 -> a
-    33:33:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):293 -> a
-    34:47:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):299:312 -> a
+    24:24:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):280 -> a
+    25:32:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):284:291 -> a
+    33:33:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():199:199 -> a
+    33:33:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):292 -> a
+    34:47:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):298:311 -> a
     48:48:boolean com.android.tools.r8.graph.DexClassAndMethod.isLibraryMethod():0:0 -> a
-    48:48:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):317 -> a
-    49:49:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):318:318 -> a
-    50:56:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleLibraryMethodCall(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.LibraryMethod):1214:1220 -> a
-    50:56:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):318 -> a
-    57:74:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):322:339 -> a
-    75:101:com.android.tools.r8.ir.optimize.Inliner$InliningInfo com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod):829:855 -> a
-    75:101:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):341 -> a
+    48:48:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):316 -> a
+    49:49:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):317:317 -> a
+    50:56:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleLibraryMethodCall(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.LibraryMethod):1194:1200 -> a
+    50:56:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):317 -> a
+    57:74:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):321:338 -> a
+    75:101:com.android.tools.r8.ir.optimize.Inliner$InliningInfo com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod):809:835 -> a
+    75:101:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):340 -> a
     102:102:boolean com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo.receiverMayEscapeOutsideConstructorChain():68:68 -> a
-    102:102:com.android.tools.r8.ir.optimize.Inliner$InliningInfo com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod):856 -> a
-    102:102:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):341 -> a
-    103:108:com.android.tools.r8.ir.optimize.Inliner$InliningInfo com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod):861:866 -> a
-    103:108:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):341 -> a
+    102:102:com.android.tools.r8.ir.optimize.Inliner$InliningInfo com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod):836 -> a
+    102:102:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):340 -> a
+    103:108:com.android.tools.r8.ir.optimize.Inliner$InliningInfo com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod):841:846 -> a
+    103:108:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):340 -> a
     109:109:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
-    109:109:com.android.tools.r8.ir.optimize.Inliner$InliningInfo com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod):866 -> a
-    109:109:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):341 -> a
-    110:126:com.android.tools.r8.ir.optimize.Inliner$InliningInfo com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod):866:882 -> a
-    110:126:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):341 -> a
-    127:141:com.android.tools.r8.ir.optimize.Inliner$InliningInfo com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod):878:892 -> a
-    127:141:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):341 -> a
-    142:152:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):343:353 -> a
+    109:109:com.android.tools.r8.ir.optimize.Inliner$InliningInfo com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod):846 -> a
+    109:109:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):340 -> a
+    110:126:com.android.tools.r8.ir.optimize.Inliner$InliningInfo com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod):846:862 -> a
+    110:126:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):340 -> a
+    127:141:com.android.tools.r8.ir.optimize.Inliner$InliningInfo com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod):858:872 -> a
+    127:141:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):340 -> a
+    142:152:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):342:352 -> a
     153:153:boolean com.android.tools.r8.ir.code.Instruction.isInvokeInterface():0:0 -> a
-    153:153:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):353 -> a
-    154:166:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):354:366 -> a
+    153:153:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):352 -> a
+    154:166:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):353:365 -> a
     167:167:boolean com.android.tools.r8.ir.code.Instruction.isInvokeSuper():0:0 -> a
-    167:167:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):366 -> a
-    168:168:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):366:366 -> a
+    167:167:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):365 -> a
+    168:168:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):365:365 -> a
     169:169:boolean com.android.tools.r8.ir.code.Instruction.isInvokePolymorphic():0:0 -> a
-    169:169:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):367 -> a
-    170:170:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):367:367 -> a
-    171:194:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier):1168:1191 -> a
-    171:194:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):368 -> a
-    195:214:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier):1190:1209 -> a
-    195:214:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):368 -> a
-    215:218:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):377:380 -> a
+    169:169:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):366 -> a
+    170:170:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):366:366 -> a
+    171:194:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier):1148:1171 -> a
+    171:194:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):367 -> a
+    195:214:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier):1170:1189 -> a
+    195:214:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):367 -> a
+    215:218:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):376:379 -> a
     219:219:boolean com.android.tools.r8.ir.code.Instruction.isCheckCast():0:0 -> a
-    219:219:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):240 -> a
-    220:239:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):241:260 -> a
-    240:240:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):412:412 -> a
-    241:247:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):451:457 -> a
-    241:247:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):413 -> a
+    219:219:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):239 -> a
+    220:239:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):240:259 -> a
+    240:240:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):411:411 -> a
+    241:247:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):449:455 -> a
+    241:247:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):412 -> a
     248:248:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):38:38 -> a
-    248:248:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):457 -> a
-    248:248:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):413 -> a
-    249:254:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):458:463 -> a
-    249:254:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):413 -> a
-    255:260:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.forceInlineExtraMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):468:473 -> a
-    255:260:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):415 -> a
-    261:261:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.forceInlineExtraMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):472:472 -> a
-    261:261:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):415 -> a
-    262:266:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.clear():443:447 -> a
-    262:266:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):418 -> a
-    267:274:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):421:428 -> a
-    275:286:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):423:434 -> a
-    287:306:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set):666:685 -> a
-    287:306:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):435 -> a
-    307:307:boolean com.android.tools.r8.graph.DexClassAndMethod.isLibraryMethod():0:0 -> a
-    307:307:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set):686 -> a
-    307:307:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):435 -> a
-    308:338:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set):687:717 -> a
-    308:338:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):435 -> a
-    339:339:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
-    339:339:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set):722 -> a
-    339:339:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):435 -> a
-    340:340:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set):722:722 -> a
-    340:340:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):435 -> a
-    341:341:boolean com.android.tools.r8.ir.code.Instruction.isMonitor():0:0 -> a
-    341:341:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set):727 -> a
-    341:341:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):435 -> a
-    342:354:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set):730:742 -> a
-    342:354:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):435 -> a
-    355:355:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):436:436 -> a
-    356:377:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldWrites():803:824 -> a
-    356:377:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):437 -> a
-    378:380:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldWrites():818:820 -> a
-    378:380:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):437 -> a
-    381:383:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldWrites():805:807 -> a
-    381:383:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):437 -> a
-    384:384:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):438:438 -> a
-    385:391:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):479:485 -> a
-    392:397:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):483:488 -> a
-    398:425:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):487:514 -> a
-    426:426:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
-    426:426:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):514 -> a
-    427:440:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):514:527 -> a
-    441:449:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):523:531 -> a
-    450:450:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):528:528 -> a
-    451:451:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):516:516 -> a
-    452:479:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):510:537 -> a
-    480:483:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):536:539 -> a
-    484:487:void removeFieldReads(com.android.tools.r8.ir.code.IRCode):748:751 -> a
-    488:488:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
-    488:488:void removeFieldReads(com.android.tools.r8.ir.code.IRCode):751 -> a
-    489:513:void removeFieldReads(com.android.tools.r8.ir.code.IRCode):752:776 -> a
-    514:514:int lambda$removeFieldReads$1(com.android.tools.r8.ir.code.InstanceGet):749:749 -> a
-    515:519:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):782:786 -> a
-    520:531:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):785:796 -> a
-    532:532:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    532:532:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):796 -> a
-    533:533:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):797:797 -> a
-    534:534:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    534:534:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):797 -> a
-    535:538:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):796:799 -> a
-    539:539:com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper lambda$replaceFieldRead$2(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField):786:786 -> a
-    540:568:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):906:934 -> a
-    540:568:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):1008 -> a
-    569:569:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
-    569:569:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):934 -> a
-    569:569:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):1008 -> a
-    570:570:boolean com.android.tools.r8.ir.code.Instruction.isCheckCast():0:0 -> a
-    570:570:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):934 -> a
-    570:570:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):1008 -> a
-    571:573:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):952:954 -> a
-    571:573:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):1008 -> a
-    574:574:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):220:220 -> a
-    574:574:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):954 -> a
-    574:574:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):1008 -> a
-    575:577:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):957:959 -> a
-    575:577:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):1008 -> a
-    578:578:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):220:220 -> a
-    578:578:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):959 -> a
-    578:578:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):1008 -> a
-    579:579:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):963:963 -> a
-    579:579:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):1008 -> a
-    580:580:boolean com.android.tools.r8.ir.code.Instruction.isCheckCast():0:0 -> a
-    580:580:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):935 -> a
-    580:580:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):1008 -> a
-    581:593:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):936:948 -> a
-    581:593:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):1008 -> a
-    594:612:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleDirectVirtualMethodCall(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.function.Supplier):981:999 -> a
-    613:628:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleDirectVirtualMethodCall(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.function.Supplier):994:1009 -> a
-    629:665:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleDirectVirtualMethodCall(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.function.Supplier):1004:1040 -> a
-    666:672:boolean isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.ProgramMethod):1053:1059 -> a
-    673:673:boolean lambda$isEligibleIndirectVirtualMethodCall$4(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):1063:1063 -> a
-    674:699:boolean isEligibleVirtualMethodCall(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Predicate,com.android.tools.r8.ir.code.Invoke$Type):1073:1098 -> a
-    700:700:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    700:700:boolean isEligibleVirtualMethodCall(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Predicate,com.android.tools.r8.ir.code.Invoke$Type):1098 -> a
-    701:723:boolean isEligibleVirtualMethodCall(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Predicate,com.android.tools.r8.ir.code.Invoke$Type):1101:1123 -> a
-    724:729:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):1128:1133 -> a
-    730:730:boolean com.android.tools.r8.ir.code.Instruction.isInvokeSuper():0:0 -> a
-    730:730:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):1137 -> a
-    731:731:boolean com.android.tools.r8.ir.code.Instruction.isInvokePolymorphic():0:0 -> a
-    731:731:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):1140 -> a
-    732:744:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):1231:1243 -> a
-    745:753:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1256:1264 -> a
-    754:754:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    754:754:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1264 -> a
-    755:768:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1268:1281 -> a
-    769:769:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    769:769:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1281 -> a
-    770:784:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1284:1298 -> a
-    785:788:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isInstanceInitializerEligibleForClassInlining(com.android.tools.r8.graph.DexMethod):1341:1344 -> a
-    785:788:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1299 -> a
-    789:789:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
-    789:789:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isInstanceInitializerEligibleForClassInlining(com.android.tools.r8.graph.DexMethod):1344 -> a
-    789:789:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1299 -> a
-    790:797:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isInstanceInitializerEligibleForClassInlining(com.android.tools.r8.graph.DexMethod):1344:1351 -> a
-    790:797:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1299 -> a
-    798:800:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1044:1046 -> a
-    798:800:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1295 -> a
-    801:801:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1045:1045 -> a
-    801:801:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1295 -> a
-    802:802: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):476:476 -> a
-    802:802:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1045 -> a
-    802:802:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1295 -> a
-    803:803:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1048:1048 -> a
-    803:803:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1295 -> a
-    804:828:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1308:1332 -> a
-    829:829:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1326:1326 -> a
-    830:830:void markSizeForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):1360:1360 -> a
-    831:832:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.exemptFromInstructionLimit(com.android.tools.r8.graph.ProgramMethod):1355:1356 -> a
-    831:832:void markSizeForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):1361 -> a
-    833:835:void markSizeForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):1363:1365 -> a
-    836:845:boolean isEligibleSingleTarget(com.android.tools.r8.graph.ProgramMethod):1374:1383 -> a
-    846:846:boolean isEligibleSingleTarget(com.android.tools.r8.graph.ProgramMethod):1379:1379 -> a
-    847:847:void lambda$removeInstruction$6(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1397:1397 -> a
-    848:849:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1397:1398 -> a
-    1:1:com.android.tools.r8.graph.DexProgramClass getEligibleClass():142:142 -> b
-    2:12:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):547:557 -> b
+    248:248:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):455 -> a
+    248:248:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):412 -> a
+    249:254:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):456:461 -> a
+    249:254:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):412 -> a
+    255:260:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.forceInlineExtraMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):466:471 -> a
+    255:260:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):414 -> a
+    261:261:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.forceInlineExtraMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):470:470 -> a
+    261:261:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):414 -> a
+    262:266:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.clear():441:445 -> a
+    262:266:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):417 -> a
+    267:274:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):420:427 -> a
+    275:285:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):422:432 -> a
+    286:305:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set):646:665 -> a
+    286:305:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):433 -> a
+    306:306:boolean com.android.tools.r8.graph.DexClassAndMethod.isLibraryMethod():0:0 -> a
+    306:306:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set):666 -> a
+    306:306:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):433 -> a
+    307:337:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set):667:697 -> a
+    307:337:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):433 -> a
+    338:338:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
+    338:338:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set):702 -> a
+    338:338:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):433 -> a
+    339:339:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set):702:702 -> a
+    339:339:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):433 -> a
+    340:340:boolean com.android.tools.r8.ir.code.Instruction.isMonitor():0:0 -> a
+    340:340:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set):707 -> a
+    340:340:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):433 -> a
+    341:353:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.ir.code.IRCode,java.util.Set):710:722 -> a
+    341:353:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):433 -> a
+    354:354:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):434:434 -> a
+    355:376:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldWrites():783:804 -> a
+    355:376:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):435 -> a
+    377:379:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldWrites():798:800 -> a
+    377:379:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):435 -> a
+    380:382:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldWrites():785:787 -> a
+    380:382:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):435 -> a
+    383:383:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):436:436 -> a
+    384:390:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):477:483 -> a
+    391:396:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):481:486 -> a
+    397:424:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):485:512 -> a
+    425:425:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
+    425:425:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):512 -> a
+    426:439:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):512:525 -> a
+    440:448:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):521:529 -> a
+    449:449:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):526:526 -> a
+    450:450:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):514:514 -> a
+    451:478:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):508:535 -> a
+    479:482:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):534:537 -> a
+    483:486:void removeFieldReads(com.android.tools.r8.ir.code.IRCode):728:731 -> a
+    487:487:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
+    487:487:void removeFieldReads(com.android.tools.r8.ir.code.IRCode):731 -> a
+    488:512:void removeFieldReads(com.android.tools.r8.ir.code.IRCode):732:756 -> a
+    513:513:int lambda$removeFieldReads$1(com.android.tools.r8.ir.code.InstanceGet):729:729 -> a
+    514:518:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):762:766 -> a
+    519:530:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):765:776 -> a
+    531:531:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
+    531:531:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):776 -> a
+    532:532:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):777:777 -> a
+    533:533:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
+    533:533:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):777 -> a
+    534:537:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):776:779 -> a
+    538:538:com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper lambda$replaceFieldRead$2(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField):766:766 -> a
+    539:567:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):886:914 -> a
+    539:567:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):988 -> a
+    568:568:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
+    568:568:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):914 -> a
+    568:568:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):988 -> a
+    569:569:boolean com.android.tools.r8.ir.code.Instruction.isCheckCast():0:0 -> a
+    569:569:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):914 -> a
+    569:569:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):988 -> a
+    570:572:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):932:934 -> a
+    570:572:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):988 -> a
+    573:573:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):220:220 -> a
+    573:573:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):934 -> a
+    573:573:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):988 -> a
+    574:576:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):937:939 -> a
+    574:576:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):988 -> a
+    577:577:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):220:220 -> a
+    577:577:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):939 -> a
+    577:577:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):988 -> a
+    578:578:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):943:943 -> a
+    578:578:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):988 -> a
+    579:579:boolean com.android.tools.r8.ir.code.Instruction.isCheckCast():0:0 -> a
+    579:579:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):915 -> a
+    579:579:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):988 -> a
+    580:592:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):916:928 -> a
+    580:592:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):988 -> a
+    593:611:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleDirectVirtualMethodCall(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.function.Supplier):961:979 -> a
+    612:627:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleDirectVirtualMethodCall(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.function.Supplier):974:989 -> a
+    628:664:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleDirectVirtualMethodCall(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.function.Supplier):984:1020 -> a
+    665:671:boolean isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.ProgramMethod):1033:1039 -> a
+    672:672:boolean lambda$isEligibleIndirectVirtualMethodCall$4(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):1043:1043 -> a
+    673:698:boolean isEligibleVirtualMethodCall(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Predicate,com.android.tools.r8.ir.code.Invoke$Type):1053:1078 -> a
+    699:699:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    699:699:boolean isEligibleVirtualMethodCall(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Predicate,com.android.tools.r8.ir.code.Invoke$Type):1078 -> a
+    700:722:boolean isEligibleVirtualMethodCall(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Predicate,com.android.tools.r8.ir.code.Invoke$Type):1081:1103 -> a
+    723:728:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):1108:1113 -> a
+    729:729:boolean com.android.tools.r8.ir.code.Instruction.isInvokeSuper():0:0 -> a
+    729:729:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):1117 -> a
+    730:730:boolean com.android.tools.r8.ir.code.Instruction.isInvokePolymorphic():0:0 -> a
+    730:730:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):1120 -> a
+    731:743:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):1211:1223 -> a
+    744:752:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1236:1244 -> a
+    753:753:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    753:753:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1244 -> a
+    754:767:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1248:1261 -> a
+    768:768:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    768:768:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1261 -> a
+    769:783:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1264:1278 -> a
+    784:787:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isInstanceInitializerEligibleForClassInlining(com.android.tools.r8.graph.DexMethod):1321:1324 -> a
+    784:787:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1279 -> a
+    788:788:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
+    788:788:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isInstanceInitializerEligibleForClassInlining(com.android.tools.r8.graph.DexMethod):1324 -> a
+    788:788:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1279 -> a
+    789:796:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isInstanceInitializerEligibleForClassInlining(com.android.tools.r8.graph.DexMethod):1324:1331 -> a
+    789:796:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1279 -> a
+    797:799:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1024:1026 -> a
+    797:799:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1275 -> a
+    800:800:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1025:1025 -> a
+    800:800:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1275 -> a
+    801:801: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):485:485 -> a
+    801:801:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1025 -> a
+    801:801:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1275 -> a
+    802:802:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1028:1028 -> a
+    802:802:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1275 -> a
+    803:827:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1288:1312 -> a
+    828:828:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1306:1306 -> a
+    829:829:void markSizeForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):1340:1340 -> a
+    830:831:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.exemptFromInstructionLimit(com.android.tools.r8.graph.ProgramMethod):1335:1336 -> a
+    830:831:void markSizeForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):1341 -> a
+    832:834:void markSizeForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):1343:1345 -> a
+    835:844:boolean isEligibleSingleTarget(com.android.tools.r8.graph.ProgramMethod):1354:1363 -> a
+    845:845:boolean isEligibleSingleTarget(com.android.tools.r8.graph.ProgramMethod):1359:1359 -> a
+    846:846:void lambda$removeInstruction$6(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1377:1377 -> a
+    847:848:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1377:1378 -> a
+    1:1:com.android.tools.r8.graph.DexProgramClass getEligibleClass():141:141 -> b
+    2:12:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):545:555 -> b
     13:13:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> b
-    13:13:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):557 -> b
+    13:13:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):555 -> b
     14:14:boolean com.android.tools.r8.ir.code.Instruction.isCheckCast():0:0 -> b
-    14:14:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):557 -> b
-    15:22:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):562:569 -> b
+    14:14:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):555 -> b
+    15:22:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):560:567 -> b
     23:23:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):220:220 -> b
-    23:23:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):569 -> b
-    24:30:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):570:576 -> b
+    23:23:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):567 -> b
+    24:30:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):568:574 -> b
     31:31:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.code.InvokeMethodWithReceiver.lookupSingleProgramTarget(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):97:97 -> b
-    31:31:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):577 -> b
+    31:31:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):575 -> b
     32:32:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.code.InvokeMethodWithReceiver.lookupSingleProgramTarget(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):96:96 -> b
-    32:32:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):577 -> b
-    33:33:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.DexClassAndMethod.asProgramMethodOrNull(com.android.tools.r8.graph.DexClassAndMethod):18:18 -> b
+    32:32:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):575 -> b
+    33:33:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.DexClassAndMethod.asProgramMethodOrNull(com.android.tools.r8.graph.DexClassAndMethod):16:16 -> b
     33:33:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.code.InvokeMethodWithReceiver.lookupSingleProgramTarget(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):96 -> b
-    33:33:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):577 -> b
-    34:38:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):579:583 -> b
-    39:39:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):580:580 -> b
-    40:73:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):558:591 -> b
-    74:78:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):590:594 -> b
-    79:79:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):593:593 -> b
-    80:80:boolean lambda$forceInlineIndirectMethodInvocations$0(com.android.tools.r8.graph.ProgramMethod):594:594 -> b
-    81:81:boolean lambda$isEligibleParameterUsages$5(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1244:1244 -> b
-    1:1:java.util.List getIndirectInlinees():150:150 -> c
-    1:1:com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet getReceivers():154:154 -> d
-    1:1:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassAndUsageEligible():220:220 -> e
-    1:20:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():160:179 -> f
-    21:21:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> f
-    21:21:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():179 -> f
-    22:33:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():179:190 -> f
-    34:34:boolean com.android.tools.r8.ir.code.StaticGet.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):141:141 -> f
-    34:34:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():190 -> f
-    35:35:boolean com.android.tools.r8.ir.code.StaticGet.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):147:147 -> f
-    35:35:boolean com.android.tools.r8.ir.code.StaticGet.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):141 -> f
-    35:35:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():190 -> f
-    36:50:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():191:205 -> f
-    51:51:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():198:198 -> f
-    1:1:void rebindIndirectEligibleInstanceUsersFromPhis():610:610 -> g
-    2:3:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object):16:17 -> g
-    2:3:void rebindIndirectEligibleInstanceUsersFromPhis():610 -> g
-    4:27:void rebindIndirectEligibleInstanceUsersFromPhis():611:634 -> g
-    28:28:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):220:220 -> g
-    28:28:void rebindIndirectEligibleInstanceUsersFromPhis():634 -> g
-    29:47:void rebindIndirectEligibleInstanceUsersFromPhis():636:654 -> g
-    48:48:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> g
-    48:48:void rebindIndirectEligibleInstanceUsersFromPhis():654 -> g
-    49:49:void rebindIndirectEligibleInstanceUsersFromPhis():654:654 -> g
-    50:50:boolean com.android.tools.r8.ir.code.Instruction.isCheckCast():0:0 -> g
-    50:50:void rebindIndirectEligibleInstanceUsersFromPhis():654 -> g
-    51:57:void rebindIndirectEligibleInstanceUsersFromPhis():654:660 -> g
-com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor$AliasKind -> com.android.tools.r8.internal.Cf:
+    33:33:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):575 -> b
+    34:38:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):577:581 -> b
+    39:39:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):578:578 -> b
+    40:73:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):556:589 -> b
+    74:78:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):588:592 -> b
+    79:79:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):591:591 -> b
+    80:80:boolean lambda$forceInlineIndirectMethodInvocations$0(com.android.tools.r8.graph.ProgramMethod):592:592 -> b
+    81:81:boolean lambda$isEligibleParameterUsages$5(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1224:1224 -> b
+    1:1:java.util.List getIndirectInlinees():149:149 -> c
+    1:1:com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet getReceivers():153:153 -> d
+    1:1:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassAndUsageEligible():219:219 -> e
+    1:7:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():159:165 -> f
+    8:8:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> f
+    8:8:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():165 -> f
+    9:22:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():165:178 -> f
+    23:23:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> f
+    23:23:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():178 -> f
+    24:35:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():178:189 -> f
+    36:36:boolean com.android.tools.r8.ir.code.StaticGet.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):141:141 -> f
+    36:36:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():189 -> f
+    37:37:boolean com.android.tools.r8.ir.code.StaticGet.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):147:147 -> f
+    37:37:boolean com.android.tools.r8.ir.code.StaticGet.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):141 -> f
+    37:37:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():189 -> f
+    38:48:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():190:200 -> f
+    49:49:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> f
+    49:49:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():200 -> f
+    50:54:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():200:204 -> f
+    55:55:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():197:197 -> f
+    1:16:void removeAliasIntroducingInstructionsLinkedToEligibleInstance():598:613 -> g
+    17:17:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):220:220 -> g
+    17:17:void removeAliasIntroducingInstructionsLinkedToEligibleInstance():613 -> g
+    18:44:void removeAliasIntroducingInstructionsLinkedToEligibleInstance():614:640 -> g
+com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor$AliasKind -> com.android.tools.r8.internal.Oe:
     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>():88:89 -> <clinit>
-    1:1:void <init>(java.lang.String,int):87:87 -> <init>
-com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor$IllegalClassInlinerStateException -> com.android.tools.r8.internal.Df:
-    1:1:void <init>():1401:1401 -> <init>
-com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer -> com.android.tools.r8.internal.jE:
+    1:2:void <clinit>():87:88 -> <clinit>
+    1:1:void <init>(java.lang.String,int):86:86 -> <init>
+com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor$IllegalClassInlinerStateException -> com.android.tools.r8.internal.Pe:
+    1:1:void <init>():1381:1381 -> <init>
+com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer -> com.android.tools.r8.internal.VC:
     com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer INSTANCE -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():13:15 -> <clinit>
@@ -44775,7 +45072,7 @@
     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.EnumDataMap -> com.android.tools.r8.internal.ab:
+com.android.tools.r8.ir.optimize.enums.EnumDataMap -> com.android.tools.r8.internal.va:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
@@ -44799,7 +45096,7 @@
     2:3:boolean matchesValuesField(com.android.tools.r8.graph.DexField):59:60 -> c
     4:4:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.matchesValuesField(com.android.tools.r8.graph.DexField):101:101 -> c
     4:4:boolean matchesValuesField(com.android.tools.r8.graph.DexField):60 -> c
-com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData -> com.android.tools.r8.internal.ab$a:
+com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData -> com.android.tools.r8.internal.va$a:
     com.android.tools.r8.com.google.common.collect.ImmutableMap unboxedValues -> c
     com.android.tools.r8.com.google.common.collect.ImmutableMap instanceFieldMap -> b
     int valuesSize -> e
@@ -44807,35 +45104,35 @@
     com.android.tools.r8.com.google.common.collect.ImmutableSet valuesFields -> d
     1:1:void <clinit>():63:63 -> <clinit>
     1:5:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableSet,int):79:83 -> <init>
-com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData -> com.android.tools.r8.internal.bb:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData -> com.android.tools.r8.internal.wa:
     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.bb$a:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldKnownData -> com.android.tools.r8.internal.wa$a:
     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.cb:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData -> com.android.tools.r8.internal.xa:
     com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap mapping -> a
     1:2:void <init>(com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap):88:89 -> <init>
     1:1:void forEach(java.util.function.BiConsumer):112:112 -> 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.db:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldOrdinalData -> com.android.tools.r8.internal.ya:
     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.eb:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldUnknownData -> com.android.tools.r8.internal.za:
     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.EnumUnboxer -> com.android.tools.r8.internal.kb:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxer -> com.android.tools.r8.internal.Fa:
     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
@@ -44846,286 +45143,303 @@
     boolean $assertionsDisabled -> a
     java.util.Map staticFieldValuesMap -> f
     com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter enumUnboxerRewriter -> h
-    1:1:void <clinit>():87:87 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):106:106 -> <init>
-    2:31:void <init>(com.android.tools.r8.graph.AppView):95:124 -> <init>
+    1:1:void <clinit>():86:86 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):105:105 -> <init>
+    2:31:void <init>(com.android.tools.r8.graph.AppView):94:123 -> <init>
     1:1:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues.isEnumStaticFieldValues():0:0 -> a
-    1:1:void recordEnumState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues):663 -> a
-    2:4:void recordEnumState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues):666:668 -> a
-    5:5:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.enums.EnumUnboxer.getEnumUnboxingCandidateOrNull(com.android.tools.r8.graph.DexType):153:153 -> a
-    5:5:void recordEnumState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues):668 -> a
-    6:6:void recordEnumState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues):669:669 -> a
-    7:7:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.enums.EnumUnboxer):87:87 -> a
-    8:10:void markEnumAsUnboxable(com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason,com.android.tools.r8.graph.DexProgramClass):133:135 -> a
-    11:12:com.android.tools.r8.graph.DexProgramClass getEnumUnboxingCandidateOrNull(com.android.tools.r8.ir.analysis.type.TypeElement):139:140 -> a
-    13:13:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.enums.EnumUnboxer.getEnumUnboxingCandidateOrNull(com.android.tools.r8.graph.DexType):153:153 -> a
-    13:13:com.android.tools.r8.graph.DexProgramClass getEnumUnboxingCandidateOrNull(com.android.tools.r8.ir.analysis.type.TypeElement):141 -> a
-    14:17:com.android.tools.r8.graph.DexProgramClass getEnumUnboxingCandidateOrNull(com.android.tools.r8.ir.analysis.type.TypeElement):143:146 -> a
-    18:37:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):157:176 -> a
-    38:38:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.enums.EnumUnboxer.getEnumUnboxingCandidateOrNull(com.android.tools.r8.graph.DexType):153:153 -> a
-    38:38:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):176 -> a
-    39:51:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):178:190 -> a
-    52:53:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,java.util.Set,com.android.tools.r8.graph.ProgramMethod):235:236 -> a
-    52:53:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):190 -> a
-    54:54:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.enums.EnumUnboxer.getEnumUnboxingCandidateOrNull(com.android.tools.r8.graph.DexType):153:153 -> a
-    54:54:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,java.util.Set,com.android.tools.r8.graph.ProgramMethod):236 -> a
-    54:54:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):190 -> a
-    55:59:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,java.util.Set,com.android.tools.r8.graph.ProgramMethod):238:242 -> a
-    55:59:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):190 -> a
-    60:60:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):196:196 -> a
-    61:62:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode):222:223 -> a
-    61:62:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):196 -> a
-    63:63:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.enums.EnumUnboxer.getEnumUnboxingCandidateOrNull(com.android.tools.r8.graph.DexType):153:153 -> a
-    63:63:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode):223 -> a
-    63:63:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):196 -> a
-    64:65:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode):225:226 -> a
-    64:65:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):196 -> a
-    66:66: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):232:232 -> a
-    66:66:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode):226 -> a
-    66:66:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):196 -> a
-    67:67:com.android.tools.r8.graph.FieldResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):863:863 -> a
-    67:67: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):232 -> a
-    67:67:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode):226 -> a
-    67:67:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):196 -> a
-    68:69:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode):227:228 -> a
-    68:69:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):196 -> a
-    70:70:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):184:184 -> a
-    71:86: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):278:293 -> a
-    71:86:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):184 -> a
-    87:87:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.isUnboxableNameMethod(com.android.tools.r8.graph.DexMethod):317:317 -> a
-    87:87: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):293 -> a
-    87:87:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):184 -> a
-    88:100: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):296:308 -> a
-    88:100:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):184 -> a
-    101:101:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):187:187 -> a
-    102:102:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):253:253 -> a
-    102:102:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):187 -> a
-    103:103:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.enums.EnumUnboxer.getEnumUnboxingCandidateOrNull(com.android.tools.r8.graph.DexType):153:153 -> a
-    103:103:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):253 -> a
-    103:103:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):187 -> a
-    104:106:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.allowCheckCast(com.android.tools.r8.ir.code.CheckCast):265:267 -> a
-    104:106:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):257 -> a
-    104:106:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):187 -> a
-    107:107:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.allowCheckCast(com.android.tools.r8.ir.code.CheckCast):266:266 -> a
-    107:107:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):257 -> a
-    107:107:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):187 -> a
-    108:111:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):258:261 -> a
-    108:111:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):187 -> a
-    112:127:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):201:216 -> a
-    128:128:void addRequiredNameData(com.android.tools.r8.graph.DexType):312:312 -> a
-    129:139:void addNullDependencies(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):323:333 -> a
-    140:140:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.enums.EnumUnboxer.getEnumUnboxingCandidateOrNull(com.android.tools.r8.graph.DexType):153:153 -> a
-    140:140:void addNullDependencies(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):333 -> a
-    141:152:void addNullDependencies(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):335:346 -> a
-    153:153: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):353:353 -> a
-    154:181: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):903:930 -> a
-    154:181: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):354 -> a
-    182:182:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethod.getParameters():58:58 -> a
-    182:182: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):930 -> a
-    182:182: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):354 -> a
-    183:196: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):930:943 -> a
-    183:196: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):354 -> a
-    197:197:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
-    197:197: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):945 -> a
-    197:197: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):354 -> a
-    198:200: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):946:948 -> a
-    198:200: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):354 -> a
-    201:201:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    201:201: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):948 -> a
-    201:201: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):354 -> a
-    202:224: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):948:970 -> a
-    202:224: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):354 -> a
-    225:250: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):968:993 -> a
-    225:250: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):354 -> a
-    251:278: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):979:1006 -> a
-    251:278: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):354 -> a
-    279:279: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):52:52 -> a
-    279:279: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):1006 -> a
-    279:279: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):354 -> a
-    280:290: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):1008:1018 -> a
-    280:290: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):354 -> a
-    291:291:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
-    291:291: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):1021 -> a
-    291:291: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):354 -> a
-    292:317: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):1022:1047 -> a
-    292:317: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):354 -> a
-    318:318:boolean com.android.tools.r8.ir.code.Instruction.isCheckCast():0:0 -> a
-    318:318: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):1050 -> a
-    318:318: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):354 -> a
-    319:319: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):1051:1051 -> a
-    319:319: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):354 -> a
-    320:322:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.allowCheckCast(com.android.tools.r8.ir.code.CheckCast):265:267 -> a
-    320:322: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):1051 -> a
-    320:322: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):354 -> a
-    323:323:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.allowCheckCast(com.android.tools.r8.ir.code.CheckCast):266:266 -> a
-    323:323: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):1051 -> a
-    323:323: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):354 -> a
-    324:326: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):1052:1054 -> a
-    324:326: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):354 -> a
-    327:327:boolean com.android.tools.r8.ir.code.Instruction.isArrayLength():0:0 -> a
-    327:327: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):1057 -> a
-    327:327: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):354 -> a
-    328:357: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):1059:1088 -> a
-    328:357: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):354 -> a
-    358:358:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
-    358:358: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):1091 -> a
-    358:358: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):354 -> a
-    359:372: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):1092:1105 -> a
-    359:372: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):354 -> a
-    373:387: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):355:369 -> a
-    388:389:void updateKeepInfo(java.util.Set):454:455 -> a
-    390:390:com.android.tools.r8.shaking.KeepInfoCollection com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection.mutate(java.util.function.Consumer):435:435 -> a
-    390:390:void updateKeepInfo(java.util.Set):455 -> a
-    391:391:void lambda$updateKeepInfo$0(java.util.Set,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):455:455 -> a
-    392:396:com.android.tools.r8.ir.optimize.enums.EnumDataMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.finishAnalysis():459:463 -> a
-    392:396:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):377 -> a
-    397:405:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.reportEnumsAnalysis():1109:1117 -> a
-    397:405:com.android.tools.r8.ir.optimize.enums.EnumDataMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.finishAnalysis():464 -> a
-    397:405:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):377 -> a
-    406:421:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.reportEnumsAnalysis():1112:1127 -> a
-    406:421:com.android.tools.r8.ir.optimize.enums.EnumDataMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.finishAnalysis():464 -> a
-    406:421:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):377 -> a
-    422:432:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):381:391 -> a
-    433:433:com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier.builder():65:65 -> a
-    433:433:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):393 -> a
-    434:434:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):394:394 -> a
-    435:435:com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator$Builder com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator.builder(com.android.tools.r8.graph.AppView):64:64 -> a
-    435:435:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):395 -> a
-    436:451:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):395:410 -> a
-    452:452:void com.android.tools.r8.graph.AppView.rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication):637:637 -> a
-    452:452:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):410 -> a
-    453:453:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.updateOptimizationInfos(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):419:419 -> a
-    453:453:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):411 -> a
-    454:455:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):412:413 -> a
-    456:501:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):487:532 -> a
-    456:501:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):473 -> a
-    502:502:boolean com.android.tools.r8.ir.analysis.value.ObjectState.isEnumValuesObjectState():0:0 -> a
-    502:502:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):532 -> a
-    502:502:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):473 -> a
-    503:505:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):532:534 -> a
-    503:505:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):473 -> a
-    506:535:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):533:562 -> a
-    506:535:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):473 -> a
-    536:539: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,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):589:592 -> a
-    536:539:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):564 -> a
-    536:539:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):473 -> a
-    540:540:com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$Builder com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap.builder():38:38 -> a
-    540:540: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,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):594 -> a
-    540:540:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):564 -> a
-    540:540:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):473 -> a
-    541:544: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,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):595:598 -> a
-    541:544:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):564 -> a
-    541:544:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):473 -> a
-    545:545:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
-    545:545: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,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):598 -> a
-    545:545:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):564 -> a
-    545:545:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):473 -> a
-    546:561: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,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):598:613 -> a
-    546:561:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):564 -> a
-    546:561:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):473 -> a
-    562:572:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):565:575 -> a
-    562:572:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):473 -> a
-    573:576:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):475:478 -> a
-    577:578:java.util.OptionalInt getOrdinal(com.android.tools.r8.ir.analysis.value.ObjectState):617:618 -> a
-    579:579:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
-    579:579:java.util.OptionalInt getOrdinal(com.android.tools.r8.ir.analysis.value.ObjectState):618 -> a
-    580:582:java.util.OptionalInt getOrdinal(com.android.tools.r8.ir.analysis.value.ObjectState):619:621 -> a
-    583:583:void analyzeAccessibility():627:627 -> a
-    584:590:com.android.tools.r8.ir.optimize.Inliner$Constraint com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeAccessibilityInClass(com.android.tools.r8.graph.DexProgramClass):639:645 -> a
-    584:590:void lambda$analyzeAccessibility$2(com.android.tools.r8.graph.DexProgramClass):629 -> a
-    591:591: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):659:659 -> a
-    591:591:com.android.tools.r8.ir.optimize.Inliner$Constraint com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeAccessibilityInClass(com.android.tools.r8.graph.DexProgramClass):647 -> a
-    591:591:void lambda$analyzeAccessibility$2(com.android.tools.r8.graph.DexProgramClass):629 -> a
-    592:593:com.android.tools.r8.ir.optimize.Inliner$Constraint com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeAccessibilityInClass(com.android.tools.r8.graph.DexProgramClass):648:649 -> a
-    592:593:void lambda$analyzeAccessibility$2(com.android.tools.r8.graph.DexProgramClass):629 -> a
-    594:597:void lambda$analyzeAccessibility$2(com.android.tools.r8.graph.DexProgramClass):630:633 -> a
-    598:599:void reportFailure(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason):1131:1132 -> a
-    600:601:void synthesizeUtilityMethods(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):1147:1148 -> a
-    1:1:com.android.tools.r8.graph.DexItemFactory access$100(com.android.tools.r8.ir.optimize.enums.EnumUnboxer):87:87 -> b
-    2:13:com.android.tools.r8.ir.optimize.enums.EnumDataMap analyzeEnumInstances():470:481 -> b
-    14:36:void lambda$analyzeInitializers$3(com.android.tools.r8.graph.DexProgramClass):872:894 -> b
-    37:40:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):1139:1142 -> b
-    1:1:void analyzeInitializers():869:869 -> c
-com.android.tools.r8.ir.optimize.enums.EnumUnboxer$1 -> com.android.tools.r8.internal.hb:
+    1:1:void recordEnumState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues):645 -> a
+    2:4:void recordEnumState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues):648:650 -> a
+    5:5:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.enums.EnumUnboxer.getEnumUnboxingCandidateOrNull(com.android.tools.r8.graph.DexType):152:152 -> a
+    5:5:void recordEnumState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues):650 -> a
+    6:6:void recordEnumState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues):651:651 -> a
+    7:7:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.enums.EnumUnboxer):86:86 -> a
+    8:10:void markEnumAsUnboxable(com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason,com.android.tools.r8.graph.DexProgramClass):132:134 -> a
+    11:12:com.android.tools.r8.graph.DexProgramClass getEnumUnboxingCandidateOrNull(com.android.tools.r8.ir.analysis.type.TypeElement):138:139 -> a
+    13:13:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.enums.EnumUnboxer.getEnumUnboxingCandidateOrNull(com.android.tools.r8.graph.DexType):152:152 -> a
+    13:13:com.android.tools.r8.graph.DexProgramClass getEnumUnboxingCandidateOrNull(com.android.tools.r8.ir.analysis.type.TypeElement):140 -> a
+    14:17:com.android.tools.r8.graph.DexProgramClass getEnumUnboxingCandidateOrNull(com.android.tools.r8.ir.analysis.type.TypeElement):142:145 -> a
+    18:37:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):156:175 -> a
+    38:38:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.enums.EnumUnboxer.getEnumUnboxingCandidateOrNull(com.android.tools.r8.graph.DexType):152:152 -> a
+    38:38:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):175 -> a
+    39:51:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):177:189 -> a
+    52:53:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,java.util.Set,com.android.tools.r8.graph.ProgramMethod):234:235 -> a
+    52:53:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):189 -> a
+    54:54:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.enums.EnumUnboxer.getEnumUnboxingCandidateOrNull(com.android.tools.r8.graph.DexType):152:152 -> a
+    54:54:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,java.util.Set,com.android.tools.r8.graph.ProgramMethod):235 -> a
+    54:54:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):189 -> a
+    55:59:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,java.util.Set,com.android.tools.r8.graph.ProgramMethod):237:241 -> a
+    55:59:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):189 -> a
+    60:60:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):195:195 -> a
+    61:62:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode):221:222 -> a
+    61:62:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):195 -> a
+    63:63:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.enums.EnumUnboxer.getEnumUnboxingCandidateOrNull(com.android.tools.r8.graph.DexType):152:152 -> a
+    63:63:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode):222 -> a
+    63:63:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):195 -> a
+    64:65:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode):224:225 -> a
+    64:65:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):195 -> a
+    66:66: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):237:237 -> a
+    66:66:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode):225 -> a
+    66:66:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):195 -> a
+    67:67:com.android.tools.r8.graph.FieldResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):813:813 -> a
+    67:67: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):237 -> a
+    67:67:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode):225 -> a
+    67:67:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):195 -> a
+    68:69:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode):226:227 -> a
+    68:69:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):195 -> a
+    70:70:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):183:183 -> a
+    71:79: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):277:285 -> a
+    71:79:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):183 -> a
+    80:80:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    80:80: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):285 -> a
+    80:80:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):183 -> a
+    81:88: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):285:292 -> a
+    81:88:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):183 -> a
+    89:89:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.isUnboxableNameMethod(com.android.tools.r8.graph.DexMethod):316:316 -> a
+    89:89: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):292 -> a
+    89:89:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):183 -> a
+    90:102: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):295:307 -> a
+    90:102:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):183 -> a
+    103:103:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):186:186 -> a
+    104:104:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):252:252 -> a
+    104:104:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):186 -> a
+    105:105:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.enums.EnumUnboxer.getEnumUnboxingCandidateOrNull(com.android.tools.r8.graph.DexType):152:152 -> a
+    105:105:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):252 -> a
+    105:105:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):186 -> a
+    106:108:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.allowCheckCast(com.android.tools.r8.ir.code.CheckCast):264:266 -> a
+    106:108:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):256 -> a
+    106:108:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):186 -> a
+    109:109:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.allowCheckCast(com.android.tools.r8.ir.code.CheckCast):265:265 -> a
+    109:109:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):256 -> a
+    109:109:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):186 -> a
+    110:113:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):257:260 -> a
+    110:113:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):186 -> a
+    114:129:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):200:215 -> a
+    130:130:void addRequiredNameData(com.android.tools.r8.graph.DexType):311:311 -> a
+    131:141:void addNullDependencies(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):322:332 -> a
+    142:142:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.enums.EnumUnboxer.getEnumUnboxingCandidateOrNull(com.android.tools.r8.graph.DexType):152:152 -> a
+    142:142:void addNullDependencies(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):332 -> a
+    143:154:void addNullDependencies(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):334:345 -> a
+    155:155: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):352:352 -> a
+    156:183: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):885:912 -> a
+    156:183: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):353 -> a
+    184:184:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethod.getParameters():58:58 -> a
+    184:184: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 -> a
+    184:184: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):353 -> a
+    185:198: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
+    185:198: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):353 -> a
+    199:199:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
+    199:199: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):927 -> a
+    199:199: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):353 -> a
+    200:202: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):928:930 -> a
+    200:202: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):353 -> a
+    203:203:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    203:203: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):930 -> a
+    203:203: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):353 -> a
+    204:226: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):930:952 -> a
+    204:226: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):353 -> a
+    227:252: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):950:975 -> a
+    227:252: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):353 -> a
+    253:280: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):961:988 -> a
+    253:280: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):353 -> a
+    281:281: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):52:52 -> a
+    281:281: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):988 -> a
+    281:281: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):353 -> a
+    282:292: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):990:1000 -> a
+    282:292: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):353 -> a
+    293:293:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
+    293:293: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):1003 -> a
+    293:293: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):353 -> a
+    294:319: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):1004:1029 -> a
+    294:319: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):353 -> a
+    320:320:boolean com.android.tools.r8.ir.code.Instruction.isCheckCast():0:0 -> a
+    320:320: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):1032 -> a
+    320:320: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):353 -> a
+    321:321: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):1033:1033 -> a
+    321:321: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):353 -> a
+    322:324:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.allowCheckCast(com.android.tools.r8.ir.code.CheckCast):264:266 -> a
+    322:324: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):1033 -> a
+    322:324: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):353 -> a
+    325:325:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.allowCheckCast(com.android.tools.r8.ir.code.CheckCast):265:265 -> a
+    325:325: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):1033 -> a
+    325:325: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):353 -> a
+    326:328: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):1034:1036 -> a
+    326:328: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):353 -> a
+    329:329:boolean com.android.tools.r8.ir.code.Instruction.isArrayLength():0:0 -> a
+    329:329: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):1039 -> a
+    329:329: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):353 -> a
+    330:359: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):1041:1070 -> a
+    330:359: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):353 -> a
+    360:360:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
+    360:360: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):1073 -> a
+    360:360: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):353 -> a
+    361:374: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):1074:1087 -> a
+    361: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):353 -> a
+    375:389: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):354:368 -> a
+    390:391:void updateKeepInfo(java.util.Set):447:448 -> a
+    392:392:com.android.tools.r8.shaking.KeepInfoCollection com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection.mutate(java.util.function.Consumer):435:435 -> a
+    392:392:void updateKeepInfo(java.util.Set):448 -> a
+    393:393:void lambda$updateKeepInfo$0(java.util.Set,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):448:448 -> a
+    394:398:com.android.tools.r8.ir.optimize.enums.EnumDataMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.finishAnalysis():452:456 -> a
+    394:398:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):376 -> a
+    399:407:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.reportEnumsAnalysis():1091:1099 -> a
+    399:407:com.android.tools.r8.ir.optimize.enums.EnumDataMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.finishAnalysis():457 -> a
+    399:407:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):376 -> a
+    408:423:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.reportEnumsAnalysis():1094:1109 -> a
+    408:423:com.android.tools.r8.ir.optimize.enums.EnumDataMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.finishAnalysis():457 -> a
+    408:423:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):376 -> a
+    424:435:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):380:391 -> a
+    436:436: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
+    436:436:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):392 -> a
+    437:448:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):392:403 -> a
+    449:449:void com.android.tools.r8.graph.AppView.rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication):617:617 -> a
+    449:449:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):403 -> a
+    450:450:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.updateOptimizationInfos(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):412:412 -> a
+    450:450:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):404 -> a
+    451:452:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):405:406 -> a
+    453:482:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):480:509 -> a
+    453:482:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):466 -> a
+    483:483:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isZero():36:36 -> a
+    483:483:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):510 -> a
+    483:483:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):466 -> a
+    484:489:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):514:519 -> a
+    484:489:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):466 -> a
+    490:490:boolean com.android.tools.r8.ir.analysis.value.ObjectState.isEnumValuesObjectState():0:0 -> a
+    490:490:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):519 -> a
+    490:490:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):466 -> a
+    491:491:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):523:523 -> a
+    491:491:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):466 -> a
+    492:521:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):522:551 -> a
+    492:521:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):466 -> a
+    522:525: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,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):571:574 -> a
+    522:525:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):553 -> a
+    522:525:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):466 -> a
+    526:526:com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$Builder com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap.builder():38:38 -> a
+    526:526: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,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):576 -> a
+    526:526:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):553 -> a
+    526:526:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):466 -> a
+    527:530: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,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):577:580 -> a
+    527:530:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):553 -> a
+    527:530:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):466 -> a
+    531:531:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
+    531:531: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,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):580 -> a
+    531:531:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):553 -> a
+    531:531:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):466 -> a
+    532:547: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,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):580:595 -> a
+    532:547:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):553 -> a
+    532:547:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):466 -> a
+    548:558:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):554:564 -> a
+    548:558:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):466 -> a
+    559:562:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):468:471 -> a
+    563:564:java.util.OptionalInt getOrdinal(com.android.tools.r8.ir.analysis.value.ObjectState):599:600 -> a
+    565:565:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
+    565:565:java.util.OptionalInt getOrdinal(com.android.tools.r8.ir.analysis.value.ObjectState):600 -> a
+    566:568:java.util.OptionalInt getOrdinal(com.android.tools.r8.ir.analysis.value.ObjectState):601:603 -> a
+    569:569:void analyzeAccessibility():609:609 -> a
+    570:576:com.android.tools.r8.ir.optimize.Inliner$Constraint com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeAccessibilityInClass(com.android.tools.r8.graph.DexProgramClass):621:627 -> a
+    570:576:void lambda$analyzeAccessibility$2(com.android.tools.r8.graph.DexProgramClass):611 -> a
+    577:577: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):641:641 -> a
+    577:577:com.android.tools.r8.ir.optimize.Inliner$Constraint com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeAccessibilityInClass(com.android.tools.r8.graph.DexProgramClass):629 -> a
+    577:577:void lambda$analyzeAccessibility$2(com.android.tools.r8.graph.DexProgramClass):611 -> a
+    578:579:com.android.tools.r8.ir.optimize.Inliner$Constraint com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeAccessibilityInClass(com.android.tools.r8.graph.DexProgramClass):630:631 -> a
+    578:579:void lambda$analyzeAccessibility$2(com.android.tools.r8.graph.DexProgramClass):611 -> a
+    580:583:void lambda$analyzeAccessibility$2(com.android.tools.r8.graph.DexProgramClass):612:615 -> a
+    584:585:void reportFailure(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason):1113:1114 -> a
+    586:587:void synthesizeUtilityMethods(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):1129:1130 -> a
+    1:1:com.android.tools.r8.graph.DexItemFactory access$100(com.android.tools.r8.ir.optimize.enums.EnumUnboxer):86:86 -> b
+    2:13:com.android.tools.r8.ir.optimize.enums.EnumDataMap analyzeEnumInstances():463:474 -> b
+    14:36:void lambda$analyzeInitializers$3(com.android.tools.r8.graph.DexProgramClass):854:876 -> b
+    37:40:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):1121:1124 -> b
+    1:1:void analyzeInitializers():851:851 -> c
+com.android.tools.r8.ir.optimize.enums.EnumUnboxer$1 -> com.android.tools.r8.internal.Ca:
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer this$0 -> b
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():422:422 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.optimize.enums.EnumUnboxer):422:422 -> <init>
-    1:2:void fixup(com.android.tools.r8.graph.DexEncodedField):425:426 -> a
+    1:1:void <clinit>():415:415 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.optimize.enums.EnumUnboxer):415:415 -> <init>
+    1:2:void fixup(com.android.tools.r8.graph.DexEncodedField):418:419 -> a
     3:3:boolean com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo.isMutableFieldOptimizationInfo():0:0 -> a
-    3:3:void fixup(com.android.tools.r8.graph.DexEncodedField):426 -> a
-    4:8:void fixup(com.android.tools.r8.graph.DexEncodedField):428:432 -> a
+    3:3:void fixup(com.android.tools.r8.graph.DexEncodedField):419 -> a
+    4:8:void fixup(com.android.tools.r8.graph.DexEncodedField):421:425 -> a
     9:9:boolean com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo.isDefaultFieldOptimizationInfo():0:0 -> a
-    9:9:void fixup(com.android.tools.r8.graph.DexEncodedField):432 -> a
-    10:10:void fixup(com.android.tools.r8.graph.DexEncodedField):432:432 -> a
-    11:20:void fixup(com.android.tools.r8.graph.DexEncodedMethod):438:447 -> a
-com.android.tools.r8.ir.optimize.enums.EnumUnboxer$EnumAccessibilityUseRegistry -> com.android.tools.r8.internal.ib:
+    9:9:void fixup(com.android.tools.r8.graph.DexEncodedField):425 -> a
+    10:10:void fixup(com.android.tools.r8.graph.DexEncodedField):425:425 -> a
+    11:20:void fixup(com.android.tools.r8.graph.DexEncodedMethod):431:440 -> a
+com.android.tools.r8.ir.optimize.enums.EnumUnboxer$EnumAccessibilityUseRegistry -> com.android.tools.r8.internal.Da:
     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>():673:673 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.optimize.enums.EnumUnboxer,com.android.tools.r8.graph.DexItemFactory):678:679 -> <init>
-    1:4:com.android.tools.r8.ir.optimize.Inliner$Constraint computeConstraint(com.android.tools.r8.graph.ProgramMethod):683:686 -> a
-    5:30:com.android.tools.r8.ir.optimize.Inliner$Constraint deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):690:715 -> a
-    31:44:void registerTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMember):780:793 -> a
-    45:45:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):798:798 -> a
-    46:56:void registerSingleTargetInvoke(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate):808:818 -> a
-    57:57:void registerSingleTargetInvoke(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate):815:815 -> a
-    58:59:void registerCallSite(com.android.tools.r8.graph.DexCallSite):836:837 -> a
-    60:60:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):849:849 -> a
-    1:1:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):759:759 -> b
-    2:7:void registerVirtualInvoke(com.android.tools.r8.graph.DexMethod,boolean):763:768 -> b
-    8:9:com.android.tools.r8.graph.ResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveMethod(com.android.tools.r8.graph.DexMethod,boolean):599:600 -> b
-    8:9:void registerVirtualInvoke(com.android.tools.r8.graph.DexMethod,boolean):768 -> b
-    10:15:void registerVirtualInvoke(com.android.tools.r8.graph.DexMethod,boolean):769:774 -> b
-    16:16:void registerVirtualInvoke(com.android.tools.r8.graph.DexMethod,boolean):773:773 -> b
-    1:1:void registerInitClass(com.android.tools.r8.graph.DexType):739:739 -> c
-    2:2:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):803:803 -> c
-    3:3:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):854:854 -> c
-    1:1:void registerInstanceOf(com.android.tools.r8.graph.DexType):744:744 -> d
-    2:2:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):827:827 -> d
-    1:1:void registerNewInstance(com.android.tools.r8.graph.DexType):749:749 -> e
-    2:2:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):754:754 -> e
-    3:3:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):859:859 -> e
-    1:15:void registerTypeReference(com.android.tools.r8.graph.DexType):720:734 -> f
-    1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):864:864 -> g
-    1:1:void registerFieldInstruction(com.android.tools.r8.graph.DexField):841:841 -> i
-    2:2: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):232:232 -> i
-    2:2:void registerFieldInstruction(com.android.tools.r8.graph.DexField):841 -> i
-    3:4:void registerFieldInstruction(com.android.tools.r8.graph.DexField):843:844 -> i
-    5:5:void registerFieldInstruction(com.android.tools.r8.graph.DexField):842:842 -> i
-com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason -> com.android.tools.r8.internal.jb:
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason ENUM_METHOD_CALLED_WITH_NULL_RECEIVER -> z
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason TYPE_MISMATCH_FIELD_PUT -> x
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason INVALID_FIELD_PUT -> v
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason UNSUPPORTED_LIBRARY_CALL -> t
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason INVALID_INVOKE_ON_ARRAY -> r
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason INVALID_CLINIT -> p
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason NO_INIT -> n
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason CONST_CLASS -> l
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason UNEXPECTED_STATIC_FIELD -> j
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason GENERIC_INVOKE -> h
+    1:1:void <clinit>():655:655 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.optimize.enums.EnumUnboxer,com.android.tools.r8.graph.DexItemFactory):660:661 -> <init>
+    1:4:com.android.tools.r8.ir.optimize.Inliner$Constraint computeConstraint(com.android.tools.r8.graph.ProgramMethod):665:668 -> a
+    5:30:com.android.tools.r8.ir.optimize.Inliner$Constraint deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):672:697 -> a
+    31:44:void registerTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMember):762:775 -> a
+    45:45:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):780:780 -> a
+    46:56:void registerSingleTargetInvoke(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate):790:800 -> a
+    57:57:void registerSingleTargetInvoke(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate):797:797 -> a
+    58:59:void registerCallSite(com.android.tools.r8.graph.DexCallSite):818:819 -> a
+    60:60:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):831:831 -> a
+    1:1:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):741:741 -> b
+    2:7:void registerVirtualInvoke(com.android.tools.r8.graph.DexMethod,boolean):745:750 -> b
+    8:9:com.android.tools.r8.graph.ResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveMethod(com.android.tools.r8.graph.DexMethod,boolean):549:550 -> b
+    8:9:void registerVirtualInvoke(com.android.tools.r8.graph.DexMethod,boolean):750 -> b
+    10:15:void registerVirtualInvoke(com.android.tools.r8.graph.DexMethod,boolean):751:756 -> b
+    16:16:void registerVirtualInvoke(com.android.tools.r8.graph.DexMethod,boolean):755:755 -> b
+    1:1:void registerInitClass(com.android.tools.r8.graph.DexType):721:721 -> c
+    2:2:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):785:785 -> c
+    3:3:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):836:836 -> c
+    1:1:void registerInstanceOf(com.android.tools.r8.graph.DexType):726:726 -> d
+    2:2:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):809:809 -> d
+    1:1:void registerNewInstance(com.android.tools.r8.graph.DexType):731:731 -> e
+    2:2:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):736:736 -> e
+    3:3:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):841:841 -> e
+    1:10:void registerTypeReference(com.android.tools.r8.graph.DexType):702:711 -> f
+    11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> f
+    11:11:void registerTypeReference(com.android.tools.r8.graph.DexType):711 -> f
+    12:15:void registerTypeReference(com.android.tools.r8.graph.DexType):713:716 -> f
+    1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):846:846 -> g
+    1:1:void registerFieldInstruction(com.android.tools.r8.graph.DexField):823:823 -> i
+    2:2: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):237:237 -> i
+    2:2:void registerFieldInstruction(com.android.tools.r8.graph.DexField):823 -> i
+    3:4:void registerFieldInstruction(com.android.tools.r8.graph.DexField):825:826 -> i
+    5:5:void registerFieldInstruction(com.android.tools.r8.graph.DexField):824:824 -> i
+com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason -> com.android.tools.r8.internal.Ea:
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason INVALID_FIELD_READ -> 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
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason IMPLICIT_UP_CAST_IN_RETURN -> t
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason INVALID_INVOKE -> r
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason INVALID_INIT -> p
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason INVALID_PHI -> n
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason UNRESOLVABLE_FIELD -> l
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason DEFAULT_METHOD_INVOKE -> j
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason MANY_INSTANCE_FIELDS -> h
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason ENUM_METHOD_CALLED_WITH_NULL_RECEIVER -> G
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason SUBTYPES -> f
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason INVALID_IF_TYPES -> E
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason PINNED -> d
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason FIELD_PUT_ON_ENUM -> C
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason ACCESSIBILITY -> b
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason OTHER_UNSUPPORTED_INSTRUCTION -> A
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason INVALID_IF_TYPES -> y
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason INVALID_ARRAY_PUT -> w
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason MISSING_INSTANCE_FIELD_DATA -> u
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason IMPLICIT_UP_CAST_IN_RETURN -> s
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason INVALID_INVOKE -> q
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason INVALID_INIT -> o
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason INVALID_PHI -> m
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason UNRESOLVABLE_FIELD -> k
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason DEFAULT_METHOD_INVOKE -> i
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason MANY_INSTANCE_FIELDS -> g
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason INVALID_FIELD_PUT -> A
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason MISSING_INSTANCE_FIELD_DATA -> y
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason COMPARE_TO_INVOKE -> w
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason VALUE_OF_INVOKE -> u
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason INVALID_INVOKE_ON_ARRAY -> s
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason INVALID_CLINIT -> q
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason NO_INIT -> o
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason CONST_CLASS -> m
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason UNEXPECTED_STATIC_FIELD -> k
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason GENERIC_INVOKE -> i
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason OTHER_UNSUPPORTED_INSTRUCTION -> H
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason INTERFACE -> g
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason DYNAMIC_TYPE -> F
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason DOWN_CAST -> e
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason TYPE_MISMATCH_FIELD_PUT -> D
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason ANNOTATION -> c
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason INVALID_ARRAY_PUT -> B
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason ELIGIBLE -> a
-    1:34:void <clinit>():1153:1186 -> <clinit>
-    1:1:void <init>(java.lang.String,int):1152:1152 -> <init>
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis -> com.android.tools.r8.internal.lb:
+    1:34:void <clinit>():1135:1168 -> <clinit>
+    1:1:void <init>(java.lang.String,int):1134:1134 -> <init>
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis -> com.android.tools.r8.internal.Ga:
     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
@@ -45137,50 +45451,38 @@
     1:1:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():39:39 -> a
     2:10:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):53:61 -> a
     2:10:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():40 -> a
-    11:12:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.enumHasBasicStaticFields(com.android.tools.r8.graph.DexProgramClass):74:75 -> a
-    11:12:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):64 -> a
-    11:12:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():40 -> a
-    13:15:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.isEnumField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):88:90 -> a
-    13:15:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.enumHasBasicStaticFields(com.android.tools.r8.graph.DexProgramClass):75 -> a
-    13:15:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):64 -> a
-    13:15:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():40 -> a
-    16:16:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.enumHasBasicStaticFields(com.android.tools.r8.graph.DexProgramClass):77:77 -> a
-    16:16:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):64 -> a
-    16:16:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():40 -> a
-    17:20:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.matchesValuesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):95:98 -> a
-    17:20:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.enumHasBasicStaticFields(com.android.tools.r8.graph.DexProgramClass):77 -> a
-    17:20:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):64 -> a
-    17:20:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():40 -> a
-    21:21:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.enumHasBasicStaticFields(com.android.tools.r8.graph.DexProgramClass):79:79 -> a
-    21:21:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):64 -> a
-    21:21:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():40 -> a
-    22:22:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):65:65 -> a
-    22:22:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():40 -> a
-    23:23:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):57:57 -> a
-    23:23:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():40 -> a
-    24:24:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():41:41 -> a
-    25:25:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():103:103 -> a
-    25:25:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():44 -> a
-    26:26:boolean com.android.tools.r8.graph.DexClass.isAnnotation():571:571 -> a
-    26:26:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():104 -> a
-    26:26:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():44 -> a
-    27:27:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():105:105 -> a
-    27:27:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():44 -> a
-    28:30:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotation(com.android.tools.r8.graph.DexProgramClass):114:116 -> a
-    28:30:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():106 -> a
-    28:30:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():44 -> a
-    31:36:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotation(com.android.tools.r8.graph.DexProgramClass):115:120 -> a
-    31:36:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():106 -> a
-    31:36:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():44 -> a
-    37:41:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():45:49 -> a
-    42:42:void lambda$removePinnedCandidates$0(com.android.tools.r8.graph.DexField):131:131 -> a
-    43:46:void lambda$removePinnedCandidates$1(com.android.tools.r8.graph.DexMethod):134:137 -> a
-    47:48:void removePinnedIfNotHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexType):143:144 -> a
-    49:51:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removePinnedCandidate(com.android.tools.r8.graph.DexType):150:152 -> a
-    49:51:void removePinnedIfNotHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexType):145 -> a
-    52:54:void removePinnedCandidate(com.android.tools.r8.graph.DexType):150:152 -> a
+    11:16:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.enumHasBasicStaticFields(com.android.tools.r8.graph.DexProgramClass):74:79 -> a
+    11:16:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):64 -> a
+    11:16:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():40 -> a
+    17:17:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):65:65 -> a
+    17:17:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():40 -> a
+    18:18:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):57:57 -> a
+    18:18:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():40 -> a
+    19:19:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():41:41 -> a
+    20:20:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():103:103 -> a
+    20:20:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():44 -> a
+    21:21:boolean com.android.tools.r8.graph.DexClass.isAnnotation():553:553 -> a
+    21:21:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():104 -> a
+    21:21:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():44 -> a
+    22:22:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():105:105 -> a
+    22:22:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():44 -> a
+    23:25:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotation(com.android.tools.r8.graph.DexProgramClass):114:116 -> a
+    23:25:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():106 -> a
+    23:25:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():44 -> a
+    26:31:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotation(com.android.tools.r8.graph.DexProgramClass):115:120 -> a
+    26:31:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():106 -> a
+    26:31:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():44 -> a
+    32:36:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():45:49 -> a
+    37:39:boolean isEnumField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):88:90 -> a
+    40:43:boolean matchesValuesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):95:98 -> a
+    44:44:void lambda$removePinnedCandidates$0(com.android.tools.r8.graph.DexField):131:131 -> a
+    45:48:void lambda$removePinnedCandidates$1(com.android.tools.r8.graph.DexMethod):134:137 -> a
+    49:50:void removePinnedIfNotHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexType):143:144 -> a
+    51:53:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removePinnedCandidate(com.android.tools.r8.graph.DexType):150:152 -> a
+    51:53:void removePinnedIfNotHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexType):145 -> a
+    54:56:void removePinnedCandidate(com.android.tools.r8.graph.DexType):150:152 -> a
     1:4:void removePinnedCandidates():129:132 -> b
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection -> com.android.tools.r8.internal.nb:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection -> com.android.tools.r8.internal.Ia:
     java.util.Map enumTypeToInfo -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():20:20 -> <clinit>
@@ -45200,7 +45502,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.mb:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo -> com.android.tools.r8.internal.Ha:
     com.android.tools.r8.utils.collections.ProgramMethodSet methodDependencies -> c
     java.util.Set requiredInstanceFieldData -> d
     com.android.tools.r8.graph.DexProgramClass enumClass -> b
@@ -45214,9 +45516,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.EnumUnboxingCfMethods -> com.android.tools.r8.internal.sb:
-    1:1:void registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):47:47 -> a
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens -> com.android.tools.r8.internal.ub:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens -> com.android.tools.r8.internal.Oa:
     java.util.Map prototypeChangesPerMethod -> m
     boolean $assertionsDisabled -> l
     java.util.Set unboxedEnums -> n
@@ -45225,7 +45525,7 @@
     1:2:com.android.tools.r8.graph.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):55:56 -> 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):62:65 -> b
     1:1:com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder enumUnboxingLensBuilder():71:71 -> l
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder -> com.android.tools.r8.internal.tb:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder -> com.android.tools.r8.internal.Na:
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap originalMethodSignatures -> d
     java.util.Map typeMap -> b
     boolean $assertionsDisabled -> a
@@ -45238,272 +45538,263 @@
     33:35:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,int):140 -> a
     36:36:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,int):137:137 -> a
     37:46:com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,java.util.Set):145:154 -> a
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter -> com.android.tools.r8.internal.vb:
-    com.android.tools.r8.graph.DexMethod zeroCheckMessageMethod -> n
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter -> com.android.tools.r8.internal.Pa:
+    com.android.tools.r8.graph.DexMethod zeroCheckMessageMethod -> o
+    com.android.tools.r8.graph.DexMethod zeroCheckMethod -> n
     com.android.tools.r8.graph.DexItemFactory factory -> d
-    com.android.tools.r8.graph.DexMethod zeroCheckMethod -> m
+    com.android.tools.r8.graph.DexMethod valuesUtilityMethod -> m
     com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator relocator -> f
-    com.android.tools.r8.graph.DexMethod valuesUtilityMethod -> l
-    com.android.tools.r8.graph.DexMethod compareToUtilityMethod -> k
+    com.android.tools.r8.graph.DexMethod compareToUtilityMethod -> l
+    com.android.tools.r8.graph.DexMethod equalsUtilityMethod -> k
     com.android.tools.r8.graph.AppView appView -> c
-    com.android.tools.r8.graph.DexMethod equalsUtilityMethod -> j
-    com.android.tools.r8.graph.DexMethod ordinalUtilityMethod -> i
+    com.android.tools.r8.graph.DexMethod ordinalUtilityMethod -> j
     com.android.tools.r8.ir.optimize.enums.EnumDataMap unboxedEnumsData -> e
     com.android.tools.r8.graph.GraphLens$NestedGraphLens enumUnboxingLens -> g
     com.android.tools.r8.cf.CfVersion REQUIRED_CLASS_FILE_VERSION -> a
+    java.util.Map utilityFields -> i
     boolean $assertionsDisabled -> b
     java.util.Map utilityMethods -> h
-    1:4:void <clinit>():66:69 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumDataMap,com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator):89:89 -> <init>
-    2:25:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumDataMap,com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator):77:100 -> <init>
-    26:33:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumDataMap,com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator):98:105 -> <init>
-    34:41:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumDataMap,com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator):103:110 -> <init>
-    42:50:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumDataMap,com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator):108:116 -> <init>
-    51:59:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumDataMap,com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator):114:122 -> <init>
-    60:67:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumDataMap,com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator):120:127 -> <init>
-    68:68:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumDataMap,com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator):125:125 -> <init>
-    1:1:void setEnumUnboxingLens(com.android.tools.r8.graph.GraphLens$NestedGraphLens):132:132 -> a
-    2:12:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):138:148 -> a
-    13:17: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):351:355 -> a
-    13:17:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):149 -> a
-    18:22:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.insertConstZero(com.android.tools.r8.ir.code.IRCode):368:372 -> a
-    18: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):357 -> a
-    18:22:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):149 -> a
-    23: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):359:359 -> a
-    23:23:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):149 -> a
-    24:52:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):150:178 -> a
-    53:56: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):344:347 -> a
-    53:56:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):179 -> a
-    57: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):346:346 -> a
-    57:57:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):179 -> a
-    58:59:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):181:182 -> a
+    1:4:void <clinit>():69:72 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumDataMap,com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator):93:93 -> <init>
+    2:26:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumDataMap,com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator):80:104 -> <init>
+    27:34:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumDataMap,com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator):102:109 -> <init>
+    35:42:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumDataMap,com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator):107:114 -> <init>
+    43:51:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumDataMap,com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator):112:120 -> <init>
+    52:60:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumDataMap,com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator):118:126 -> <init>
+    61:68:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumDataMap,com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator):124:131 -> <init>
+    69:69:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumDataMap,com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator):129:129 -> <init>
+    1:1:void setEnumUnboxingLens(com.android.tools.r8.graph.GraphLens$NestedGraphLens):136:136 -> a
+    2:12:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):142:152 -> a
+    13:17: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):356:360 -> a
+    13:17:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):153 -> a
+    18:22:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.insertConstZero(com.android.tools.r8.ir.code.IRCode):373:377 -> a
+    18: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):362 -> a
+    18:22:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):153 -> a
+    23: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):364:364 -> a
+    23:23:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):153 -> a
+    24:52:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):154:182 -> a
+    53:56: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):349:352 -> a
+    53:56:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):183 -> a
+    57: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):351:351 -> a
+    57:57:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):183 -> a
+    58:59:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):185:186 -> a
     60:60:boolean com.android.tools.r8.ir.code.Instruction.isInvokeSuper():0:0 -> a
-    60:60:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):186 -> a
-    61:64: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):344:347 -> a
-    61:64:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):187 -> a
-    65: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):346:346 -> a
-    65:65:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):187 -> a
-    66:68:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):190:192 -> a
-    69:142:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):167:240 -> a
-    143:161:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):238:256 -> a
+    60:60:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):190 -> a
+    61:64: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):349:352 -> a
+    61:64:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):191 -> a
+    65: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):351:351 -> a
+    65:65:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):191 -> a
+    66:68:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):194:196 -> a
+    69:142:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):171:244 -> a
+    143:161:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):242:260 -> a
     162:162:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    162:162:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):264 -> a
-    163:173:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):265:275 -> a
-    174:174:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.createValuesField(com.android.tools.r8.graph.DexType):429:429 -> a
-    174:174:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):277 -> a
-    175:177:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.createValuesMethod(com.android.tools.r8.graph.DexType):441:443 -> a
-    175:177:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):278 -> a
-    178:178:java.lang.String com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.compatibleName(com.android.tools.r8.graph.DexType):425:425 -> a
-    178:178:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.createValuesMethod(com.android.tools.r8.graph.DexType):444 -> a
-    178:178:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):278 -> a
-    179:179:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.createValuesMethod(com.android.tools.r8.graph.DexType):444:444 -> a
-    179:179:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):278 -> a
-    180:180:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.createValuesMethod(com.android.tools.r8.graph.DexType):441:441 -> a
-    180:180:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):278 -> a
-    181:188:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):279:286 -> a
-    189:200:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):285:296 -> a
-    201:201:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1133:1133 -> a
-    201:201:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):296 -> a
-    202:203:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):297:298 -> a
-    204:204:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
-    204:204:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):303 -> a
-    205:212:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):304:311 -> a
-    213:213:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):310:310 -> a
-    214:229:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):309:324 -> a
-    230:243:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getEnumTypeOrNull(com.android.tools.r8.ir.code.ArrayAccess):504:517 -> a
-    230:243:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):325 -> a
-    244:251:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):327:334 -> a
-    252:259:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.validateArrayAccess(com.android.tools.r8.ir.code.ArrayAccess):397:404 -> a
-    252:259:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):334 -> a
-    260:260:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.validateArrayAccess(com.android.tools.r8.ir.code.ArrayAccess):402:402 -> a
-    260:260:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):334 -> a
-    261:261:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):338:338 -> a
-    262:263:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$7(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):282:283 -> a
-    264:268: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):449:453 -> a
-    264:268:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$7(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):282 -> a
-    269:275:com.android.tools.r8.graph.DexMethod computeInstanceFieldMethod(com.android.tools.r8.graph.DexField):376:382 -> a
-    276:276:com.android.tools.r8.graph.DexEncodedMethod lambda$computeInstanceFieldMethod$8(com.android.tools.r8.graph.DexMethod):379:379 -> a
-    277:280: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):390:393 -> a
-    281:282:com.android.tools.r8.graph.DexType getEnumTypeOrNull(com.android.tools.r8.ir.code.Value,java.util.Map):409:410 -> a
-    283:283:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> a
-    283:283:com.android.tools.r8.graph.DexType getEnumTypeOrNull(com.android.tools.r8.ir.code.Value,java.util.Map):410 -> a
-    284:286:com.android.tools.r8.graph.DexType getEnumTypeOrNull(com.android.tools.r8.ir.code.Value,java.util.Map):411:413 -> a
-    287:291:com.android.tools.r8.graph.DexType getEnumTypeOrNull(com.android.tools.r8.ir.analysis.type.TypeElement):417:421 -> a
-    292:292:java.lang.String compatibleName(com.android.tools.r8.graph.DexType):425:425 -> a
-    293:293:com.android.tools.r8.graph.DexField createValuesField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):434:434 -> a
-    294:294:java.lang.String com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.compatibleName(com.android.tools.r8.graph.DexType):425:425 -> a
-    294:294:com.android.tools.r8.graph.DexField createValuesField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):437 -> a
-    295:295:com.android.tools.r8.graph.DexField createValuesField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):437:437 -> a
-    296:296:com.android.tools.r8.graph.DexField createValuesField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):434:434 -> a
-    297:301:com.android.tools.r8.graph.DexMethod computeInstanceFieldUtilityMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):457:461 -> a
-    302:302:java.lang.String com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.compatibleName(com.android.tools.r8.graph.DexType):425:425 -> a
-    302:302:com.android.tools.r8.graph.DexMethod computeInstanceFieldUtilityMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):464 -> a
-    303:307:com.android.tools.r8.graph.DexMethod computeInstanceFieldUtilityMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):464:468 -> a
-    308:312:com.android.tools.r8.graph.DexMethod computeInstanceFieldUtilityMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):466:470 -> a
-    313:313: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):471:471 -> a
-    314:314: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):488:488 -> a
-    315:329:void synthesizeEnumUnboxingUtilityMethods(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):524:538 -> a
-    330:334:void lambda$synthesizeEnumUnboxingUtilityMethods$12(com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):531:535 -> a
-    335:343:java.util.Map triageEncodedMembers(java.util.Collection):543:551 -> a
-    344:350:java.util.Map triageEncodedMembers(java.util.Collection):550:556 -> a
-    351:351:int lambda$triageEncodedMembers$14(com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.graph.DexEncodedMember):556:556 -> a
-    352:362: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):563:573 -> a
-    363:366: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):577:580 -> a
-    363:366:com.android.tools.r8.graph.DexEncodedMethod lambda$computeValueOfUtilityMethod$11(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):499 -> a
-    367:379: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):578:590 -> a
-    367:379:com.android.tools.r8.graph.DexEncodedMethod lambda$computeValueOfUtilityMethod$11(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):499 -> a
-    380:381:com.android.tools.r8.graph.DexEncodedMethod synthesizeOrdinalMethod():607:608 -> a
-    382:402: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 -> a
-    382:402:com.android.tools.r8.graph.DexEncodedMethod synthesizeOrdinalMethod():608 -> a
-    403:413: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 -> a
-    403:413:com.android.tools.r8.graph.DexEncodedMethod synthesizeOrdinalMethod():608 -> a
-    414:414:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> a
-    414:414: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 -> a
-    414:414:com.android.tools.r8.graph.DexEncodedMethod synthesizeOrdinalMethod():608 -> a
-    415:416: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 -> a
-    415:416:com.android.tools.r8.graph.DexEncodedMethod synthesizeOrdinalMethod():608 -> a
-    417:444: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 -> a
-    417:444:com.android.tools.r8.graph.DexEncodedMethod synthesizeOrdinalMethod():608 -> a
-    445:445:com.android.tools.r8.graph.DexEncodedMethod synthesizeOrdinalMethod():609:609 -> a
-    446:446:com.android.tools.r8.graph.DexEncodedMethod synthesizeUtilityMethod(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod,boolean):632:632 -> a
-    447:447:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizedMethodAccessFlags(boolean):648:648 -> a
-    447:447:com.android.tools.r8.graph.DexEncodedMethod synthesizeUtilityMethod(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod,boolean):634 -> a
-    448:450:com.android.tools.r8.graph.DexEncodedMethod synthesizeUtilityMethod(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod,boolean):635:637 -> a
-    451:451: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):296:296 -> a
-    451:451:com.android.tools.r8.graph.DexEncodedMethod synthesizeUtilityMethod(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod,boolean):637 -> a
-    1:1:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$0(com.android.tools.r8.graph.DexMethod):168:168 -> b
-    2:3:com.android.tools.r8.graph.DexMethod computeStringValueOfUtilityMethod(com.android.tools.r8.graph.DexType):477:478 -> b
-    4:4:java.lang.String com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.compatibleName(com.android.tools.r8.graph.DexType):425:425 -> b
-    4:4:com.android.tools.r8.graph.DexMethod computeStringValueOfUtilityMethod(com.android.tools.r8.graph.DexType):478 -> b
-    5:9:com.android.tools.r8.graph.DexMethod computeStringValueOfUtilityMethod(com.android.tools.r8.graph.DexType):478:482 -> b
-    10:16:com.android.tools.r8.graph.DexMethod computeStringValueOfUtilityMethod(com.android.tools.r8.graph.DexType):480:486 -> b
-    17:18:com.android.tools.r8.graph.DexEncodedMethod synthesizeZeroCheckMethod():594:595 -> b
-    19:39: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 -> b
-    19:39:com.android.tools.r8.graph.DexEncodedMethod synthesizeZeroCheckMethod():595 -> b
-    40:50: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 -> b
-    40:50:com.android.tools.r8.graph.DexEncodedMethod synthesizeZeroCheckMethod():595 -> b
-    51:51:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> b
-    51:51: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 -> b
-    51:51:com.android.tools.r8.graph.DexEncodedMethod synthesizeZeroCheckMethod():595 -> b
-    52:53: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 -> b
-    52:53:com.android.tools.r8.graph.DexEncodedMethod synthesizeZeroCheckMethod():595 -> b
-    54:78: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 -> b
-    54:78:com.android.tools.r8.graph.DexEncodedMethod synthesizeZeroCheckMethod():595 -> b
-    79:79:com.android.tools.r8.graph.DexEncodedMethod synthesizeZeroCheckMethod():596:596 -> b
-    1:5:com.android.tools.r8.graph.DexMethod computeValueOfUtilityMethod(com.android.tools.r8.graph.DexType):493:497 -> c
-    6:6:java.lang.String com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.compatibleName(com.android.tools.r8.graph.DexType):425:425 -> c
-    6:6:com.android.tools.r8.graph.DexMethod computeValueOfUtilityMethod(com.android.tools.r8.graph.DexType):498 -> c
-    7:7:com.android.tools.r8.graph.DexMethod computeValueOfUtilityMethod(com.android.tools.r8.graph.DexType):498:498 -> c
-    8:12:com.android.tools.r8.graph.DexMethod computeValueOfUtilityMethod(com.android.tools.r8.graph.DexType):495:499 -> c
-    13:14:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():613:614 -> c
-    13:14:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):172 -> c
-    15:37: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
-    15:37:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():614 -> c
-    15:37:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):172 -> c
-    38:50: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
-    38:50:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():614 -> c
-    38:50:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):172 -> c
-    51:51:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> c
-    51:51: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
-    51:51:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():614 -> c
-    51:51:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):172 -> c
-    52:66: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
-    52:66:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():614 -> c
-    52:66:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):172 -> c
-    67:67:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> c
-    67:67: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
-    67:67:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():614 -> c
-    67:67:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):172 -> c
-    68:78: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
-    68:78:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():614 -> c
-    68:78:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):172 -> c
-    79:79:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> c
-    79:79: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
-    79:79:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():614 -> c
-    79:79:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):172 -> c
-    80:83: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
-    80:83:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():614 -> c
-    80:83:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):172 -> c
-    84:136: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
-    84:136:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():614 -> c
-    84:136:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):172 -> c
-    137:137:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():615:615 -> c
-    137:137:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):172 -> c
-    1:1:java.util.List lambda$triageEncodedMembers$13(com.android.tools.r8.graph.DexType):551:551 -> d
-    2:4:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeCompareToMethod():619:621 -> d
-    2:4:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$2(com.android.tools.r8.graph.DexMethod):176 -> d
+    162:162:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):268 -> a
+    163:173:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):269:279 -> a
+    174:178:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.createValuesField(com.android.tools.r8.graph.DexType):434:434 -> a
+    174:178:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):281 -> a
+    179:179:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):282:282 -> a
+    180:184:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.createValuesMethod(com.android.tools.r8.graph.DexType):451:451 -> a
+    180:184:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):283 -> a
+    185:192:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):284:291 -> a
+    193:204:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):290:301 -> a
+    205:205:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1128:1128 -> a
+    205:205:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):301 -> a
+    206:207:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):302:303 -> 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):308 -> a
+    209:216:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):309:316 -> a
+    217:217:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):315:315 -> a
+    218:233:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):314:329 -> 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):514:527 -> a
+    234:247:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):330 -> a
+    248:255:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):332:339 -> a
+    256:263:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.validateArrayAccess(com.android.tools.r8.ir.code.ArrayAccess):402:409 -> a
+    256:263:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):339 -> a
+    264:264:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.validateArrayAccess(com.android.tools.r8.ir.code.ArrayAccess):407:407 -> a
+    264:264:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):339 -> a
+    265:265:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):343:343 -> a
+    266:267:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$7(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):287:288 -> a
+    268:272: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):459:463 -> a
+    268:272:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$7(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):287 -> a
+    273:279:com.android.tools.r8.graph.DexMethod computeInstanceFieldMethod(com.android.tools.r8.graph.DexField):381:387 -> a
+    280:280:com.android.tools.r8.graph.DexEncodedMethod lambda$computeInstanceFieldMethod$8(com.android.tools.r8.graph.DexMethod):384:384 -> a
+    281:284: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):395:398 -> a
+    285:286:com.android.tools.r8.graph.DexType getEnumTypeOrNull(com.android.tools.r8.ir.code.Value,java.util.Map):414:415 -> a
+    287:287:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> a
+    287:287:com.android.tools.r8.graph.DexType getEnumTypeOrNull(com.android.tools.r8.ir.code.Value,java.util.Map):415 -> a
+    288:290:com.android.tools.r8.graph.DexType getEnumTypeOrNull(com.android.tools.r8.ir.code.Value,java.util.Map):416:418 -> a
+    291:295:com.android.tools.r8.graph.DexType getEnumTypeOrNull(com.android.tools.r8.ir.analysis.type.TypeElement):422:426 -> a
+    296:296:java.lang.String compatibleName(com.android.tools.r8.graph.DexType):430:430 -> a
+    297:308:com.android.tools.r8.graph.DexMethod computeInstanceFieldUtilityMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):467:478 -> a
+    309:313:com.android.tools.r8.graph.DexMethod computeInstanceFieldUtilityMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):476:480 -> a
+    314:314: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):481:481 -> a
+    315:315: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):498:498 -> a
+    316:338:void synthesizeEnumUnboxingUtilityMethods(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):534:556 -> a
+    339:339:void lambda$synthesizeEnumUnboxingUtilityMethods$12(com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):542:542 -> a
+    340:340:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    340:340:void lambda$synthesizeEnumUnboxingUtilityMethods$12(com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):542 -> a
+    341:345:void lambda$synthesizeEnumUnboxingUtilityMethods$12(com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):542:546 -> a
+    346:346:void lambda$synthesizeEnumUnboxingUtilityMethods$13(com.android.tools.r8.graph.DexType,java.util.List):552:552 -> a
+    347:347:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    347:347:void lambda$synthesizeEnumUnboxingUtilityMethods$13(com.android.tools.r8.graph.DexType,java.util.List):552 -> a
+    348:350:void lambda$synthesizeEnumUnboxingUtilityMethods$13(com.android.tools.r8.graph.DexType,java.util.List):552:554 -> a
+    351:359:java.util.Map triageEncodedMembers(java.util.Collection):561:569 -> a
+    360:366:java.util.Map triageEncodedMembers(java.util.Collection):568:574 -> a
+    367:367:int lambda$triageEncodedMembers$15(com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.graph.DexEncodedMember):574:574 -> a
+    368:378: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):581:591 -> a
+    379:382: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):595:598 -> a
+    379:382:com.android.tools.r8.graph.DexEncodedMethod lambda$computeValueOfUtilityMethod$11(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):509 -> a
+    383:395: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):596:608 -> a
+    383:395:com.android.tools.r8.graph.DexEncodedMethod lambda$computeValueOfUtilityMethod$11(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):509 -> a
+    396:397:com.android.tools.r8.graph.DexEncodedMethod synthesizeOrdinalMethod():625:626 -> a
+    398:418: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 -> a
+    398:418:com.android.tools.r8.graph.DexEncodedMethod synthesizeOrdinalMethod():626 -> a
+    419:429: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 -> a
+    419:429:com.android.tools.r8.graph.DexEncodedMethod synthesizeOrdinalMethod():626 -> a
+    430:430:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> a
+    430:430: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 -> a
+    430:430:com.android.tools.r8.graph.DexEncodedMethod synthesizeOrdinalMethod():626 -> a
+    431:432: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 -> a
+    431:432:com.android.tools.r8.graph.DexEncodedMethod synthesizeOrdinalMethod():626 -> a
+    433:460: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 -> a
+    433:460:com.android.tools.r8.graph.DexEncodedMethod synthesizeOrdinalMethod():626 -> a
+    461:461:com.android.tools.r8.graph.DexEncodedMethod synthesizeOrdinalMethod():627:627 -> a
+    462:462:com.android.tools.r8.graph.DexEncodedMethod synthesizeUtilityMethod(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod,boolean):650:650 -> a
+    463:463:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizedMethodAccessFlags(boolean):666:666 -> a
+    463:463:com.android.tools.r8.graph.DexEncodedMethod synthesizeUtilityMethod(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod,boolean):652 -> a
+    464:466:com.android.tools.r8.graph.DexEncodedMethod synthesizeUtilityMethod(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod,boolean):653:655 -> a
+    467:467: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):297:297 -> a
+    467:467:com.android.tools.r8.graph.DexEncodedMethod synthesizeUtilityMethod(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod,boolean):655 -> a
+    1:1:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$0(com.android.tools.r8.graph.DexMethod):172:172 -> b
+    2:7:com.android.tools.r8.graph.DexEncodedField computeValuesEncodedField(com.android.tools.r8.graph.DexField):441:446 -> 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):74:74 -> b
+    8:8:com.android.tools.r8.graph.DexEncodedField computeValuesEncodedField(com.android.tools.r8.graph.DexField):446 -> b
+    9:14:com.android.tools.r8.graph.DexMethod computeStringValueOfUtilityMethod(com.android.tools.r8.graph.DexType):487:492 -> b
+    15:21:com.android.tools.r8.graph.DexMethod computeStringValueOfUtilityMethod(com.android.tools.r8.graph.DexType):490:496 -> b
+    22:23:com.android.tools.r8.graph.DexEncodedMethod synthesizeZeroCheckMethod():612:613 -> b
+    24:44: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 -> b
+    24:44:com.android.tools.r8.graph.DexEncodedMethod synthesizeZeroCheckMethod():613 -> b
+    45:55: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 -> b
+    45:55:com.android.tools.r8.graph.DexEncodedMethod synthesizeZeroCheckMethod():613 -> 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_zeroCheck(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):295 -> b
+    56:56:com.android.tools.r8.graph.DexEncodedMethod synthesizeZeroCheckMethod():613 -> b
+    57:58: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 -> b
+    57:58:com.android.tools.r8.graph.DexEncodedMethod synthesizeZeroCheckMethod():613 -> b
+    59:83: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 -> b
+    59:83:com.android.tools.r8.graph.DexEncodedMethod synthesizeZeroCheckMethod():613 -> b
+    84:84:com.android.tools.r8.graph.DexEncodedMethod synthesizeZeroCheckMethod():614:614 -> b
+    1:6:com.android.tools.r8.graph.DexMethod computeValueOfUtilityMethod(com.android.tools.r8.graph.DexType):503:508 -> c
+    7:11:com.android.tools.r8.graph.DexMethod computeValueOfUtilityMethod(com.android.tools.r8.graph.DexType):505:509 -> c
+    12:13:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():631:632 -> c
+    12:13:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):176 -> c
+    14:36: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
+    14:36:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():632 -> c
+    14:36:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):176 -> c
+    37:49: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
+    37:49:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():632 -> c
+    37:49:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):176 -> c
+    50:50:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> c
+    50:50: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
+    50:50:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():632 -> c
+    50:50:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):176 -> c
+    51:65: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
+    51:65:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():632 -> c
+    51:65:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):176 -> c
+    66:66:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> c
+    66:66: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
+    66:66:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():632 -> c
+    66:66:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):176 -> c
+    67:77: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
+    67:77:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():632 -> c
+    67:77:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):176 -> c
+    78:78:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> c
+    78:78: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
+    78:78:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():632 -> c
+    78:78:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):176 -> c
+    79:82: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
+    79:82:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():632 -> c
+    79:82:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):176 -> c
+    83:135: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
+    83:135:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():632 -> c
+    83:135:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):176 -> c
+    136:136:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():633:633 -> c
+    136:136:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):176 -> c
+    1:1:java.util.List lambda$triageEncodedMembers$14(com.android.tools.r8.graph.DexType):569:569 -> d
+    2:4:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeCompareToMethod():637:639 -> d
+    2:4:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$2(com.android.tools.r8.graph.DexMethod):180 -> 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():620 -> d
-    5:25:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$2(com.android.tools.r8.graph.DexMethod):176 -> d
+    5:25:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeCompareToMethod():638 -> d
+    5:25:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$2(com.android.tools.r8.graph.DexMethod):180 -> 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():620 -> d
-    26:26:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$2(com.android.tools.r8.graph.DexMethod):176 -> d
+    26:26:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeCompareToMethod():638 -> d
+    26:26:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$2(com.android.tools.r8.graph.DexMethod):180 -> 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():620 -> d
-    27:37:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$2(com.android.tools.r8.graph.DexMethod):176 -> d
+    27:37:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeCompareToMethod():638 -> d
+    27:37:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$2(com.android.tools.r8.graph.DexMethod):180 -> 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():620 -> d
-    38:50:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$2(com.android.tools.r8.graph.DexMethod):176 -> d
+    38:50:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeCompareToMethod():638 -> d
+    38:50:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$2(com.android.tools.r8.graph.DexMethod):180 -> 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():620 -> d
-    51:51:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$2(com.android.tools.r8.graph.DexMethod):176 -> d
+    51:51:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeCompareToMethod():638 -> d
+    51:51:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$2(com.android.tools.r8.graph.DexMethod):180 -> 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():620 -> d
-    52:54:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$2(com.android.tools.r8.graph.DexMethod):176 -> d
+    52:54:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeCompareToMethod():638 -> d
+    52:54:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$2(com.android.tools.r8.graph.DexMethod):180 -> 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():620 -> d
-    55:95:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$2(com.android.tools.r8.graph.DexMethod):176 -> d
-    96:96:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeCompareToMethod():622:622 -> d
-    96:96:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$2(com.android.tools.r8.graph.DexMethod):176 -> d
-    1:1:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$3(com.android.tools.r8.graph.DexMethod):193:193 -> e
-    1:1:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$4(com.android.tools.r8.graph.DexMethod):249:249 -> f
-    1:3:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeZeroCheckMessageMethod():600:602 -> g
-    1:3:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$5(com.android.tools.r8.graph.DexMethod):260 -> g
+    55:95:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeCompareToMethod():638 -> d
+    55:95:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$2(com.android.tools.r8.graph.DexMethod):180 -> d
+    96:96:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeCompareToMethod():640:640 -> d
+    96:96:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$2(com.android.tools.r8.graph.DexMethod):180 -> d
+    1:1:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$3(com.android.tools.r8.graph.DexMethod):197:197 -> e
+    1:1:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$4(com.android.tools.r8.graph.DexMethod):253:253 -> f
+    1:3:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeZeroCheckMessageMethod():618:620 -> g
+    1:3:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$5(com.android.tools.r8.graph.DexMethod):264 -> 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():601 -> g
-    4:26:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$5(com.android.tools.r8.graph.DexMethod):260 -> g
+    4:26:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeZeroCheckMessageMethod():619 -> g
+    4:26:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$5(com.android.tools.r8.graph.DexMethod):264 -> 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():601 -> g
-    27:40:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$5(com.android.tools.r8.graph.DexMethod):260 -> g
+    27:40:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeZeroCheckMessageMethod():619 -> g
+    27:40:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$5(com.android.tools.r8.graph.DexMethod):264 -> 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():601 -> g
-    41:41:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$5(com.android.tools.r8.graph.DexMethod):260 -> g
+    41:41:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeZeroCheckMessageMethod():619 -> g
+    41:41:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$5(com.android.tools.r8.graph.DexMethod):264 -> 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():601 -> g
-    42:44:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$5(com.android.tools.r8.graph.DexMethod):260 -> g
+    42:44:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeZeroCheckMessageMethod():619 -> g
+    42:44:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$5(com.android.tools.r8.graph.DexMethod):264 -> 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():601 -> g
-    45:74:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$5(com.android.tools.r8.graph.DexMethod):260 -> g
-    75:75:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeZeroCheckMessageMethod():603:603 -> g
-    75:75:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$5(com.android.tools.r8.graph.DexMethod):260 -> g
-    1:2:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeValuesUtilityMethod():626:627 -> 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():619 -> g
+    45:74:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$5(com.android.tools.r8.graph.DexMethod):264 -> g
+    75:75:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeZeroCheckMessageMethod():621:621 -> g
+    75:75:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$5(com.android.tools.r8.graph.DexMethod):264 -> g
+    1:2:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeValuesUtilityMethod():644:645 -> h
+    1:2:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$6(com.android.tools.r8.graph.DexMethod):280 -> 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():627 -> 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():645 -> h
+    3:29:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$6(com.android.tools.r8.graph.DexMethod):280 -> 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():627 -> 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():645 -> h
+    30:30:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$6(com.android.tools.r8.graph.DexMethod):280 -> 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():627 -> 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():645 -> h
+    31:54:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$6(com.android.tools.r8.graph.DexMethod):280 -> 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():627 -> 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():645 -> h
+    55:55:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$6(com.android.tools.r8.graph.DexMethod):280 -> 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():627 -> 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():645 -> h
+    56:58:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$6(com.android.tools.r8.graph.DexMethod):280 -> 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():627 -> 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():628:628 -> 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.wb:
+    59:104:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeValuesUtilityMethod():645 -> h
+    59:104:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$6(com.android.tools.r8.graph.DexMethod):280 -> h
+    105:105:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeValuesUtilityMethod():646:646 -> h
+    105:105:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$6(com.android.tools.r8.graph.DexMethod):280 -> h
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer -> com.android.tools.r8.internal.Qa:
     com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator relocator -> g
     java.util.Map unboxedEnumsMethods -> b
     com.android.tools.r8.graph.DexItemFactory factory -> e
@@ -45522,195 +45813,193 @@
     37:37:void lambda$fixupTypeReferences$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):63:63 -> a
     38:38:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.clearEnumToUnboxMethod(com.android.tools.r8.graph.DexEncodedMethod):97:97 -> a
     38:38:void lambda$fixupTypeReferences$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):64 -> a
-    39:39:com.android.tools.r8.graph.Code com.android.tools.r8.graph.DexEncodedMethod.buildEmptyThrowingCode(com.android.tools.r8.utils.InternalOptions):1000:1000 -> a
-    39:39:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.clearEnumToUnboxMethod(com.android.tools.r8.graph.DexEncodedMethod):97 -> a
-    39:39:void lambda$fixupTypeReferences$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):64 -> a
-    40:40:com.android.tools.r8.graph.CfCode com.android.tools.r8.graph.DexEncodedMethod.buildEmptyThrowingCfCode():1006:1006 -> a
-    40:40:com.android.tools.r8.graph.Code com.android.tools.r8.graph.DexEncodedMethod.buildEmptyThrowingCode(com.android.tools.r8.utils.InternalOptions):1001 -> a
-    40:40:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.clearEnumToUnboxMethod(com.android.tools.r8.graph.DexEncodedMethod):97 -> a
-    40:40:void lambda$fixupTypeReferences$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):64 -> a
-    41:41:com.android.tools.r8.graph.Code com.android.tools.r8.graph.DexEncodedMethod.buildEmptyThrowingCode(com.android.tools.r8.utils.InternalOptions):1002:1002 -> a
-    41:41:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.clearEnumToUnboxMethod(com.android.tools.r8.graph.DexEncodedMethod):97 -> a
-    41:41:void lambda$fixupTypeReferences$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):64 -> a
+    39:41:com.android.tools.r8.graph.Code com.android.tools.r8.graph.DexEncodedMethod.buildEmptyThrowingCode(com.android.tools.r8.utils.InternalOptions):1013:1015 -> a
+    39:41:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.clearEnumToUnboxMethod(com.android.tools.r8.graph.DexEncodedMethod):97 -> a
+    39:41:void lambda$fixupTypeReferences$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):64 -> a
     42:42:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.clearEnumToUnboxMethod(com.android.tools.r8.graph.DexEncodedMethod):97:97 -> a
     42:42:void lambda$fixupTypeReferences$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):64 -> a
     43:47:void lambda$fixupTypeReferences$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):66:70 -> a
-    48:49:void lambda$fixupTypeReferences$2(com.android.tools.r8.graph.DexType,java.util.List):85:86 -> a
-    50:57:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethodToUtility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):102:109 -> a
-    58:67:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethodToUtility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):104:113 -> a
-    68:68: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):100:100 -> a
-    68:68:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethodToUtility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):113 -> a
-    69:71:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethodToUtility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):114:116 -> a
-    72:72:void com.android.tools.r8.graph.DexEncodedMethod.clearParameterAnnotations():902:902 -> a
-    72:72:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethodToUtility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):117 -> a
-    73:73:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethodToUtility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):118:118 -> a
-    74:74:void lambda$fixupEncodedMethodToUtility$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):119:119 -> a
-    75:77:void lambda$fixupEncodedMethod$5(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexEncodedMethod$Builder):143:145 -> a
-    78:78:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setIsLibraryMethodOverrideIf(boolean,com.android.tools.r8.utils.OptionalBool):1607:1607 -> a
-    78:78:void lambda$fixupEncodedMethod$5(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexEncodedMethod$Builder):144 -> a
-    79:81:void lambda$fixupEncodedMethod$5(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexEncodedMethod$Builder):144:146 -> a
-    82:82:void lambda$fixupEncodedMethod$4(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):148:148 -> a
-    83:83:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> a
-    83:83:void lambda$fixupEncodedMethod$4(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):148 -> a
-    84:84:boolean com.android.tools.r8.graph.DexEncodedMethod.isInstance():610:610 -> a
-    84:84:void lambda$fixupEncodedMethod$4(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):149 -> a
-    85:95:void lambda$fixupEncodedMethod$4(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):149:159 -> a
-    96:96:void lambda$fixupEncodedMethod$4(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):156:156 -> a
-    97:99:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):164:166 -> a
-    100:100:boolean com.android.tools.r8.graph.DexMethod.isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):266:266 -> a
-    100:100:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):166 -> a
-    101:104:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):167:170 -> a
-    105:116:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):168:179 -> a
-    117:117:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):176:176 -> a
-    118:118:boolean lambda$ensureUniqueMethod$6(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):171:171 -> a
-    119:125:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):189:195 -> a
-    126:126:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder.move(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):96:96 -> a
-    126:126:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):195 -> a
-    127:136:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):196:205 -> a
-    137:137:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():209:209 -> a
-    137:137:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):206 -> a
-    138:140:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):206:208 -> a
-    141:141:void lambda$fixupFields$8(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField$Builder):200:200 -> a
-    142:142:void lambda$fixupFields$7(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):203:203 -> a
-    143:143:void lambda$fixupFields$7(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):202:202 -> a
-    144:145:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):216:217 -> a
-    146:148:com.android.tools.r8.graph.DexType[] com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupTypes(com.android.tools.r8.graph.DexType[]):239:241 -> a
-    146:148:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):217 -> a
-    149:149:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):218:218 -> a
-    150:160:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):222:232 -> a
-    161:161:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder.map(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):89:89 -> a
-    161:161:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):232 -> a
-    162:162:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.getProto():388:388 -> a
-    162:162:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod):123 -> a
-    163:163:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexMethod.getProto():62:62 -> a
-    163:163:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.getProto():388 -> a
-    163:163:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod):123 -> a
-    164:164:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod):124:124 -> a
-    165:165:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.getProto():388:388 -> a
-    165:165:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod):125 -> a
-    166:166:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexMethod.getProto():62:62 -> a
-    166:166:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.getProto():388 -> a
-    166:166:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod):125 -> a
-    167:178:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod):128:139 -> a
+    48:48:void lambda$fixupTypeReferences$2(com.android.tools.r8.graph.DexType,java.util.List):85:85 -> a
+    49:49:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    49:49:void lambda$fixupTypeReferences$2(com.android.tools.r8.graph.DexType,java.util.List):85 -> a
+    50:51:void lambda$fixupTypeReferences$2(com.android.tools.r8.graph.DexType,java.util.List):85:86 -> a
+    52:59:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethodToUtility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):102:109 -> a
+    60:68:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethodToUtility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):104:112 -> a
+    69:69:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    69:69:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethodToUtility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):112 -> a
+    70:71:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethodToUtility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):112:113 -> a
+    72:72: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):100:100 -> a
+    72:72:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethodToUtility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):113 -> a
+    73:75:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethodToUtility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):114:116 -> a
+    76:76:void com.android.tools.r8.graph.DexEncodedMethod.clearParameterAnnotations():915:915 -> a
+    76:76:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethodToUtility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):117 -> a
+    77:77:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethodToUtility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):118:118 -> a
+    78:78:void lambda$fixupEncodedMethodToUtility$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):119:119 -> a
+    79:81:void lambda$fixupEncodedMethod$5(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexEncodedMethod$Builder):143:145 -> a
+    82:82:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setIsLibraryMethodOverrideIf(boolean,com.android.tools.r8.utils.OptionalBool):1622:1622 -> a
+    82:82:void lambda$fixupEncodedMethod$5(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexEncodedMethod$Builder):144 -> a
+    83:85:void lambda$fixupEncodedMethod$5(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexEncodedMethod$Builder):144:146 -> a
+    86:86:void lambda$fixupEncodedMethod$4(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):148:148 -> a
+    87:87:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> a
+    87:87:void lambda$fixupEncodedMethod$4(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):148 -> a
+    88:88:boolean com.android.tools.r8.graph.DexEncodedMethod.isInstance():623:623 -> a
+    88:88:void lambda$fixupEncodedMethod$4(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):149 -> a
+    89:99:void lambda$fixupEncodedMethod$4(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):149:159 -> a
+    100:100:void lambda$fixupEncodedMethod$4(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):156:156 -> a
+    101:101:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):164:164 -> a
+    102:102:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    102:102:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):164 -> a
+    103:104:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):165:166 -> a
+    105:105:boolean com.android.tools.r8.graph.DexMethod.isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):261:261 -> a
+    105:105:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):166 -> a
+    106:109:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):167:170 -> a
+    110:121:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):168:179 -> a
+    122:122:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):176:176 -> a
+    123:123:boolean lambda$ensureUniqueMethod$6(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):171:171 -> a
+    124:130:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):189:195 -> a
+    131:131:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder.move(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):96:96 -> a
+    131:131:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):195 -> a
+    132:133:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):196:197 -> a
+    134:134:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():199:199 -> a
+    134:134:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):198 -> a
+    135:137:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):198:200 -> a
+    138:139:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):208:209 -> a
+    140:142:com.android.tools.r8.graph.DexType[] com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupTypes(com.android.tools.r8.graph.DexType[]):231:233 -> a
+    140:142:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):209 -> a
+    143:143:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):210:210 -> a
+    144:154:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):214:224 -> a
+    155:155:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder.map(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):89:89 -> a
+    155:155:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):224 -> a
+    156:156:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.proto():415:415 -> a
+    156:156:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod):123 -> a
+    157:157:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod):124:124 -> a
+    158:158:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.proto():415:415 -> a
+    158:158:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod):125 -> a
+    159:170:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod):128:139 -> a
     1:1:java.util.List lambda$fixupTypeReferences$0(com.android.tools.r8.graph.DexType):68:68 -> b
-com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer -> com.android.tools.r8.internal.zb:
+com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer -> com.android.tools.r8.internal.Ta:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():51:51 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.AppView):56:58 -> <init>
     1:4:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):193:196 -> a
-    5:26: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):402:423 -> a
-    5:26:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):202 -> a
-    27:27:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    27: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):424 -> a
-    27:27:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):202 -> a
-    28:40: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):427:439 -> a
-    28:40:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):202 -> a
-    41:46:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.computeOrdinalToTargetMap(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo):296:301 -> a
-    41:46:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):207 -> a
-    47:47: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):232:232 -> a
-    47:47:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.computeOrdinalToTargetMap(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo):301 -> a
-    47:47:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):207 -> a
-    48:48:com.android.tools.r8.graph.FieldResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):863:863 -> a
-    48:48: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):232 -> 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):402:413 -> a
+    5:16:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):202 -> a
+    17:17:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> 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):413 -> a
+    17:17:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):202 -> 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):414:423 -> a
+    18:27:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):202 -> a
+    28:28:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    28:28: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):424 -> a
+    28:28:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):202 -> a
+    29:41: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):427:439 -> a
+    29:41:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):202 -> a
+    42:47:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.computeOrdinalToTargetMap(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo):296:301 -> a
+    42:47:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):207 -> a
+    48:48: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):237:237 -> a
     48:48:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.computeOrdinalToTargetMap(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo):301 -> a
     48:48:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):207 -> a
-    49:53:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.computeOrdinalToTargetMap(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo):301:305 -> a
-    49:53:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):207 -> a
-    54:56:com.android.tools.r8.ir.analysis.value.SingleNumberValue com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.getOrdinalValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.value.AbstractValue,boolean):343:345 -> a
-    54:56:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.computeOrdinalToTargetMap(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo):309 -> a
-    54:56:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):207 -> a
-    57:64:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.computeOrdinalToTargetMap(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo):310:317 -> a
-    57:64:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):207 -> a
-    65:65: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):52:52 -> a
-    65:65:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.computeOrdinalToTargetMap(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo):317 -> a
-    65:65:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):207 -> a
-    66:66: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
-    66:66: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):52 -> a
+    49:49:com.android.tools.r8.graph.FieldResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):813:813 -> a
+    49:49: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):237 -> a
+    49:49:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.computeOrdinalToTargetMap(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo):301 -> a
+    49:49:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):207 -> a
+    50:54:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.computeOrdinalToTargetMap(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo):301:305 -> a
+    50:54:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):207 -> a
+    55:57:com.android.tools.r8.ir.analysis.value.SingleNumberValue com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.getOrdinalValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.value.AbstractValue,boolean):343:345 -> a
+    55:57:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.computeOrdinalToTargetMap(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo):309 -> a
+    55:57:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):207 -> a
+    58:65:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.computeOrdinalToTargetMap(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo):310:317 -> a
+    58:65:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):207 -> a
+    66:66: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):52:52 -> a
     66:66:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.computeOrdinalToTargetMap(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo):317 -> a
     66:66:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):207 -> a
-    67:71:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.computeOrdinalToTargetMap(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo):317:321 -> a
-    67:71:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):207 -> a
-    72:72: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):232:232 -> a
-    72:72:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.computeOrdinalToTargetMap(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo):321 -> a
-    72:72:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):207 -> a
-    73:73:com.android.tools.r8.graph.FieldResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):863:863 -> a
-    73:73: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):232 -> a
+    67:67: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
+    67:67: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):52 -> a
+    67:67:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.computeOrdinalToTargetMap(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo):317 -> a
+    67:67:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):207 -> a
+    68:72:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.computeOrdinalToTargetMap(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo):317:321 -> a
+    68:72:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):207 -> a
+    73:73: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):237:237 -> a
     73:73:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.computeOrdinalToTargetMap(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo):321 -> a
     73:73:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):207 -> a
-    74:74:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.computeOrdinalToTargetMap(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo):322:322 -> a
+    74:74:com.android.tools.r8.graph.FieldResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):813:813 -> a
+    74:74: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):237 -> a
+    74:74:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.computeOrdinalToTargetMap(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo):321 -> a
     74:74:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):207 -> a
-    75:87:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.computeOrdinalToTargetMap(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo):316:328 -> a
-    75:87:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):207 -> a
-    88:88:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.computeOrdinalToTargetMap(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo):327:327 -> a
-    88:88:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):207 -> a
-    89:95:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):212:218 -> a
-    96:96:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):152:152 -> a
-    96:96:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):218 -> a
-    97:97:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):226:226 -> a
-    98:100:int[] com.android.tools.r8.utils.ArrayUtils.fromPredicate(java.util.function.IntPredicate,int):129:131 -> a
-    98:100:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):227 -> a
-    101:109:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):239:247 -> a
-    110:110:void com.android.tools.r8.utils.ArrayUtils.sumOfPredecessorsInclusive(int[]):138:138 -> a
-    110:110:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):251 -> a
-    111:113:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):252:254 -> a
-    114:120:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):253:259 -> a
-    121:121:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray(int[]):167:167 -> a
-    121:121:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray():155 -> a
-    121:121:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):259 -> a
-    122:129:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):260:267 -> a
-    130:130:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):312:312 -> a
-    130:130:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):270 -> a
-    131:131:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
-    131:131:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):312 -> a
+    75:75:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.computeOrdinalToTargetMap(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo):322:322 -> a
+    75:75:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):207 -> a
+    76:88:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.computeOrdinalToTargetMap(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo):316:328 -> a
+    76:88:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):207 -> a
+    89:89:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.computeOrdinalToTargetMap(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo):327:327 -> a
+    89:89:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):207 -> a
+    90:96:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):212:218 -> a
+    97:97:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):152:152 -> a
+    97:97:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):218 -> a
+    98:98:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):226:226 -> a
+    99:101:int[] com.android.tools.r8.utils.ArrayUtils.fromPredicate(java.util.function.IntPredicate,int):129:131 -> a
+    99:101:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):227 -> a
+    102:110:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):239:247 -> a
+    111:111:void com.android.tools.r8.utils.ArrayUtils.sumOfPredecessorsInclusive(int[]):138:138 -> a
+    111:111:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):251 -> a
+    112:114:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):252:254 -> a
+    115:121:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):253:259 -> a
+    122:122:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray(int[]):167:167 -> a
+    122:122:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray():155 -> a
+    122:122:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):259 -> a
+    123:130:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):260:267 -> a
+    131:131:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):312:312 -> a
     131:131:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):270 -> a
-    132:148:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):274:290 -> a
-    149:149:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    149:149:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):290 -> a
-    150:150:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):290:290 -> a
-    151:152:boolean lambda$removeSwitchMaps$0(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet,com.android.tools.r8.ir.code.IntSwitch,int):232:233 -> a
-    153:153:void lambda$removeSwitchMaps$1(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):276:276 -> a
-    154:154:com.android.tools.r8.ir.analysis.value.AbstractValue getEnumFieldValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexField,boolean):350:350 -> a
-    155:155:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isNullOrAbstractValue():0:0 -> a
-    155:155:com.android.tools.r8.ir.analysis.value.AbstractValue getEnumFieldValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexField,boolean):350 -> a
-    156:162:com.android.tools.r8.ir.analysis.value.AbstractValue getEnumFieldValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexField,boolean):351:357 -> a
-    163:163: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):232:232 -> a
-    163:163:com.android.tools.r8.ir.analysis.value.AbstractValue getEnumFieldValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexField,boolean):357 -> a
-    164:164:com.android.tools.r8.graph.FieldResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):863:863 -> a
-    164:164: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):232 -> a
+    132:132:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
+    132:132:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):312 -> a
+    132:132:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):270 -> a
+    133:149:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):274:290 -> a
+    150:150:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
+    150:150:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):290 -> a
+    151:151:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):290:290 -> a
+    152:153:boolean lambda$removeSwitchMaps$0(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet,com.android.tools.r8.ir.code.IntSwitch,int):232:233 -> a
+    154:154:void lambda$removeSwitchMaps$1(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):276:276 -> a
+    155:155:com.android.tools.r8.ir.analysis.value.AbstractValue getEnumFieldValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexField,boolean):350:350 -> a
+    156:156:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isNullOrAbstractValue():0:0 -> a
+    156:156:com.android.tools.r8.ir.analysis.value.AbstractValue getEnumFieldValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexField,boolean):350 -> a
+    157:163:com.android.tools.r8.ir.analysis.value.AbstractValue getEnumFieldValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexField,boolean):351:357 -> a
+    164:164: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):237:237 -> a
     164:164:com.android.tools.r8.ir.analysis.value.AbstractValue getEnumFieldValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexField,boolean):357 -> a
-    165:169:com.android.tools.r8.ir.analysis.value.AbstractValue getEnumFieldValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexField,boolean):357:361 -> a
+    165:165:com.android.tools.r8.graph.FieldResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):813:813 -> a
+    165:165: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):237 -> a
+    165:165:com.android.tools.r8.ir.analysis.value.AbstractValue getEnumFieldValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexField,boolean):357 -> a
+    166:170:com.android.tools.r8.ir.analysis.value.AbstractValue getEnumFieldValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexField,boolean):357:361 -> a
     1:7:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):63:69 -> b
-    8:8:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1030:1030 -> b
+    8:8:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1025:1025 -> b
     8:8:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):70 -> b
     9:33:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):71:95 -> b
     34:34:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> b
     34:34:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):95 -> b
-    35:46:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):95:106 -> b
-    47:49:com.android.tools.r8.ir.analysis.value.SingleNumberValue com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.getOrdinalValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.value.AbstractValue,boolean):343:345 -> b
-    47:49:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):106 -> b
-    50:51:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):108:109 -> b
-    52:52:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> b
-    52:52:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):108 -> b
-    53:53:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):115:115 -> b
-    54:56:com.android.tools.r8.ir.analysis.value.SingleStringValue com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.getNameValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.value.AbstractValue,boolean):336:338 -> b
-    54:56:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):115 -> b
-    57:63:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):121:127 -> b
-    64:64:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> b
-    64:64:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):123 -> b
-    65:71:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):128:134 -> b
-    72:72:boolean com.android.tools.r8.graph.DexClass.isFinal():575:575 -> b
-    72:72:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):135 -> b
-    73:95:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):140:162 -> b
-    96:96:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> b
-    96:96:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):158 -> b
-    97:101:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):163:167 -> b
-    102:102:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> b
-    102:102:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):167 -> b
-    103:105:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):167:169 -> b
-com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$1 -> com.android.tools.r8.internal.xb:
-com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo -> com.android.tools.r8.internal.yb:
+    35:35:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> b
+    35:35:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89 -> b
+    35:35:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):95 -> b
+    36:47:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):95:106 -> b
+    48:50:com.android.tools.r8.ir.analysis.value.SingleNumberValue com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.getOrdinalValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.value.AbstractValue,boolean):343:345 -> b
+    48:50:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):106 -> b
+    51:52:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):108:109 -> b
+    53:53:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> b
+    53:53:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):108 -> b
+    54:54:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):115:115 -> b
+    55:57:com.android.tools.r8.ir.analysis.value.SingleStringValue com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.getNameValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.value.AbstractValue,boolean):336:338 -> b
+    55:57:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):115 -> b
+    58:64:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):121:127 -> b
+    65:65:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> b
+    65:65:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):123 -> b
+    66:100:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):128:162 -> b
+    101:101:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> b
+    101:101:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):158 -> b
+    102:106:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):163:167 -> b
+    107:107:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> b
+    107:107:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):167 -> b
+    108:110:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):167:169 -> b
+com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$1 -> com.android.tools.r8.internal.Ra:
+com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo -> com.android.tools.r8.internal.Sa:
     com.android.tools.r8.ir.code.Instruction ordinalInvoke -> b
     com.android.tools.r8.ir.code.Instruction arrayGet -> c
     com.android.tools.r8.ir.code.Instruction staticGet -> d
@@ -45718,49 +46007,44 @@
     com.android.tools.r8.graph.DexType enumClass -> a
     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.ir.optimize.enums.EnumValueOptimizer$1):364:364 -> <init>
     2:7: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):377:382 -> <init>
-com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator -> com.android.tools.r8.internal.NF:
+com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator -> com.android.tools.r8.internal.dF:
     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):36:36 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableMap):58:60 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getDefaultEnumUnboxingUtility():50:50 -> a
-    2:2:com.android.tools.r8.graph.DexType getNewMemberLocationFor(com.android.tools.r8.graph.DexType):54:54 -> 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>
+    2:4:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableMap):49:51 -> <init>
+    1:1:com.android.tools.r8.graph.DexType getDefaultEnumUnboxingUtility():41:41 -> a
+    2:2:com.android.tools.r8.graph.DexType getNewMemberLocationFor(com.android.tools.r8.graph.DexType):45:45 -> a
     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):54 -> a
-    4:4:com.android.tools.r8.graph.DexType getNewMemberLocationFor(com.android.tools.r8.graph.DexType):54:54 -> a
-com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator$1 -> com.android.tools.r8.internal.LF:
-com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator$Builder -> com.android.tools.r8.internal.MF:
+    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.bF:
+com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator$Builder -> com.android.tools.r8.internal.cF:
     java.util.Map relocationMap -> c
-    com.android.tools.r8.graph.DexProgramClass defaultEnumUnboxingUtility -> b
     com.android.tools.r8.graph.AppView appView -> d
+    com.android.tools.r8.graph.DexType defaultEnumUnboxingUtility -> b
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():67:67 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):72:72 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.AppView):69:73 -> <init>
-    1:9:com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator$Builder synthesizeEnumUnboxingUtilityClasses(java.util.Set,com.android.tools.r8.graph.ProgramPackageCollection,com.android.tools.r8.graph.DirectMappedDexApplication$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder):82:90 -> a
-    10:21:void com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator$Builder.synthesizeRelocationMap(java.util.Set,com.android.tools.r8.graph.ProgramPackageCollection,com.android.tools.r8.graph.DirectMappedDexApplication$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder):110:121 -> a
-    10:21:com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator$Builder synthesizeEnumUnboxingUtilityClasses(java.util.Set,com.android.tools.r8.graph.ProgramPackageCollection,com.android.tools.r8.graph.DirectMappedDexApplication$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder):91 -> a
-    22:23:com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator build():101:102 -> a
-    24:28:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator$Builder.findDeterministicContextType(java.util.Set):192:196 -> a
-    24:28:com.android.tools.r8.graph.DexProgramClass synthesizeUtilityClass(java.util.Set,java.util.Set,com.android.tools.r8.graph.DirectMappedDexApplication$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder):132 -> a
-    29:40:com.android.tools.r8.graph.DexProgramClass synthesizeUtilityClass(java.util.Set,java.util.Set,com.android.tools.r8.graph.DirectMappedDexApplication$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder):133:144 -> a
-    41:41:com.android.tools.r8.graph.FieldAccessFlags com.android.tools.r8.graph.FieldAccessFlags.createPublicStaticSynthetic():62:62 -> a
-    41:41:com.android.tools.r8.graph.DexProgramClass synthesizeUtilityClass(java.util.Set,java.util.Set,com.android.tools.r8.graph.DirectMappedDexApplication$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder):145 -> a
-    42:42:void com.android.tools.r8.graph.DexEncodedField.<init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags):71:71 -> a
-    42:42:com.android.tools.r8.graph.DexProgramClass synthesizeUtilityClass(java.util.Set,java.util.Set,com.android.tools.r8.graph.DirectMappedDexApplication$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder):145 -> a
-    43:85:com.android.tools.r8.graph.DexProgramClass synthesizeUtilityClass(java.util.Set,java.util.Set,com.android.tools.r8.graph.DirectMappedDexApplication$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder):144:186 -> a
-    86:86:com.android.tools.r8.graph.DexProgramClass synthesizeUtilityClass(java.util.Set,java.util.Set,com.android.tools.r8.graph.DirectMappedDexApplication$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder):185:185 -> a
+    1:1:void <clinit>():58:58 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):63:63 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.AppView):60:64 -> <init>
+    1:2:com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator$Builder synthesizeEnumUnboxingUtilityClasses(java.util.Set,com.android.tools.r8.graph.ProgramPackageCollection,com.android.tools.r8.graph.DirectMappedDexApplication$Builder):71:72 -> a
+    3:8:void com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator$Builder.synthesizeRelocationMap(com.android.tools.r8.graph.ProgramPackageCollection,com.android.tools.r8.graph.DirectMappedDexApplication$Builder):86:91 -> a
+    3:8:com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator$Builder synthesizeEnumUnboxingUtilityClasses(java.util.Set,com.android.tools.r8.graph.ProgramPackageCollection,com.android.tools.r8.graph.DirectMappedDexApplication$Builder):73 -> a
+    9:10:com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator build():79:80 -> a
+    11:15:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator$Builder.findDeterministicContextType(java.util.Set):143:147 -> a
+    11:15:com.android.tools.r8.graph.DexType synthesizeUtilityClass(java.util.Set,com.android.tools.r8.graph.DirectMappedDexApplication$Builder):98 -> a
+    16:54:com.android.tools.r8.graph.DexType synthesizeUtilityClass(java.util.Set,com.android.tools.r8.graph.DirectMappedDexApplication$Builder):99:137 -> a
+    55:57:com.android.tools.r8.graph.DexType synthesizeUtilityClass(java.util.Set,com.android.tools.r8.graph.DirectMappedDexApplication$Builder):136:138 -> a
 com.android.tools.r8.ir.optimize.info.AbandonedCallSiteOptimizationInfo -> com.android.tools.r8.internal.a:
     com.android.tools.r8.ir.optimize.info.AbandonedCallSiteOptimizationInfo INSTANCE -> b
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():15:15 -> <init>
     1:1:com.android.tools.r8.ir.optimize.info.AbandonedCallSiteOptimizationInfo getInstance():18:18 -> f
-com.android.tools.r8.ir.optimize.info.BottomCallSiteOptimizationInfo -> com.android.tools.r8.internal.g3:
+com.android.tools.r8.ir.optimize.info.BottomCallSiteOptimizationInfo -> com.android.tools.r8.internal.T2:
     com.android.tools.r8.ir.optimize.info.BottomCallSiteOptimizationInfo INSTANCE -> b
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():12:12 -> <init>
     1:1:com.android.tools.r8.ir.optimize.info.BottomCallSiteOptimizationInfo getInstance():15:15 -> f
-com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo -> com.android.tools.r8.internal.y3:
+com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo -> com.android.tools.r8.internal.l3:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>():16:16 -> <init>
@@ -45791,7 +46075,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.g8:
+com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo -> com.android.tools.r8.internal.I7:
     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
@@ -45802,13 +46086,8 @@
     27:30:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo join(com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):67:70 -> a
     31:31:com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo.top():27:27 -> a
     31:31:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo join(com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):75 -> a
-    32:39:com.android.tools.r8.ir.analysis.type.TypeElement[] com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo.getStaticTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):79:86 -> a
-    32:39:boolean hasUsefulOptimizationInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):95 -> a
-    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getParameter(int):398:398 -> a
-    40:40:com.android.tools.r8.ir.analysis.type.TypeElement[] com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo.getStaticTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):88 -> a
-    40:40:boolean hasUsefulOptimizationInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):95 -> a
-    41:41:com.android.tools.r8.ir.analysis.type.TypeElement[] com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo.getStaticTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):88:88 -> a
-    41:41:boolean hasUsefulOptimizationInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):95 -> a
+    32:41:com.android.tools.r8.ir.analysis.type.TypeElement[] com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo.getStaticTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):79:88 -> a
+    32:41:boolean hasUsefulOptimizationInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):95 -> a
     42:72:boolean hasUsefulOptimizationInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):96:126 -> a
     73:78:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractArgumentValue(int):142:147 -> a
     79:106:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fromArguments(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,java.util.List,com.android.tools.r8.graph.ProgramMethod):156:183 -> a
@@ -45820,7 +46099,7 @@
     1:6:boolean equals(java.lang.Object):209:214 -> equals
     1:2:int hashCode():219:220 -> hashCode
     1:2:java.lang.String toString():225:226 -> toString
-com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo -> com.android.tools.r8.internal.c9:
+com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo -> com.android.tools.r8.internal.B8:
     com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo INSTANCE -> b
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():16:16 -> <init>
@@ -45830,10 +46109,10 @@
     com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType() -> e
     int getReadBits() -> f
     boolean isDead() -> g
-    1:1:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():24:24 -> i
-    boolean valueHasBeenPropagated() -> j
-    1:1:com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo getInstance():19:19 -> k
-com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo -> com.android.tools.r8.internal.j9:
+    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.H8:
     com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo DEFAULT_INSTANCE -> a
     boolean UNKNOWN_MAY_HAVE_SIDE_EFFECTS -> e
     boolean $assertionsDisabled -> f
@@ -45873,27 +46152,30 @@
     boolean neverReturnsNormally() -> x
     boolean returnValueHasBeenPropagated() -> y
     boolean returnValueOnlyDependsOnArguments() -> z
-com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo -> com.android.tools.r8.internal.jc:
+com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo -> com.android.tools.r8.internal.Cb:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():15:15 -> <init>
     com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo asMutableFieldOptimizationInfo() -> a
-    1:13:com.android.tools.r8.ir.analysis.type.ClassTypeElement getExactClassType(com.android.tools.r8.graph.AppView):34:46 -> a
+    1:7:com.android.tools.r8.ir.analysis.type.ClassTypeElement getExactClassType(com.android.tools.r8.graph.AppView):34:40 -> a
+    8:8:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    8:8:com.android.tools.r8.ir.analysis.type.ClassTypeElement getExactClassType(com.android.tools.r8.graph.AppView):43 -> a
+    9:11:com.android.tools.r8.ir.analysis.type.ClassTypeElement getExactClassType(com.android.tools.r8.graph.AppView):44:46 -> a
     boolean cannotBeKept() -> b
     com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue() -> c
     com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType() -> d
     com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType() -> e
     int getReadBits() -> f
     boolean isDead() -> g
-    boolean isDefaultFieldOptimizationInfo() -> h
-    com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy() -> i
-    boolean valueHasBeenPropagated() -> j
-com.android.tools.r8.ir.optimize.info.LibraryOptimizationInfoInitializerFeedback -> com.android.tools.r8.internal.zo:
+    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.Dn:
     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.ar:
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo -> com.android.tools.r8.internal.Zp:
     1:1:void <init>():20:20 -> <init>
     boolean returnsArgument() -> A
     boolean triggersClassInitBeforeAnySideEffect() -> B
@@ -45925,13 +46207,13 @@
     boolean neverReturnsNormally() -> x
     boolean returnValueHasBeenPropagated() -> y
     boolean returnValueOnlyDependsOnArguments() -> z
-com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo$InlinePreference -> com.android.tools.r8.internal.ar$a:
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo$InlinePreference -> com.android.tools.r8.internal.Zp$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>():23:25 -> <clinit>
     1:1:void <init>(java.lang.String,int):22:22 -> <init>
-com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector -> com.android.tools.r8.internal.cr:
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector -> com.android.tools.r8.internal.bq:
     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
@@ -46066,184 +46348,212 @@
     406:406: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):441 -> a
     406:406: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):414 -> a
     406:406: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
-    407:422: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):574:589 -> a
-    407:422: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):441 -> a
-    407:422: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):414 -> a
-    407:422: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
-    423:427: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:592 -> a
-    423:427: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):441 -> a
-    423:427: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):414 -> a
-    423:427: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
-    428:428:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):220:220 -> a
-    428:428: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):592 -> a
-    428:428: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):441 -> a
-    428:428: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):414 -> a
-    428:428: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
-    429:441: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):593:605 -> a
-    429:441: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):441 -> a
-    429:441: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):414 -> a
-    429:441: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
-    442:469: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):585:612 -> a
-    442:469: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):441 -> a
-    442:469: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):414 -> a
-    442:469: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
-    470:477: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):545:552 -> a
-    470:477: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):441 -> a
-    470:477: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):414 -> a
-    470:477: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
-    478:478:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):220:220 -> a
-    478:478: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
-    478:478: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):441 -> a
-    478:478: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):414 -> a
-    478:478: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
-    479:479: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:553 -> a
+    407:407:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    407:407:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89 -> a
+    407:407: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 -> a
+    407:407: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):441 -> a
+    407:407: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):414 -> a
+    407:407: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
+    408:423: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):574:589 -> a
+    408:423: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):441 -> a
+    408:423: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):414 -> a
+    408:423: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
+    424:428: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:592 -> a
+    424:428: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):441 -> a
+    424:428: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):414 -> a
+    424:428: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
+    429:429:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):220:220 -> a
+    429:429: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):592 -> a
+    429:429: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):441 -> a
+    429:429: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):414 -> a
+    429:429: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
+    430:442: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):593:605 -> a
+    430:442: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):441 -> a
+    430:442: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):414 -> a
+    430:442: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
+    443:470: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):585:612 -> a
+    443:470: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):441 -> a
+    443:470: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):414 -> a
+    443:470: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
+    471:478: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):545:552 -> a
+    471:478: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):441 -> a
+    471:478: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):414 -> a
+    471:478: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
+    479:479:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):220:220 -> a
+    479:479: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
     479:479: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):441 -> a
     479:479: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):414 -> a
     479:479: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
-    480:480:boolean com.android.tools.r8.ir.code.FieldInstruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):62:62 -> a
-    480:480: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 -> a
+    480:480: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:553 -> a
     480:480: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):441 -> a
     480:480: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):414 -> a
     480:480: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
-    481:484: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:557 -> a
-    481:484: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):441 -> a
-    481:484: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):414 -> a
-    481:484: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
-    485:485:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):220:220 -> a
-    485:485: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 -> a
-    485:485: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):441 -> a
-    485:485: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):414 -> a
-    485:485: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
-    486:490: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):560:564 -> a
-    486:490: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):441 -> a
-    486:490: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):414 -> a
-    486:490: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
-    491:499: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):526:534 -> a
-    491:499: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):441 -> a
-    491:499: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):414 -> a
-    491:499: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
-    500:500:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    500:500: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):535 -> a
-    500:500: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):441 -> a
-    500:500: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):414 -> a
-    500:500: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
-    501:501: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):537:537 -> a
+    481:481:boolean com.android.tools.r8.ir.code.FieldInstruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):62:62 -> a
+    481:481: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 -> a
+    481:481: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):441 -> a
+    481:481: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):414 -> a
+    481:481: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
+    482:485: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:557 -> a
+    482:485: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):441 -> a
+    482:485: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):414 -> a
+    482:485: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
+    486:486:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):220:220 -> a
+    486:486: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 -> a
+    486:486: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):441 -> a
+    486:486: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):414 -> a
+    486:486: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
+    487:491: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):560:564 -> a
+    487:491: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):441 -> a
+    487:491: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):414 -> a
+    487:491: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
+    492:500: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):526:534 -> a
+    492:500: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):441 -> a
+    492:500: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):414 -> a
+    492:500: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
+    501:501:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    501:501: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):535 -> a
     501:501: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):441 -> a
     501:501: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):414 -> a
     501:501: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
-    502:702: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):490:690 -> a
-    502:702: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):441 -> a
-    502:702: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):414 -> a
-    502:702: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
-    703:703: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):443:443 -> a
-    703:703: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):414 -> a
-    703:703: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
-    704:704: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
+    502:502: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):537:537 -> a
+    502:502: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):441 -> a
+    502:502: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):414 -> a
+    502:502: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
+    503:703: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):490:690 -> a
+    503:703: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):441 -> a
+    503:703: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):414 -> a
+    503:703: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
+    704:704: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):443:443 -> a
     704:704: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):414 -> a
     704:704: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
-    705:705: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):415:415 -> a
+    705:705: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
+    705:705: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):414 -> a
     705:705: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
-    706:708: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):1066:1068 -> a
-    706:708: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
-    709:709: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):1151:1151 -> a
-    709:709: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
-    710:716: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):1158:1164 -> a
-    710:716: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):1152 -> a
-    710:716: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
-    717:717: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):1153:1153 -> a
-    717:717: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
-    718:718:java.util.BitSet 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):1170:1170 -> a
-    718:718: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):159 -> a
-    719:741:java.util.BitSet 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):1179:1201 -> a
-    719:741:java.util.BitSet 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):1171 -> a
-    719:741: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):159 -> a
-    742:742:java.util.BitSet 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):1172:1172 -> a
-    742:742: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):159 -> a
-    743:743: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,java.util.BitSet,com.android.tools.r8.utils.Timing):1209:1209 -> a
-    743:743: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):160 -> a
-    744:757: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,java.util.BitSet):1216:1229 -> a
-    744:757: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,java.util.BitSet,com.android.tools.r8.utils.Timing):1210 -> a
-    744:757: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):160 -> a
-    758:783:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isNonNullOnNormalExit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):1241:1266 -> a
-    758:783: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,java.util.BitSet):1230 -> a
-    758:783: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,java.util.BitSet,com.android.tools.r8.utils.Timing):1210 -> a
-    758:783: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):160 -> a
-    784:829: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):1280:1325 -> a
-    784:829:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isNonNullOnNormalExit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):1267 -> a
-    784:829: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,java.util.BitSet):1230 -> a
-    784:829: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,java.util.BitSet,com.android.tools.r8.utils.Timing):1210 -> a
-    784: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):160 -> a
-    830:834: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,java.util.BitSet):1231:1235 -> a
-    830:834: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,java.util.BitSet,com.android.tools.r8.utils.Timing):1210 -> a
-    830:834: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):160 -> a
-    835:835: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,java.util.BitSet,com.android.tools.r8.utils.Timing):1211:1211 -> a
-    835:835: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):160 -> a
-    836:838:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):191:193 -> a
-    839:839:boolean com.android.tools.r8.graph.DexEncodedMethod.isNative():497:497 -> a
-    839:839:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):194 -> a
-    840:935:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):195:290 -> a
-    936:942:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):265:271 -> a
-    943:947:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):249:253 -> a
-    948:961:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):228:241 -> a
-    962:962:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():505:505 -> a
-    962:962:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):305 -> a
-    963:969:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):305:311 -> a
-    970:970:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):307:307 -> a
-    971:971:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):220:220 -> a
-    971:971: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):213 -> a
-    972:972:boolean couldBeReceiverValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.AliasedValueConfiguration):695:695 -> a
-    973:973:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):220:220 -> a
-    973:973:boolean couldBeReceiverValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.AliasedValueConfiguration):699 -> a
-    974:974:boolean triggersClassInitializationBeforeSideEffect(com.android.tools.r8.ir.code.IRCode):733:733 -> a
-    975:977: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):736:738 -> a
-    978:997: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):737:756 -> a
-    998:1056:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):768:826 -> a
-    1057:1096:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):787:826 -> a
-    1097:1109:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):814:826 -> a
-    1110:1110:boolean checksNullBeforeSideEffect(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):837:837 -> a
-    1111:1119: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):840:848 -> a
-    1120:1129: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):915:924 -> a
-    1120:1129: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):848 -> a
-    1130:1130:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():164:164 -> a
-    1130:1130: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):925 -> a
-    1130:1130: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):848 -> a
-    1131:1131: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):926:926 -> a
-    1131:1131: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):848 -> a
-    1132:1134: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):849:851 -> a
-    1135:1145:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isKotlinThrowParameterIsNullException(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeStatic):934:944 -> a
-    1135:1145: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):851 -> a
-    1146:1156: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):854:864 -> a
-    1157:1164: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):959:966 -> a
-    1157:1164: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):864 -> a
-    1165:1176: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):865:876 -> a
-    1177:1177:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
-    1177:1177: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):879 -> a
-    1178:1184: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):879:885 -> a
-    1185:1187:boolean isNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):948:950 -> a
-    1188:1200:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1074:1086 -> a
-    1201:1201:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.isNone():32:32 -> a
-    1201:1201:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1087 -> a
-    1202:1203:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1088:1089 -> a
-    1204:1204:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.canBePostponed():28:28 -> a
-    1204:1204:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1090 -> a
-    1205:1211:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1091:1097 -> a
-    1212:1212:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1096:1096 -> a
-    1213:1213:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():505:505 -> a
-    1213:1213:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1110 -> a
-    1214:1214:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1113:1113 -> a
-    1215:1224:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexProgramClass):1135:1144 -> a
-    1215:1224:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1113 -> a
-    1225:1233:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1121:1129 -> a
-    1234:1238:boolean lambda$computeMayHaveSideEffects$3(com.android.tools.r8.graph.DexProgramClass):1099:1103 -> a
-    boolean lambda$computeMayHaveSideEffects$4(com.android.tools.r8.graph.DexProgramClass) -> b
-com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect -> com.android.tools.r8.internal.br:
+    706:706: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):415:415 -> a
+    706:706: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
+    707:707: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):1066:1066 -> a
+    707:707: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
+    708:720: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:1086 -> a
+    708:720: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):1067 -> a
+    708:720: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
+    721:721:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.isNone():32:32 -> a
+    721:721: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):1087 -> a
+    721:721: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):1067 -> a
+    721:721: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
+    722:723: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):1088:1089 -> a
+    722:723: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):1067 -> a
+    722:723: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
+    724:724:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.canBePostponed():28:28 -> a
+    724:724: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):1090 -> a
+    724:724: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):1067 -> a
+    724:724: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
+    725:727: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):1091:1093 -> a
+    725:727: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):1067 -> a
+    725:727: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
+    728:729:boolean com.android.tools.r8.graph.DexType.isD8R8SynthesizedLambdaClassType():306:307 -> a
+    728:729: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 -> a
+    728:729: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):1067 -> a
+    728:729: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
+    730:734: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:1093 -> a
+    730:734: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):1067 -> a
+    730:734: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
+    738:738: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):1097:1097 -> a
+    738:738: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):1067 -> a
+    738:738: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
+    739:739:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():518:518 -> a
+    739:739: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):1102 -> a
+    739:739: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):1067 -> a
+    739:739: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
+    740:740: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):1105:1105 -> a
+    740:740: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):1067 -> a
+    740:740: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
+    741:750:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexProgramClass):1127:1136 -> a
+    741:750: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):1105 -> a
+    741:750: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):1067 -> a
+    741:750: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
+    751:759: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):1113:1121 -> a
+    751:759: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):1067 -> a
+    751:759: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
+    760:760: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):1068:1068 -> a
+    760:760: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
+    761:761: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):1143:1143 -> a
+    761:761: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
+    762:768: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):1150:1156 -> a
+    762:768: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):1144 -> a
+    762:768: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
+    769:769: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):1145:1145 -> a
+    769:769: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
+    770:770: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):1162:1162 -> a
+    770:770: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):159 -> a
+    771:793: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):1170:1192 -> a
+    771:793: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):1163 -> a
+    771:793: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):159 -> a
+    794:794: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):1164:1164 -> a
+    794:794: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):159 -> a
+    795:795: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):1198:1198 -> a
+    795:795: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):160 -> a
+    796:827: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):1204:1235 -> a
+    796:827: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):1199 -> a
+    796: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):160 -> a
+    828:873: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):1257:1302 -> a
+    828:873: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):1236 -> a
+    828:873: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):1199 -> a
+    828:873: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):160 -> a
+    874:879: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):1242:1247 -> a
+    874:879: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):1199 -> a
+    874: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):160 -> a
+    880:880: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):1200:1200 -> 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):160 -> a
+    881:883:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):191:193 -> a
+    884:884:boolean com.android.tools.r8.graph.DexEncodedMethod.isNative():506:506 -> a
+    884:884:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):194 -> a
+    885:980:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):195:290 -> a
+    981:987:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):265:271 -> a
+    988:992:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):249:253 -> a
+    993:1006:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):228:241 -> a
+    1007:1007:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():518:518 -> a
+    1007:1007:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):305 -> a
+    1008:1014:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):305:311 -> a
+    1015:1015:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):307:307 -> a
+    1016:1016:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):220:220 -> a
+    1016:1016: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):213 -> a
+    1017:1017:boolean couldBeReceiverValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.AliasedValueConfiguration):695:695 -> a
+    1018:1018:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):220:220 -> a
+    1018:1018:boolean couldBeReceiverValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.AliasedValueConfiguration):699 -> a
+    1019:1019:boolean triggersClassInitializationBeforeSideEffect(com.android.tools.r8.ir.code.IRCode):733:733 -> a
+    1020:1022: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):736:738 -> a
+    1023:1042: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):737:756 -> a
+    1043:1101:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):768:826 -> a
+    1102:1141:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):787:826 -> a
+    1142:1154:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):814:826 -> a
+    1155:1155:boolean checksNullBeforeSideEffect(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):837:837 -> a
+    1156:1164: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):840:848 -> a
+    1165:1174: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):915:924 -> a
+    1165:1174: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):848 -> a
+    1175:1175:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():164:164 -> a
+    1175:1175: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):925 -> a
+    1175:1175: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):848 -> a
+    1176:1176: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):926:926 -> a
+    1176:1176: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):848 -> a
+    1177:1179: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):849:851 -> a
+    1180:1190:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isKotlinThrowParameterIsNullException(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeStatic):934:944 -> a
+    1180:1190: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):851 -> a
+    1191:1201: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):854:864 -> a
+    1202:1209: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):959:966 -> a
+    1202:1209: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):864 -> a
+    1210:1221: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):865:876 -> a
+    1222:1222:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
+    1222:1222: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):879 -> a
+    1223:1229: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):879:885 -> a
+    1230:1232:boolean isNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):948:950 -> a
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect -> com.android.tools.r8.internal.aq:
     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>():904:907 -> <clinit>
     1:1:void <init>(java.lang.String,int):903:903 -> <init>
-com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo -> com.android.tools.r8.internal.Xr:
+com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo -> com.android.tools.r8.internal.Rq:
     com.android.tools.r8.ir.analysis.type.ClassTypeElement dynamicLowerBoundType -> f
     int flags -> d
     int readBits -> e
@@ -46265,21 +46575,21 @@
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType():105:105 -> e
     1:1:int getReadBits():78:78 -> f
     1:1:boolean isDead():114:114 -> g
-    1:2:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():58:59 -> i
-    1:1:boolean valueHasBeenPropagated():123:123 -> j
-    1:1:void markAsDead():118:118 -> k
-    1:1:void markAsPropagated():127:127 -> l
-    1:1:void markCannotBeKept():91:91 -> m
-com.android.tools.r8.ir.optimize.info.OptimizationFeedback -> com.android.tools.r8.internal.su:
+    1:2:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():58:59 -> h
+    1:1:boolean valueHasBeenPropagated():123:123 -> i
+    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.mt:
     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.su$a:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer -> com.android.tools.r8.internal.mt$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.tu:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed -> com.android.tools.r8.internal.nt:
     java.util.Map fieldOptimizationInfos -> c
     java.util.Map methodOptimizationInfos -> d
     boolean $assertionsDisabled -> a
@@ -46360,7 +46670,7 @@
     void markMethodCannotBeKept(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>():26:26 -> <init>
-com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple -> com.android.tools.r8.internal.uu:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple -> com.android.tools.r8.internal.ot:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple INSTANCE -> a
     1:1:void <clinit>():26:26 -> <clinit>
     1:1:void <init>():28:28 -> <init>
@@ -46395,7 +46705,7 @@
     1:1:void classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod):206:206 -> f
     1:1:void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod):86:86 -> g
     1:1:void unsetAbstractReturnValue(com.android.tools.r8.graph.DexEncodedMethod):108:108 -> h
-com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo -> com.android.tools.r8.internal.Yu:
+com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo -> com.android.tools.r8.internal.Rt:
     boolean $assertionsDisabled -> a
     com.android.tools.r8.com.google.common.collect.ImmutableList parametersUsages -> b
     1:1:void <clinit>():31:31 -> <clinit>
@@ -46407,7 +46717,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.Yu$a:
+com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage -> com.android.tools.r8.internal.Rt$a:
     java.util.Set ifZeroTest -> c
     boolean isUsedInMonitor -> i
     java.util.List callsReceiver -> d
@@ -46420,7 +46730,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.Zu:
+com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsageBuilder -> com.android.tools.r8.internal.St:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> d
     java.util.List callsOnReceiver -> f
     boolean isAssignedToField -> i
@@ -46469,12 +46779,12 @@
     50:50:boolean note(com.android.tools.r8.ir.code.InvokeMethodWithReceiver):239:239 -> a
     51:56:boolean note(com.android.tools.r8.ir.code.InvokeMethodWithReceiver):238:243 -> a
     57:57: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.VE:
+com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo -> com.android.tools.r8.internal.OD:
     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.mG:
+com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo -> com.android.tools.r8.internal.CF:
     com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo bridgeInfo -> i
     java.util.BitSet nonNullParamOrThrow -> m
     com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo parametersUsages -> l
@@ -46579,24 +46889,24 @@
     1:1:boolean neverReturnsNormally():308:308 -> x
     1:1:boolean returnValueHasBeenPropagated():499:499 -> y
     1:1:boolean returnValueOnlyDependsOnArguments():367:367 -> z
-com.android.tools.r8.ir.optimize.info.bridge.BridgeAnalyzer -> com.android.tools.r8.internal.l3:
+com.android.tools.r8.ir.optimize.info.bridge.BridgeAnalyzer -> com.android.tools.r8.internal.Y2:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():22:22 -> <clinit>
     1:11:boolean com.android.tools.r8.ir.optimize.info.bridge.BridgeAnalyzer.analyzeCheckCastBeforeInvoke(com.android.tools.r8.ir.code.CheckCast):99:109 -> a
     1:11:boolean analyzeCheckCast(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InvokeMethod):94 -> a
-    12:12:boolean com.android.tools.r8.ir.code.Value.hasSingleUniqueUser():350:350 -> a
+    12:12:boolean com.android.tools.r8.ir.code.Value.hasSingleUniqueUser():347:347 -> a
     12:12:boolean com.android.tools.r8.ir.optimize.info.bridge.BridgeAnalyzer.analyzeCheckCastBeforeInvoke(com.android.tools.r8.ir.code.CheckCast):109 -> a
     12:12:boolean analyzeCheckCast(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InvokeMethod):94 -> a
     13:30:boolean com.android.tools.r8.ir.optimize.info.bridge.BridgeAnalyzer.analyzeCheckCastBeforeInvoke(com.android.tools.r8.ir.code.CheckCast):112:129 -> a
     13:30:boolean analyzeCheckCast(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InvokeMethod):94 -> a
     31:39: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):138:146 -> a
     31:39:boolean analyzeCheckCast(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InvokeMethod):95 -> a
-    40:40:boolean com.android.tools.r8.ir.code.Value.hasSingleUniqueUser():350:350 -> a
+    40:40:boolean com.android.tools.r8.ir.code.Value.hasSingleUniqueUser():347:347 -> a
     40:40: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):147 -> a
     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():489:489 -> a
+    42:42:boolean com.android.tools.r8.graph.DexEncodedMethod.isBridge():498:498 -> 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
@@ -46605,13 +46915,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.YG:
+com.android.tools.r8.ir.optimize.info.bridge.VirtualBridgeInfo -> com.android.tools.r8.internal.qG:
     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.Ja:
+com.android.tools.r8.ir.optimize.info.field.EmptyInstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.ea:
     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>
@@ -46621,7 +46931,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.Of:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldArgumentInitializationInfo -> com.android.tools.r8.internal.af:
     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
@@ -46629,14 +46939,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.Pf:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo -> com.android.tools.r8.internal.bf:
     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.Rf:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.df:
     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
@@ -46644,19 +46954,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.Qf:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder -> com.android.tools.r8.internal.cf:
     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):54:55 -> a
     3:6:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection build():60:63 -> a
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory -> com.android.tools.r8.internal.Sf:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory -> com.android.tools.r8.internal.ef:
     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.Uf:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldTypeInitializationInfo -> com.android.tools.r8.internal.gf:
     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>
@@ -46666,7 +46976,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.Hs:
+com.android.tools.r8.ir.optimize.info.field.NonTrivialInstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.Br:
     java.util.TreeMap infos -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():22:22 -> <clinit>
@@ -46682,13 +46992,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.WF:
+com.android.tools.r8.ir.optimize.info.field.UnknownInstanceFieldInitializationInfo -> com.android.tools.r8.internal.mF:
     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.ContextInsensitiveInstanceInitializerInfoCollection -> com.android.tools.r8.internal.D8:
+com.android.tools.r8.ir.optimize.info.initializer.ContextInsensitiveInstanceInitializerInfoCollection -> com.android.tools.r8.internal.e8:
     com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo info -> a
     1:2:void <init>(com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo):17:18 -> <init>
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo com.android.tools.r8.ir.optimize.info.initializer.ContextInsensitiveInstanceInitializerInfoCollection.get(com.android.tools.r8.ir.code.InvokeDirect):28:28 -> a
@@ -46697,7 +47007,7 @@
     2:4:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):12 -> a
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo com.android.tools.r8.ir.optimize.info.initializer.ContextInsensitiveInstanceInitializerInfoCollection.getContextInsensitive():23:23 -> b
     1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getContextInsensitive():12 -> b
-com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo -> com.android.tools.r8.internal.g9:
+com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo -> com.android.tools.r8.internal.E8:
     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>
@@ -46708,7 +47018,7 @@
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet():44:44 -> f
     boolean receiverNeverEscapesOutsideConstructorChain() -> g
     1:1:com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo getInstance():24:24 -> h
-com.android.tools.r8.ir.optimize.info.initializer.EmptyInstanceInitializerInfoCollection -> com.android.tools.r8.internal.Ka:
+com.android.tools.r8.ir.optimize.info.initializer.EmptyInstanceInitializerInfoCollection -> com.android.tools.r8.internal.fa:
     com.android.tools.r8.ir.optimize.info.initializer.EmptyInstanceInitializerInfoCollection EMPTY -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():17:17 -> <init>
@@ -46718,7 +47028,7 @@
     1:1:com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo com.android.tools.r8.ir.optimize.info.initializer.EmptyInstanceInitializerInfoCollection.getContextInsensitive():25:25 -> b
     1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getContextInsensitive():12 -> b
     1:1:com.android.tools.r8.ir.optimize.info.initializer.EmptyInstanceInitializerInfoCollection getInstance():20:20 -> c
-com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo -> com.android.tools.r8.internal.Xf:
+com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo -> com.android.tools.r8.internal.jf:
     1:1:void <init>():14:14 -> <init>
     com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo asNonTrivialInstanceInitializerInfo() -> a
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection fieldInitializationInfos() -> b
@@ -46727,7 +47037,7 @@
     boolean mayHaveOtherSideEffectsThanInstanceFieldAssignments() -> e
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet() -> f
     boolean receiverNeverEscapesOutsideConstructorChain() -> g
-com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection -> com.android.tools.r8.internal.Yf:
+com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection -> com.android.tools.r8.internal.kf:
     1:1:void <init>():14:14 -> <init>
     com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo get(com.android.tools.r8.ir.code.InvokeDirect) -> a
     1:1:boolean com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo.isNonTrivialInstanceInitializerInfo():0:0 -> a
@@ -46738,7 +47048,7 @@
     com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> a
     5:5:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection empty():21:21 -> a
     com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getContextInsensitive() -> b
-com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo -> com.android.tools.r8.internal.Ks:
+com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo -> com.android.tools.r8.internal.Er:
     com.android.tools.r8.graph.DexMethod parent -> f
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
@@ -46751,7 +47061,7 @@
     com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo asNonTrivialInstanceInitializerInfo() -> a
     1:1:boolean verifyNoUnknownBits(int):56:56 -> a
     2:5:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):98:101 -> a
-    6:6:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):320:320 -> a
+    6:6:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):321:321 -> a
     6:6:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):102 -> a
     7:7:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):102:102 -> a
     1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection fieldInitializationInfos():72:72 -> b
@@ -46761,8 +47071,8 @@
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet():77:77 -> f
     1:1:boolean receiverNeverEscapesOutsideConstructorChain():92:92 -> g
     1:1:java.lang.String toString():107:107 -> toString
-com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$1 -> com.android.tools.r8.internal.Is:
-com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder -> com.android.tools.r8.internal.Js:
+com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$1 -> com.android.tools.r8.internal.Cr:
+com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder -> com.android.tools.r8.internal.Dr:
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection instanceFieldInitializationInfos -> b
     com.android.tools.r8.graph.DexMethod parent -> e
     boolean $assertionsDisabled -> a
@@ -46822,7 +47132,7 @@
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder setInstanceFieldInitializationMayDependOnEnvironment():180:180 -> f
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder setMayHaveOtherSideEffectsThanInstanceFieldAssignments():189:189 -> g
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder setReceiverMayEscapeOutsideConstructorChain():194:194 -> h
-com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy -> com.android.tools.r8.internal.f9:
+com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy -> com.android.tools.r8.internal.D8:
     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
@@ -46837,10 +47147,10 @@
     28:30: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
     31:33: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
     34:35: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.yc:
+com.android.tools.r8.ir.optimize.inliner.FixedInliningReasonStrategy -> com.android.tools.r8.internal.Rb:
     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.Gf:
+com.android.tools.r8.ir.optimize.inliner.InlinerUtils -> com.android.tools.r8.internal.Se:
     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
@@ -46849,7 +47159,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.Hf:
+com.android.tools.r8.ir.optimize.inliner.InliningIRProvider -> com.android.tools.r8.internal.Te:
     com.android.tools.r8.ir.conversion.MethodProcessor methodProcessor -> e
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
@@ -46867,9 +47177,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.Jf:
+com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy -> com.android.tools.r8.internal.Ve:
     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.Ls:
+com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter -> com.android.tools.r8.internal.Fr:
     com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter INSTANCE -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():18:18 -> <init>
@@ -46907,7 +47217,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.gH:
+com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter -> com.android.tools.r8.internal.yG:
     1:1:void <init>():18:18 -> <init>
     void reportCallerNotSameClass() -> a
     void reportIncorrectArity(int,int) -> a
@@ -46944,7 +47254,7 @@
     void reportRecursiveMethod() -> v
     void reportUnknownTarget() -> w
     boolean unsetReasonHasBeenReportedFlag() -> x
-com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporterImpl -> com.android.tools.r8.internal.hH:
+com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporterImpl -> com.android.tools.r8.internal.zG:
     boolean reasonHasBeenReported -> e
     boolean $assertionsDisabled -> a
     com.android.tools.r8.graph.ProgramMethod callee -> b
@@ -46988,7 +47298,7 @@
     1:1:void reportRecursiveMethod():209:209 -> v
     1:1:void reportUnknownTarget():214:214 -> w
     1:2:boolean unsetReasonHasBeenReportedFlag():270:271 -> x
-com.android.tools.r8.ir.optimize.lambda.CaptureSignature -> com.android.tools.r8.internal.D3:
+com.android.tools.r8.ir.optimize.lambda.CaptureSignature -> com.android.tools.r8.internal.q3:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList SINGLE_LIST -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList EMPTY_LIST -> a
     boolean $assertionsDisabled -> c
@@ -47009,7 +47319,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.v7:
+com.android.tools.r8.ir.optimize.lambda.CodeProcessor -> com.android.tools.r8.internal.g7:
     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
@@ -47107,7 +47417,7 @@
     90:96:java.lang.Void com.android.tools.r8.ir.optimize.lambda.CodeProcessor.visit(com.android.tools.r8.ir.code.Argument):403:409 -> a
     90:96: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.t7:
+com.android.tools.r8.ir.optimize.lambda.CodeProcessor$1 -> com.android.tools.r8.internal.e7:
     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 isValidInstanceFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> a
@@ -47123,7 +47433,7 @@
     boolean isValidInstanceFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> b
     boolean isValidStaticFieldRead(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.u7:
+com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy -> com.android.tools.r8.internal.f7:
     boolean isValidHolder(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType) -> a
     boolean isValidInstanceFieldRead(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
@@ -47138,7 +47448,7 @@
     boolean isValidInstanceFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> b
     boolean isValidStaticFieldRead(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.Hn:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroup -> com.android.tools.r8.internal.Mm:
     java.util.Map lambdas -> d
     com.android.tools.r8.ir.optimize.lambda.LambdaGroupId id -> b
     com.android.tools.r8.graph.DexType classType -> c
@@ -47175,14 +47485,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.Gn:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo -> com.android.tools.r8.internal.Lm:
     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.Hn$a:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaStructureError -> com.android.tools.r8.internal.Mm$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.In:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder -> com.android.tools.r8.internal.Nm:
     java.lang.String origin -> n
     com.android.tools.r8.graph.DexItemFactory factory -> m
     com.android.tools.r8.ir.optimize.lambda.LambdaGroup group -> l
@@ -47198,9 +47508,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.Jn:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroupId -> com.android.tools.r8.internal.Om:
     com.android.tools.r8.ir.optimize.lambda.LambdaGroup createGroup() -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger -> com.android.tools.r8.internal.Tn:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger -> com.android.tools.r8.internal.Ym:
     java.util.Map lambdas -> b
     com.android.tools.r8.kotlin.Kotlin kotlin -> g
     java.util.Map groups -> c
@@ -47212,147 +47522,141 @@
     com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder methodsToReprocess -> e
     com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor lambdaChecker -> k
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():104:104 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):218:218 -> <init>
-    2:44:void <init>(com.android.tools.r8.graph.AppView):184:226 -> <init>
-    1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):104:104 -> a
-    2:2:void access$600(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.ProgramMethod):104:104 -> a
-    3:3:void com.android.tools.r8.ir.optimize.lambda.LambdaMerger.queueForProcessing(com.android.tools.r8.graph.ProgramMethod):248:248 -> a
-    3:3:void access$600(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.ProgramMethod):104 -> a
-    4:4:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():164:164 -> a
-    4:4:void lambda$applyLambdaClassMapping$4(com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.graph.DexEncodedField):382 -> a
-    5:5:void lambda$applyLambdaClassMapping$4(com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.graph.DexEncodedField):382:382 -> a
-    6:6:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():164:164 -> a
-    6:6:void lambda$applyLambdaClassMapping$4(com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.graph.DexEncodedField):383 -> a
-    7:7:void lambda$applyLambdaClassMapping$4(com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.graph.DexEncodedField):383:383 -> a
-    8:8:void invalidateLambda(com.android.tools.r8.graph.DexType):236:236 -> a
-    9:35:void collectGroupCandidates(com.android.tools.r8.graph.DexApplication):256:282 -> a
-    36:37:void analyzeCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):296:297 -> a
-    38:40: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.ir.conversion.MethodProcessor):313:315 -> a
-    41:41: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.ir.conversion.MethodProcessor):314:314 -> a
-    42:43:void rewriteCodeForInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):330:331 -> a
-    44:45:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,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):343:344 -> a
-    46:46:com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses.empty():31:31 -> a
-    46:46:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,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):344 -> a
-    47:56:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,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):344:353 -> a
-    57:74:com.android.tools.r8.com.google.common.collect.BiMap com.android.tools.r8.ir.optimize.lambda.LambdaMerger.finalizeLambdaGroups(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):444:461 -> a
-    57:74:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,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):357 -> a
-    75:80:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,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):361:366 -> a
-    81:81:com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier.builder():65:65 -> a
-    81:81:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,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):369 -> a
-    82:108:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,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):372:398 -> a
-    109:109:java.util.Set com.android.tools.r8.com.google.common.collect.HashBiMap.values():469:469 -> a
-    109:109:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,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):400 -> a
-    110:117:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,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):400:407 -> a
-    118:118:void lambda$applyLambdaClassMapping$5(com.android.tools.r8.graph.DexEncodedMethod):394:394 -> a
-    119:148:void analyzeLambdaClassesStructure(java.util.concurrent.ExecutorService):411:440 -> a
-    149:151:void lambda$analyzeLambdaClassesStructure$7(java.util.List,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):417:417 -> a
-    152:165:void lambda$analyzeLambdaClassesStructure$6(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):421:434 -> a
-    166:173:void lambda$analyzeLambdaClassesStructure$6(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):429:436 -> a
-    174:174:void com.android.tools.r8.ir.optimize.lambda.LambdaMerger.invalidateLambda(com.android.tools.r8.graph.DexType):236:236 -> a
-    174:174:void lambda$analyzeLambdaClassesStructure$6(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):436 -> a
-    175:181:void removeTrivialLambdaGroups():467:473 -> a
-    182:182:void lambda$removeTrivialLambdaGroups$8(com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):473:473 -> a
-    183:190:void rewriteLambdaReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.GraphLens):481:488 -> a
-    191:191:void rewriteLambdaReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.GraphLens):486:486 -> a
-    192:193:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):492:493 -> a
-    194:195:void com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor.accept(com.android.tools.r8.graph.DexTypeList):101:102 -> a
-    194:195:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):493 -> a
-    196:213:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):494:511 -> a
-    214:214:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy com.android.tools.r8.ir.optimize.lambda.LambdaMerger.strategyProvider(com.android.tools.r8.graph.DexType):516:516 -> a
-    214:214:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy access$700(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):104 -> a
-    215:215:com.android.tools.r8.ir.optimize.lambda.LambdaGroup com.android.tools.r8.ir.optimize.lambda.LambdaMerger.getLambdaGroup(com.android.tools.r8.graph.DexType):244:244 -> a
-    215:215:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy com.android.tools.r8.ir.optimize.lambda.LambdaMerger.strategyProvider(com.android.tools.r8.graph.DexType):516 -> a
-    215:215:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy access$700(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):104 -> a
-    216:216:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy com.android.tools.r8.ir.optimize.lambda.LambdaMerger.strategyProvider(com.android.tools.r8.graph.DexType):517:517 -> a
-    216:216:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy access$700(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):104 -> a
-    1:1:com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor access$500(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):104:104 -> b
-    2:2:boolean isMergeableLambda(com.android.tools.r8.graph.DexType):240:240 -> b
-    3:3:boolean lambda$collectGroupCandidates$1(com.android.tools.r8.graph.DexProgramClass):257:257 -> b
-    1:1:com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor access$800(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):104:104 -> c
-    2:2:void lambda$new$0(com.android.tools.r8.graph.DexType):231:231 -> c
-    3:3:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):260:260 -> c
-    4:4:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():451:451 -> c
-    4:4:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):260 -> c
-    5:7:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):260:262 -> c
-    1:1:java.util.Map access$900(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):104:104 -> d
-    2:2:void lambda$collectGroupCandidates$3(com.android.tools.r8.graph.DexProgramClass):267:267 -> d
-    3:3:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():451:451 -> d
-    3:3:void lambda$collectGroupCandidates$3(com.android.tools.r8.graph.DexProgramClass):268 -> d
-    4:8:void lambda$collectGroupCandidates$3(com.android.tools.r8.graph.DexProgramClass):268:272 -> d
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1 -> com.android.tools.r8.internal.Mn:
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$AnalysisStrategy -> com.android.tools.r8.internal.Nn:
+    1:1:void <clinit>():102:102 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):216:216 -> <init>
+    2:44:void <init>(com.android.tools.r8.graph.AppView):182:224 -> <init>
+    1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):102:102 -> a
+    2:2:void access$600(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.ProgramMethod):102:102 -> a
+    3:3:void com.android.tools.r8.ir.optimize.lambda.LambdaMerger.queueForProcessing(com.android.tools.r8.graph.ProgramMethod):246:246 -> a
+    3:3:void access$600(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.ProgramMethod):102 -> a
+    4:4:void invalidateLambda(com.android.tools.r8.graph.DexType):234:234 -> a
+    5:31:void collectGroupCandidates(com.android.tools.r8.graph.DexApplication):254:280 -> a
+    32:33:void analyzeCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):294:295 -> a
+    34: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.ir.conversion.MethodProcessor):311:313 -> a
+    37:37: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.ir.conversion.MethodProcessor):312:312 -> a
+    38:39:void rewriteCodeForInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):328:329 -> a
+    40:41:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,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):341:342 -> a
+    42:42:com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses.empty():31:31 -> a
+    42:42:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,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):342 -> a
+    43:52:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,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):342:351 -> a
+    53:70:com.android.tools.r8.com.google.common.collect.BiMap com.android.tools.r8.ir.optimize.lambda.LambdaMerger.finalizeLambdaGroups(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):419:436 -> a
+    53:70:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,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):355 -> a
+    71:93:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,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):359:381 -> a
+    94:94:java.util.Set com.android.tools.r8.com.google.common.collect.HashBiMap.values():469:469 -> a
+    94:94:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,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):385 -> a
+    95:102:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,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):385:392 -> a
+    103:103:void lambda$applyLambdaClassMapping$4(com.android.tools.r8.graph.DexEncodedMethod):382:382 -> a
+    104:123:void analyzeLambdaClassesStructure(java.util.concurrent.ExecutorService):396:415 -> a
+    124:124:void lambda$analyzeLambdaClassesStructure$6(java.util.List,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):401:401 -> a
+    125:130:void lambda$analyzeLambdaClassesStructure$5(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):403:408 -> a
+    131:136:void lambda$analyzeLambdaClassesStructure$5(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):406:411 -> a
+    137:137:void com.android.tools.r8.ir.optimize.lambda.LambdaMerger.invalidateLambda(com.android.tools.r8.graph.DexType):234:234 -> a
+    137:137:void lambda$analyzeLambdaClassesStructure$5(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):411 -> a
+    138:144:void removeTrivialLambdaGroups():442:448 -> a
+    145:145:void lambda$removeTrivialLambdaGroups$7(com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):448:448 -> a
+    146:153:void rewriteLambdaReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.GraphLens):456:463 -> a
+    154:154:void rewriteLambdaReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.GraphLens):461:461 -> a
+    155:156:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):467:468 -> a
+    157:158:void com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor.accept(com.android.tools.r8.graph.DexTypeList):101:102 -> a
+    157:158:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):468 -> a
+    159:176:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):469:486 -> a
+    177:177:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy com.android.tools.r8.ir.optimize.lambda.LambdaMerger.strategyProvider(com.android.tools.r8.graph.DexType):491:491 -> a
+    177:177:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy access$700(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):102 -> a
+    178:178:com.android.tools.r8.ir.optimize.lambda.LambdaGroup com.android.tools.r8.ir.optimize.lambda.LambdaMerger.getLambdaGroup(com.android.tools.r8.graph.DexType):242:242 -> a
+    178:178:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy com.android.tools.r8.ir.optimize.lambda.LambdaMerger.strategyProvider(com.android.tools.r8.graph.DexType):491 -> a
+    178:178:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy access$700(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):102 -> a
+    179:179:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy com.android.tools.r8.ir.optimize.lambda.LambdaMerger.strategyProvider(com.android.tools.r8.graph.DexType):492:492 -> a
+    179:179:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy access$700(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):102 -> a
+    1:1:com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor access$500(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):102:102 -> b
+    2:2:boolean isMergeableLambda(com.android.tools.r8.graph.DexType):238:238 -> b
+    3:3:boolean lambda$collectGroupCandidates$1(com.android.tools.r8.graph.DexProgramClass):255:255 -> b
+    1:1:com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor access$800(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):102:102 -> c
+    2:2:void lambda$new$0(com.android.tools.r8.graph.DexType):229:229 -> c
+    3:3:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):258:258 -> c
+    4:4:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():440:440 -> c
+    4:4:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):258 -> c
+    5:7:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):258:260 -> c
+    8:8:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass):101:101 -> c
+    8:8:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInFeature(com.android.tools.r8.graph.DexProgramClass):110 -> c
+    8:8:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):260 -> c
+    1:1:java.util.Map access$900(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):102:102 -> d
+    2:2:void lambda$collectGroupCandidates$3(com.android.tools.r8.graph.DexProgramClass):265:265 -> d
+    3:3:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():440:440 -> d
+    3:3:void lambda$collectGroupCandidates$3(com.android.tools.r8.graph.DexProgramClass):266 -> d
+    4:8:void lambda$collectGroupCandidates$3(com.android.tools.r8.graph.DexProgramClass):266:270 -> d
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1 -> com.android.tools.r8.internal.Rm:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$AnalysisStrategy -> com.android.tools.r8.internal.Sm:
     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):520:520 -> <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):521:525 -> <init>
-    7:7:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):522:522 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy lambda$new$0(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):524:524 -> a
-    2:2:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InvokeMethod):532:532 -> a
-    3:3:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.NewInstance):537:537 -> a
-    4:4:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstancePut):542:542 -> a
-    5:5:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstanceGet):547:547 -> a
-    6:6:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticPut):552:552 -> a
-    7:7:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticGet):557:557 -> a
-    8:8:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InitClass):562:562 -> a
-    9:9:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.Argument):567:567 -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$AnalyzeMode -> com.android.tools.r8.internal.On:
+    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):495:495 -> <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):496:500 -> <init>
+    7:7:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):497:497 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy lambda$new$0(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):499:499 -> a
+    2:2:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InvokeMethod):507:507 -> a
+    3:3:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.NewInstance):512:512 -> a
+    4:4:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstancePut):517:517 -> a
+    5:5:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstanceGet):522:522 -> a
+    6:6:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticPut):527:527 -> a
+    7:7:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticGet):532:532 -> a
+    8:8:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InitClass):537:537 -> a
+    9:9:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.Argument):542:542 -> a
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$AnalyzeMode -> com.android.tools.r8.internal.Tm:
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> a
-    1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):118:118 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):118:118 -> <init>
-    1:1:void analyzeCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):122:122 -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyMode -> com.android.tools.r8.internal.Pn:
+    1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):116:116 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):116:116 -> <init>
+    1:1:void analyzeCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):120:120 -> a
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyMode -> com.android.tools.r8.internal.Um:
     java.util.Map lambdaGroups -> b
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer optimizationInfoFixer -> c
     boolean $assertionsDisabled -> a
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> d
-    1:1:void <clinit>():126:126 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,java.util.Map,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):133:135 -> <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):145:176 -> 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):175:178 -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy -> com.android.tools.r8.internal.Qn:
+    1:1:void <clinit>():124:124 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,java.util.Map,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):131:133 -> <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):143:174 -> 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):173:176 -> a
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy -> com.android.tools.r8.internal.Vm:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer optimizationInfoFixer -> n
     java.util.Set typeAffectedValues -> o
-    1:1:void <clinit>():571:571 -> <clinit>
-    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.graph.ProgramMethod,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):571:571 -> <init>
-    2:4: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.graph.ProgramMethod,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):583:585 -> <init>
-    5:5: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.graph.ProgramMethod,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):582:582 -> <init>
-    6:20: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.graph.ProgramMethod,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):575:589 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy lambda$new$0(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):584:584 -> a
-    2:4:void recordTypeHasChanged(com.android.tools.r8.ir.code.Value):593:595 -> a
-    5:5:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InvokeMethod):652:652 -> a
-    6:6:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.NewInstance):657:657 -> a
-    7:7:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstancePut):664:664 -> a
-    8:8:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstanceGet):669:669 -> a
-    9:9:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticPut):676:676 -> a
-    10:10:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticGet):681:681 -> a
-    11:11:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InitClass):686:686 -> a
-    12:12:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.Argument):691:691 -> a
-    1:42:void processCode():602:643 -> b
-    43:43:boolean typeMayHaveChanged(com.android.tools.r8.ir.code.Value):647:647 -> b
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer -> com.android.tools.r8.internal.Rn:
+    1:1:void <clinit>():546:546 -> <clinit>
+    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.graph.ProgramMethod,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):546:546 -> <init>
+    2:4: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.graph.ProgramMethod,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):558:560 -> <init>
+    5:5: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.graph.ProgramMethod,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):557:557 -> <init>
+    6:20: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.graph.ProgramMethod,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):550:564 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy lambda$new$0(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):559:559 -> a
+    2:4:void recordTypeHasChanged(com.android.tools.r8.ir.code.Value):568:570 -> a
+    5:5:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InvokeMethod):627:627 -> a
+    6:6:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.NewInstance):632:632 -> a
+    7:7:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstancePut):639:639 -> a
+    8:8:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstanceGet):644:644 -> a
+    9:9:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticPut):651:651 -> a
+    10:10:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticGet):656:656 -> a
+    11:11:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InitClass):661:661 -> a
+    12:12:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.Argument):666:666 -> a
+    1:42:void processCode():577:618 -> b
+    43:43:boolean typeMayHaveChanged(com.android.tools.r8.ir.code.Value):622:622 -> b
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer -> com.android.tools.r8.internal.Wm:
     java.util.Map lambdaGroupsClasses -> b
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> c
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():695:695 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,java.util.Map):700:701 -> <init>
-    1:2:void fixup(com.android.tools.r8.graph.DexEncodedField):718:719 -> a
+    1:1:void <clinit>():670:670 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,java.util.Map):675:676 -> <init>
+    1:2:void fixup(com.android.tools.r8.graph.DexEncodedField):693:694 -> a
     3:3:boolean com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo.isMutableFieldOptimizationInfo():0:0 -> a
-    3:3:void fixup(com.android.tools.r8.graph.DexEncodedField):719 -> a
-    4:6:void fixup(com.android.tools.r8.graph.DexEncodedField):720:722 -> a
+    3:3:void fixup(com.android.tools.r8.graph.DexEncodedField):694 -> a
+    4:6:void fixup(com.android.tools.r8.graph.DexEncodedField):695:697 -> a
     7:7:boolean com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo.isDefaultFieldOptimizationInfo():0:0 -> a
-    7:7:void fixup(com.android.tools.r8.graph.DexEncodedField):722 -> a
-    8:8:void fixup(com.android.tools.r8.graph.DexEncodedField):722:722 -> a
-    9:15:void fixup(com.android.tools.r8.graph.DexEncodedMethod):728:734 -> a
-    1:1:java.lang.Object apply(java.lang.Object):695:695 -> 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):706:710 -> apply
-    2:6:java.lang.Object apply(java.lang.Object):695 -> apply
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$Mode -> com.android.tools.r8.internal.Sn:
-    1:1:void <init>():106:106 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):106:106 -> <init>
+    7:7:void fixup(com.android.tools.r8.graph.DexEncodedField):697 -> a
+    8:8:void fixup(com.android.tools.r8.graph.DexEncodedField):697:697 -> a
+    9:15:void fixup(com.android.tools.r8.graph.DexEncodedMethod):703:709 -> a
+    1:1:java.lang.Object apply(java.lang.Object):670:670 -> 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):681:685 -> apply
+    2:6:java.lang.Object apply(java.lang.Object):670 -> apply
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$Mode -> com.android.tools.r8.internal.Xm:
+    1:1:void <init>():104:104 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):104:104 -> <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.Xn:
+com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor -> com.android.tools.r8.internal.cn:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     java.util.function.Consumer onLambdaType -> d
     java.util.function.Predicate isLambdaType -> c
@@ -47690,7 +47994,7 @@
     1:1:com.android.tools.r8.graph.ClassAccessFlags buildAccessFlags():72:72 -> a
     2:13:void lambda$buildVirtualMethods$1(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.IntBox,java.util.List,boolean,java.util.List,java.lang.Integer,java.lang.Boolean):145:156 -> a
     14:27:void lambda$buildVirtualMethods$1(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.IntBox,java.util.List,boolean,java.util.List,java.lang.Integer,java.lang.Boolean):153:166 -> a
-    28:28: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):276:276 -> a
+    28:28: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):277:277 -> a
     28:28:void lambda$buildVirtualMethods$1(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.IntBox,java.util.List,boolean,java.util.List,java.lang.Integer,java.lang.Boolean):166 -> a
     29:50:void lambda$buildVirtualMethods$1(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.IntBox,java.util.List,boolean,java.util.List,java.lang.Integer,java.lang.Boolean):158:179 -> a
     51:58:com.android.tools.r8.ir.conversion.SourceCode lambda$buildVirtualMethods$0(com.android.tools.r8.graph.DexMethod,java.util.List,com.android.tools.r8.graph.DexMethod,java.lang.Integer,com.android.tools.r8.ir.code.Position):169:176 -> a
@@ -47700,17 +48004,17 @@
     69:69:com.android.tools.r8.ir.conversion.SourceCode lambda$buildDirectMethods$6(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):282:282 -> a
     70:97:com.android.tools.r8.graph.DexEncodedField[] buildStaticFields(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):320:347 -> a
     98:105:void lambda$buildStaticFields$7(java.util.List,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):327:334 -> a
-    106:106: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):80:80 -> a
+    106:106: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):74:74 -> a
     106:106:void lambda$buildStaticFields$7(java.util.List,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):334 -> a
     107:114:void lambda$buildStaticFields$7(java.util.List,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):336:343 -> a
     1:3:com.android.tools.r8.graph.GenericSignature$ClassSignature buildClassSignature():94:94 -> b
     4:4:com.android.tools.r8.ir.conversion.SourceCode lambda$buildDirectMethods$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):262:262 -> b
     1:15:com.android.tools.r8.graph.DexEncodedMethod[] buildDirectMethods():245:259 -> c
-    16:16: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):276:276 -> c
+    16:16: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):277:277 -> c
     16:16:com.android.tools.r8.graph.DexEncodedMethod[] buildDirectMethods():259 -> c
     17:29:com.android.tools.r8.graph.DexEncodedMethod[] buildDirectMethods():259:271 -> c
     30:40:com.android.tools.r8.graph.DexEncodedMethod[] buildDirectMethods():269:279 -> c
-    41:41: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):276:276 -> c
+    41:41: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):277:277 -> c
     41:41:com.android.tools.r8.graph.DexEncodedMethod[] buildDirectMethods():279 -> c
     42:42:com.android.tools.r8.graph.DexEncodedMethod[] buildDirectMethods():279:279 -> c
     1:1:com.android.tools.r8.graph.EnclosingMethodAttribute buildEnclosingMethodAttribute():78:78 -> d
@@ -47720,17 +48024,17 @@
     3:5:java.util.List buildInnerClasses():85:87 -> e
     6:6:java.util.List buildInnerClasses():86:86 -> e
     1:10:com.android.tools.r8.graph.DexEncodedField[] buildInstanceFields():292:301 -> f
-    11:11: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):80:80 -> f
+    11:11: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):74:74 -> f
     11:11:com.android.tools.r8.graph.DexEncodedField[] buildInstanceFields():301 -> f
     12:21:com.android.tools.r8.graph.DexEncodedField[] buildInstanceFields():301:310 -> f
-    22:22: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):80:80 -> f
+    22:22: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):74:74 -> f
     22:22:com.android.tools.r8.graph.DexEncodedField[] buildInstanceFields():310 -> f
     23:23:com.android.tools.r8.graph.DexEncodedField[] buildInstanceFields():310:310 -> f
     1:1:com.android.tools.r8.graph.DexTypeList buildInterfaces():352:352 -> g
     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:46:int com.android.tools.r8.utils.InternalOptions.verificationSizeLimitInBytes():274:279 -> h
+    41:46:int com.android.tools.r8.utils.InternalOptions.verificationSizeLimitInBytes():282:287 -> h
     41:46:void splitIntoGroupsBasedOnInstructionSize(java.util.List,com.android.tools.r8.utils.TriConsumer):193 -> h
     41:46:com.android.tools.r8.graph.DexEncodedMethod[] buildVirtualMethods():142 -> h
     47:50:void splitIntoGroupsBasedOnInstructionSize(java.util.List,com.android.tools.r8.utils.TriConsumer):196:199 -> h
@@ -47882,19 +48186,19 @@
     119:119:void checkDirectMethodAnnotations(com.android.tools.r8.graph.DexEncodedMethod):207 -> a
     120:120:void checkDirectMethodAnnotations(com.android.tools.r8.graph.DexEncodedMethod):207:207 -> a
     121:121:void checkAccessFlags(java.lang.String,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AccessFlags[]):231:231 -> a
-    122:127:void checkAccessFlags(java.lang.String,int,com.android.tools.r8.graph.AccessFlags[]):237:242 -> a
-    128:128:void com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaStructureError.<init>(java.lang.String):229:229 -> a
-    128:128:void checkAccessFlags(java.lang.String,int,com.android.tools.r8.graph.AccessFlags[]):242 -> a
-    129:129:void checkAccessFlags(java.lang.String,int,com.android.tools.r8.graph.AccessFlags[]):242:242 -> a
-    130:130:boolean com.android.tools.r8.graph.DexEncodedField.hasAnnotation():238:238 -> a
-    130:130:void checkFieldAnnotations(com.android.tools.r8.graph.DexEncodedField):219 -> a
-    131:133:void checkFieldAnnotations(com.android.tools.r8.graph.DexEncodedField):220:222 -> a
-    134:134:java.lang.String com.android.tools.r8.graph.DexItem.toSmaliString():44:44 -> a
-    134:134:void checkFieldAnnotations(com.android.tools.r8.graph.DexEncodedField):222 -> a
-    135:137:void checkFieldAnnotations(com.android.tools.r8.graph.DexEncodedField):222:224 -> a
+    122:122:boolean com.android.tools.r8.graph.DexEncodedField.hasAnnotation():232:232 -> a
+    122:122:void checkFieldAnnotations(com.android.tools.r8.graph.DexEncodedField):219 -> a
+    123:125:void checkFieldAnnotations(com.android.tools.r8.graph.DexEncodedField):220:222 -> a
+    126:126:java.lang.String com.android.tools.r8.graph.DexItem.toSmaliString():44:44 -> a
+    126:126:void checkFieldAnnotations(com.android.tools.r8.graph.DexEncodedField):222 -> a
+    127:129:void checkFieldAnnotations(com.android.tools.r8.graph.DexEncodedField):222:224 -> a
+    130:130:void com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaStructureError.<init>(java.lang.String):229:229 -> a
+    130:130:void checkFieldAnnotations(com.android.tools.r8.graph.DexEncodedField):224 -> a
+    131:131:void checkFieldAnnotations(com.android.tools.r8.graph.DexEncodedField):224:224 -> a
+    132:137:void checkAccessFlags(java.lang.String,int,com.android.tools.r8.graph.AccessFlags[]):237:242 -> a
     138:138:void com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaStructureError.<init>(java.lang.String):229:229 -> a
-    138:138:void checkFieldAnnotations(com.android.tools.r8.graph.DexEncodedField):224 -> a
-    139:139:void checkFieldAnnotations(com.android.tools.r8.graph.DexEncodedField):224:224 -> a
+    138:138:void checkAccessFlags(java.lang.String,int,com.android.tools.r8.graph.AccessFlags[]):242 -> a
+    139:139:void checkAccessFlags(java.lang.String,int,com.android.tools.r8.graph.AccessFlags[]):242:242 -> a
     1:6:com.android.tools.r8.graph.InnerClassAttribute validateInnerClasses(com.android.tools.r8.graph.DexClass):78:83 -> b
     7:7:void com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaStructureError.<init>(java.lang.String):229:229 -> b
     7:7:com.android.tools.r8.graph.InnerClassAttribute validateInnerClasses(com.android.tools.r8.graph.DexClass):83 -> b
@@ -47944,7 +48248,7 @@
     2:2:void lambda$prepareInstructions$3(int,com.android.tools.r8.ir.conversion.IRBuilder):79 -> e
     1:1:void lambda$prepareInstructions$4(int,com.android.tools.r8.ir.conversion.IRBuilder):80:80 -> f
     1:49:void prepareInstructions():47:95 -> i
-com.android.tools.r8.ir.optimize.library.BooleanMethodOptimizer -> com.android.tools.r8.internal.W2:
+com.android.tools.r8.ir.optimize.library.BooleanMethodOptimizer -> com.android.tools.r8.internal.N2:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> b
     1:3:void <init>(com.android.tools.r8.graph.AppView):27:29 -> <init>
@@ -47973,7 +48277,7 @@
     31:37: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
     31:37: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.gb:
+com.android.tools.r8.ir.optimize.library.EnumMethodOptimizer -> com.android.tools.r8.internal.Ba:
     com.android.tools.r8.graph.AppView appView -> b
     1:2:void <init>(com.android.tools.r8.graph.AppView):26:27 -> <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):42:43 -> a
@@ -47985,18 +48289,21 @@
     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):75:76 -> 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):44 -> a
     1:1:com.android.tools.r8.graph.DexType getType():32:32 -> getType
-com.android.tools.r8.ir.optimize.library.LibraryFieldSynthesis -> com.android.tools.r8.internal.oo:
-    1:3:void synthesizeEnumFields(com.android.tools.r8.graph.AppView):29:31 -> a
-    4:4:com.android.tools.r8.graph.DexLibraryClass com.android.tools.r8.graph.DexLibraryClass.asLibraryClassOrNull(com.android.tools.r8.graph.DexClass):72:72 -> a
-    4:4:void synthesizeEnumFields(com.android.tools.r8.graph.AppView):31 -> a
-    5:5:void synthesizeEnumFields(com.android.tools.r8.graph.AppView):33:33 -> a
-    6:7:void com.android.tools.r8.graph.DexItemFactory$EnumMembers.forEachField(java.util.function.Consumer):1398:1399 -> a
-    6:7:void synthesizeEnumFields(com.android.tools.r8.graph.AppView):33 -> a
-    8:16:void lambda$synthesizeEnumFields$0(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexField):35:43 -> a
-    17:17: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):80:80 -> a
-    17:17:void lambda$synthesizeEnumFields$0(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexField):43 -> a
-    18:18: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.qo:
+com.android.tools.r8.ir.optimize.library.LibraryFieldSynthesis -> com.android.tools.r8.internal.tn:
+    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):273:273 -> a
+    3:3:void synthesizeEnumFields(com.android.tools.r8.graph.AppView):31 -> a
+    4:4:void synthesizeEnumFields(com.android.tools.r8.graph.AppView):31:31 -> a
+    5:5:com.android.tools.r8.graph.DexLibraryClass com.android.tools.r8.graph.DexLibraryClass.asLibraryClassOrNull(com.android.tools.r8.graph.DexClass):71:71 -> a
+    5:5:void synthesizeEnumFields(com.android.tools.r8.graph.AppView):31 -> a
+    6:6:void synthesizeEnumFields(com.android.tools.r8.graph.AppView):33:33 -> a
+    7:8:void com.android.tools.r8.graph.DexItemFactory$EnumMembers.forEachField(java.util.function.Consumer):1375:1376 -> a
+    7:8:void synthesizeEnumFields(com.android.tools.r8.graph.AppView):33 -> a
+    9:17:void lambda$synthesizeEnumFields$0(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexField):35:43 -> a
+    18:18: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):74:74 -> a
+    18:18:void lambda$synthesizeEnumFields$0(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexField):43 -> a
+    19:19: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.un:
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set finalLibraryFields -> c
     java.util.Set modeledLibraryTypes -> d
@@ -48010,134 +48317,125 @@
     4:4:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
     4:4:void lambda$initializeFinalLibraryFields$0(com.android.tools.r8.graph.DexField):69 -> a
     5:5:void lambda$initializeFinalLibraryFields$0(com.android.tools.r8.graph.DexField):69:69 -> a
-    6:6:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():204:204 -> a
+    6:6:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():194:194 -> a
     6:6:void lambda$initializeFinalLibraryFields$0(com.android.tools.r8.graph.DexField):71 -> a
     7:9:void lambda$initializeFinalLibraryFields$0(com.android.tools.r8.graph.DexField):72:74 -> a
     10:10:boolean isFinalLibraryField(com.android.tools.r8.graph.DexEncodedField):83:83 -> a
     11:11:boolean isModeled(com.android.tools.r8.graph.DexType):99:99 -> a
     12:16:void register(com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection):103:107 -> a
     17:17: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):116:116 -> a
-    18:18:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1030:1030 -> a
+    18:18:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1025:1025 -> a
     18:18: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):117 -> a
-    19:41: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):118:140 -> a
-    42:42:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):590:590 -> a
-    42:42: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):140 -> a
-    43:48: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):141:146 -> a
-    49:49:void com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection.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,java.lang.Object):52:52 -> a
-    49:49: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):151 -> a
-    50:51: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):154:155 -> a
-    52:52:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    52:52: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):155 -> a
-    53:53: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):155:155 -> a
-    54:54:com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State lambda$optimize$1(com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection):149:149 -> a
-com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection -> com.android.tools.r8.internal.so:
+    19:34: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):118:133 -> a
+    35:35:boolean com.android.tools.r8.ir.code.Instruction.hasUnusedOutValue():133:133 -> a
+    35:35: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):138 -> a
+    36:37: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):139:140 -> a
+    38:38:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):590:590 -> a
+    38:38: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):140 -> a
+    39:44: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):141:146 -> a
+    45:45:void com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection.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,java.lang.Object):52:52 -> a
+    45:45: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):151 -> a
+    46:47: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):154:155 -> a
+    48:48:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
+    48:48: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):155 -> a
+    49:49: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):155:155 -> a
+    50:50:com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State lambda$optimize$1(com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection):149:149 -> a
+com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection -> com.android.tools.r8.internal.wn:
     com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State createInitialState(com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId) -> a
     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,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State) -> a
-com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State -> com.android.tools.r8.internal.ro:
-com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection -> com.android.tools.r8.internal.wo:
+com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State -> com.android.tools.r8.internal.vn:
+com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection -> com.android.tools.r8.internal.An:
     java.util.Map finalMethodsWithoutSideEffects -> a
     java.util.Set nonFinalMethodsWithoutSideEffects -> c
     java.util.Set unconditionalFinalMethodsWithoutSideEffects -> b
-    1:6:void <init>(com.android.tools.r8.graph.AppView):30:35 -> <init>
-    1:15:java.util.Map buildFinalMethodsWithoutSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):41:55 -> a
-    16:17:void com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection.putAll(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,java.lang.Iterable,java.lang.Object):103:104 -> a
-    16:17:java.util.Map buildFinalMethodsWithoutSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):55 -> a
-    18:18:java.util.Map buildFinalMethodsWithoutSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):59:59 -> a
-    19:20:void com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection.putAll(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,java.lang.Iterable,java.lang.Object):103:104 -> a
-    19:20:java.util.Map buildFinalMethodsWithoutSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):59 -> a
-    21:21:java.util.Map buildFinalMethodsWithoutSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):63:63 -> a
-    22:22:boolean lambda$buildFinalMethodsWithoutSideEffects$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,java.util.List):45:45 -> a
-    23:23:java.util.Set buildNonFinalMethodsWithoutSideEffects(com.android.tools.r8.graph.DexItemFactory):96:96 -> a
-    24:24:void forEachSideEffectFreeFinalMethod(java.util.function.Consumer):109:109 -> a
-    25:25:boolean isCallToSideEffectFreeFinalMethod(com.android.tools.r8.ir.code.InvokeMethod):113:113 -> a
-    26:29:boolean isSideEffectFreeFinalMethod(com.android.tools.r8.graph.DexMethod,java.util.List):117:120 -> a
-    30:31:boolean isSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.LibraryMethod):126:127 -> a
-    1:1:boolean lambda$buildFinalMethodsWithoutSideEffects$1(com.android.tools.r8.graph.DexMethod,java.util.List):49:49 -> b
-    2:2:boolean lambda$buildFinalMethodsWithoutSideEffects$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,java.util.List):53:53 -> b
-    3:26:java.util.Set buildUnconditionalFinalMethodsWithoutSideEffects(com.android.tools.r8.graph.DexItemFactory):68:91 -> b
-com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer -> com.android.tools.r8.internal.yo:
-    com.android.tools.r8.graph.DexItemFactory dexItemFactory -> d
-    com.android.tools.r8.ir.analysis.value.AbstractValueFactory abstractValueFactory -> b
-    com.android.tools.r8.graph.AppView appView -> c
-    java.util.Set modeledLibraryTypes -> f
-    com.android.tools.r8.ir.optimize.info.LibraryOptimizationInfoInitializerFeedback feedback -> e
-    boolean $assertionsDisabled -> a
-    1:1:void <clinit>():29:29 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):28:32 -> <init>
+    1:8:java.util.Map buildFinalMethodsWithoutSideEffects(com.android.tools.r8.graph.DexItemFactory):38:45 -> a
+    9:10:void com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection.putAll(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,java.lang.Iterable,java.lang.Object):90:91 -> a
+    9:10:java.util.Map buildFinalMethodsWithoutSideEffects(com.android.tools.r8.graph.DexItemFactory):45 -> a
+    11:11:java.util.Map buildFinalMethodsWithoutSideEffects(com.android.tools.r8.graph.DexItemFactory):49:49 -> a
+    12:13:void com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection.putAll(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,java.lang.Iterable,java.lang.Object):90:91 -> a
+    12:13:java.util.Map buildFinalMethodsWithoutSideEffects(com.android.tools.r8.graph.DexItemFactory):49 -> a
+    14:14:java.util.Map buildFinalMethodsWithoutSideEffects(com.android.tools.r8.graph.DexItemFactory):53:53 -> a
+    15:15:void forEachSideEffectFreeFinalMethod(java.util.function.Consumer):96:96 -> a
+    16:16:boolean isCallToSideEffectFreeFinalMethod(com.android.tools.r8.ir.code.InvokeMethod):100:100 -> a
+    17:20:boolean isSideEffectFreeFinalMethod(com.android.tools.r8.graph.DexMethod,java.util.List):104:107 -> a
+    21:22:boolean isSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.LibraryMethod):113:114 -> a
+    1:1:boolean lambda$buildFinalMethodsWithoutSideEffects$0(com.android.tools.r8.graph.DexMethod,java.util.List):41:41 -> b
+    2:2:java.util.Set buildNonFinalMethodsWithoutSideEffects(com.android.tools.r8.graph.DexItemFactory):83:83 -> b
+    1:1:boolean lambda$buildFinalMethodsWithoutSideEffects$1(com.android.tools.r8.graph.DexMethod,java.util.List):44:44 -> c
+    2:22:java.util.Set buildUnconditionalFinalMethodsWithoutSideEffects(com.android.tools.r8.graph.DexItemFactory):58:78 -> c
+com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer -> com.android.tools.r8.internal.Cn:
+    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
+    com.android.tools.r8.ir.optimize.info.LibraryOptimizationInfoInitializerFeedback feedback -> d
+    java.util.Set modeledLibraryTypes -> e
     1:1:void <init>(com.android.tools.r8.graph.AppView):39:39 -> <init>
     2:8:void <init>(com.android.tools.r8.graph.AppView):36:42 -> <init>
-    1:1:java.util.Set getModeledLibraryTypes():56:56 -> a
-    2:7:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelInstanceInitializers():60:65 -> a
+    1:1:java.util.Set getModeledLibraryTypes():55:55 -> a
+    2:7:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelInstanceInitializers():59:64 -> a
     2:7:void run(java.util.Set):46 -> a
     8:8:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection.builder():26:26 -> a
-    8:8:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelInstanceInitializers():67 -> a
+    8:8:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelInstanceInitializers():66 -> a
     8:8:void run(java.util.Set):46 -> a
-    9:11:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelInstanceInitializers():67:69 -> a
+    9:11:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelInstanceInitializers():66:68 -> a
     9:11:void run(java.util.Set):46 -> a
-    12:15:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelInstanceInitializers():68:71 -> a
+    12:15:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelInstanceInitializers():67:70 -> a
     12:15:void run(java.util.Set):46 -> a
-    16:22:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelInstanceInitializers():70:76 -> a
+    16:22:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelInstanceInitializers():69:75 -> a
     16:22:void run(java.util.Set):46 -> a
     23:23: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):62:62 -> a
-    23:23:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelInstanceInitializers():76 -> a
+    23:23:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelInstanceInitializers():75 -> a
     23:23:void run(java.util.Set):46 -> a
-    24:26:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelInstanceInitializers():76:78 -> a
+    24:26:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelInstanceInitializers():75:77 -> a
     24:26:void run(java.util.Set):46 -> a
-    27:27:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelInstanceInitializers():75:75 -> a
+    27:27:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelInstanceInitializers():74:74 -> a
     27:27:void run(java.util.Set):46 -> a
-    28:28:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelInstanceInitializers():73:73 -> a
+    28:28:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelInstanceInitializers():72:72 -> a
     28:28:void run(java.util.Set):46 -> a
-    29:29:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelStaticFinalLibraryFields(java.util.Set):83:83 -> a
+    29:29:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelStaticFinalLibraryFields(java.util.Set):82:82 -> a
     29:29:void run(java.util.Set):47 -> a
-    30:30:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():209:209 -> a
-    30:30:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelStaticFinalLibraryFields(java.util.Set):84 -> a
+    30:30:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():199:199 -> a
+    30:30:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelStaticFinalLibraryFields(java.util.Set):83 -> a
     30:30:void run(java.util.Set):47 -> a
-    31:31:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelStaticFinalLibraryFields(java.util.Set):85:85 -> a
+    31:31:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelStaticFinalLibraryFields(java.util.Set):84:84 -> a
     31:31:void run(java.util.Set):47 -> a
-    32:32:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():23:23 -> a
-    32:32:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelStaticFinalLibraryFields(java.util.Set):86 -> a
+    32:32:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():22:22 -> a
+    32:32:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelStaticFinalLibraryFields(java.util.Set):85 -> a
     32:32:void run(java.util.Set):47 -> a
-    33:33:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelStaticFinalLibraryFields(java.util.Set):86:86 -> a
+    33:33:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelStaticFinalLibraryFields(java.util.Set):85:85 -> a
     33:33:void run(java.util.Set):47 -> a
-    34:34:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelStaticFinalLibraryFields(java.util.Set):85:85 -> a
+    34:34:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelStaticFinalLibraryFields(java.util.Set):84:84 -> a
     34:34:void run(java.util.Set):47 -> a
-    35:35:void com.android.tools.r8.ir.optimize.info.LibraryOptimizationInfoInitializerFeedback.recordLibraryFieldHasAbstractValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.value.AbstractValue):23:23 -> a
-    35:35:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelStaticFinalLibraryFields(java.util.Set):85 -> a
-    35:35:void run(java.util.Set):47 -> a
-    36:36:void run(java.util.Set):48:48 -> a
-    37:46:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelLibraryMethodsReturningNonNull():116:125 -> a
-    37:46:void run(java.util.Set):49 -> a
-    47:47:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo.getDynamicUpperBoundTypeOrElse(com.android.tools.r8.ir.analysis.type.TypeElement):41:41 -> a
-    47:47:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelLibraryMethodsReturningNonNull():126 -> a
-    47:47:void run(java.util.Set):49 -> a
-    48:49:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelLibraryMethodsReturningNonNull():127:128 -> a
-    48:49:void run(java.util.Set):49 -> a
-    50:50:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.ReferenceTypeElement.asDefinitelyNotNull():82:82 -> a
-    50:50:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelLibraryMethodsReturningNonNull():128 -> a
-    50:50:void run(java.util.Set):49 -> a
-    51:51:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelLibraryMethodsReturningNonNull():121:121 -> a
-    51:51:void run(java.util.Set):49 -> a
-    52:55:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelLibraryMethodsReturningReceiver():134:137 -> a
-    52:55:void run(java.util.Set):50 -> a
-    56:56:void run(java.util.Set):51:51 -> a
-    57:57:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelRequireNonNullMethods():155:155 -> a
-    57:57:void run(java.util.Set):52 -> a
-    58:58:java.lang.Iterable com.android.tools.r8.graph.DexItemFactory$ObjectsMethods.requireNonNullMethods():1237:1237 -> a
-    58:58:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelRequireNonNullMethods():155 -> a
-    58:58:void run(java.util.Set):52 -> a
-    59:62:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelRequireNonNullMethods():155:158 -> a
-    59:62:void run(java.util.Set):52 -> a
-    63:75:void lambda$modelLibraryMethodsNonNullParamOrThrow$0(com.android.tools.r8.graph.DexMethod,int[]):94:106 -> a
-    76:76:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo.hasNonNullParamOnNormalExits():56:56 -> a
-    76:76:void lambda$modelLibraryMethodsNonNullParamOrThrow$0(com.android.tools.r8.graph.DexMethod,int[]):106 -> a
-    77:79:void lambda$modelLibraryMethodsNonNullParamOrThrow$0(com.android.tools.r8.graph.DexMethod,int[]):107:109 -> a
-    80:82:void lambda$modelLibraryMethodsWithoutSideEffects$1(com.android.tools.r8.graph.DexMethod):147:149 -> a
-    1:1:void modelLibraryMethodsNonNullParamOrThrow():92:92 -> b
-    2:2:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):164:164 -> b
-    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> b
-    3:3:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):164 -> b
-    4:6:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):165:167 -> b
-    1:3:void modelLibraryMethodsWithoutSideEffects():143:145 -> c
-com.android.tools.r8.ir.optimize.library.LogMethodOptimizer -> com.android.tools.r8.internal.lp:
+    35:44:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelLibraryMethodsReturningNonNull():91:100 -> a
+    35:44:void run(java.util.Set):48 -> a
+    45:45:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo.getDynamicUpperBoundTypeOrElse(com.android.tools.r8.ir.analysis.type.TypeElement):41:41 -> a
+    45:45:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelLibraryMethodsReturningNonNull():101 -> a
+    45:45:void run(java.util.Set):48 -> a
+    46:47:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelLibraryMethodsReturningNonNull():102:103 -> a
+    46:47:void run(java.util.Set):48 -> a
+    48:48:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.ReferenceTypeElement.asDefinitelyNotNull():82:82 -> a
+    48:48:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelLibraryMethodsReturningNonNull():103 -> a
+    48:48:void run(java.util.Set):48 -> a
+    49:49:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelLibraryMethodsReturningNonNull():96:96 -> a
+    49:49:void run(java.util.Set):48 -> a
+    50:53:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelLibraryMethodsReturningReceiver():109:112 -> a
+    50:53:void run(java.util.Set):49 -> a
+    54:54:void run(java.util.Set):50:50 -> a
+    55:55:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelRequireNonNullMethods():130:130 -> a
+    55:55:void run(java.util.Set):51 -> a
+    56:56:java.lang.Iterable com.android.tools.r8.graph.DexItemFactory$ObjectsMethods.requireNonNullMethods():1214:1214 -> a
+    56:56:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelRequireNonNullMethods():130 -> a
+    56:56:void run(java.util.Set):51 -> a
+    57:68:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelRequireNonNullMethods():130:141 -> a
+    57:68:void run(java.util.Set):51 -> a
+    69:71:void lambda$modelLibraryMethodsWithoutSideEffects$0(com.android.tools.r8.graph.DexMethod):122:124 -> a
+    1:3:void modelLibraryMethodsWithoutSideEffects():118:120 -> b
+    4:4:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):147:147 -> b
+    5:5:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> b
+    5:5:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):147 -> b
+    6:8:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):148:150 -> b
+com.android.tools.r8.ir.optimize.library.LogMethodOptimizer -> com.android.tools.r8.internal.oo:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.graph.DexMethod wtfMethod -> j
     com.android.tools.r8.graph.DexMethod eMethod -> i
@@ -48159,32 +48457,39 @@
     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.ObjectMethodOptimizer -> com.android.tools.r8.internal.Zt:
+com.android.tools.r8.ir.optimize.library.ObjectMethodOptimizer -> com.android.tools.r8.internal.Xs:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     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.mu:
-    com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
-    com.android.tools.r8.graph.AppView appView -> b
-    com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> d
-    1:5:void <init>(com.android.tools.r8.graph.AppView):25:29 -> <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):44:44 -> a
+com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer -> com.android.tools.r8.internal.ht:
+    com.android.tools.r8.graph.DexItemFactory dexItemFactory -> d
+    com.android.tools.r8.graph.AppView appView -> c
+    boolean $assertionsDisabled -> b
+    com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> e
+    1:1:void <clinit>():23:23 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.graph.AppView):29:33 -> <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):48:48 -> a
     2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():164:164 -> a
-    2:2: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):53 -> a
-    2: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):45 -> a
-    3: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):54:61 -> a
-    3: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):45 -> a
-    11:11: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):46:46 -> a
+    2:2: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):57 -> a
+    2: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):49 -> a
+    3: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):58:65 -> a
+    3: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):49 -> a
+    11:11: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):50:50 -> a
     12:12:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():164:164 -> a
-    12:12:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeToStringWithObject(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set):70 -> a
-    12:12: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):47 -> a
-    13:30:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeToStringWithObject(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set):71:88 -> a
-    13:30: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):47 -> a
-    1:1:com.android.tools.r8.graph.DexType getType():34:34 -> getType
-com.android.tools.r8.ir.optimize.library.StatelessLibraryMethodModelCollection -> com.android.tools.r8.internal.SC:
+    12:12:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeToStringWithObject(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set):74 -> a
+    12:12: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):51 -> a
+    13:58:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeToStringWithObject(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set):75:120 -> a
+    13:58: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):51 -> a
+    59:59: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
+    59:59:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeToStringWithObject(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set):120 -> a
+    59:59: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):51 -> a
+    60:65:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeToStringWithObject(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set):121:126 -> a
+    60:65: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):51 -> a
+    1:1:com.android.tools.r8.graph.DexType getType():38:38 -> getType
+com.android.tools.r8.ir.optimize.library.StatelessLibraryMethodModelCollection -> com.android.tools.r8.internal.DB:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>():17:17 -> <init>
@@ -48193,7 +48498,8 @@
     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,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State):17:17 -> a
     2:2:void com.android.tools.r8.ir.optimize.library.StatelessLibraryMethodModelCollection.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,com.android.tools.r8.ir.optimize.library.StatelessLibraryMethodModelCollection$State):42:42 -> a
     2: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,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State):17 -> a
-com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer -> com.android.tools.r8.internal.qD:
+com.android.tools.r8.ir.optimize.library.StatelessLibraryMethodModelCollection$State -> com.android.tools.r8.internal.CB:
+com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer -> com.android.tools.r8.internal.eC:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> c
@@ -48206,11 +48512,11 @@
     6:13:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State):92:99 -> a
     6:13:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.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,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State):79 -> a
     6:13: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,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State):42 -> a
-    14:14:boolean com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods.isAppendStringMethod(com.android.tools.r8.graph.DexMethod):1700:1700 -> a
+    14:14:boolean com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods.isAppendStringMethod(com.android.tools.r8.graph.DexMethod):1681:1681 -> a
     14:14:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State):100 -> a
     14:14:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.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,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State):79 -> a
     14:14: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,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State):42 -> a
-    15:15:boolean com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods.isAppendObjectMethod(com.android.tools.r8.graph.DexMethod):1692:1692 -> a
+    15:15:boolean com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods.isAppendObjectMethod(com.android.tools.r8.graph.DexMethod):1673:1673 -> a
     15:15:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State):102 -> a
     15:15:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.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,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State):79 -> a
     15:15: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,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State):42 -> a
@@ -48237,62 +48543,63 @@
     40:51:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State):113:124 -> a
     40:51:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.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,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State):79 -> a
     40:51: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,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State):42 -> a
-    52:56:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State):123:127 -> a
-    52:56:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.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,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State):79 -> a
-    52:56: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,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State):42 -> a
-    57:57:com.android.tools.r8.ir.code.InvokeStatic$Builder com.android.tools.r8.ir.code.InvokeStatic.builder():47:47 -> a
-    57:57:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State):127 -> a
-    57:57:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.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,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State):79 -> a
-    57:57: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,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State):42 -> a
-    58:61:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State):128:131 -> a
-    58:61:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.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,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State):79 -> a
-    58:61: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,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State):42 -> a
-    62:62:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State):101:101 -> a
-    62:62:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.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,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State):79 -> a
-    62:62: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,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State):42 -> a
-    63:63:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.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,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State):80:80 -> a
-    63:63: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,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State):42 -> a
-    64:64:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeToString(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):139:139 -> a
-    64:64:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.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,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State):81 -> a
-    64:64: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,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State):42 -> a
-    65:78:boolean com.android.tools.r8.utils.ValueUtils.isNonNullStringBuilder(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):24:37 -> a
-    65:78:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeToString(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):139 -> a
-    65:78:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.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,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State):81 -> a
-    65:78: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,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State):42 -> a
-    79:80:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeToString(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):140:141 -> a
-    79:80:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.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,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State):81 -> a
-    79:80: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,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State):42 -> a
-    81:81:com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.createInitialState(com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):60:60 -> a
-    81:81:com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State createInitialState(com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):42 -> a
+    52:58:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State):123:129 -> a
+    52:58:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.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,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State):79 -> a
+    52:58: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,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State):42 -> a
+    59:59:com.android.tools.r8.ir.code.InvokeStatic$Builder com.android.tools.r8.ir.code.InvokeStatic.builder():47:47 -> a
+    59:59:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State):129 -> a
+    59:59:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.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,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State):79 -> a
+    59:59: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,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State):42 -> a
+    60:60:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State):130:130 -> a
+    60:60:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.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,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State):79 -> a
+    60:60: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,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State):42 -> a
+    61:61:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setMethod(com.android.tools.r8.graph.DexClassAndMethod):266:266 -> a
+    61:61:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeStatic$Builder.setMethod(com.android.tools.r8.graph.DexClassAndMethod):0 -> a
+    61:61:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State):130 -> a
+    61:61:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.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,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State):79 -> a
+    61:61: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,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State):42 -> a
+    62:65:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State):130:133 -> a
+    62:65:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.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,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State):79 -> a
+    62:65: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,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State):42 -> a
+    66:66:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State):101:101 -> a
+    66:66:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.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,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State):79 -> a
+    66:66: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,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State):42 -> a
+    67:67:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.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,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State):80:80 -> a
+    67:67: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,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State):42 -> a
+    68:70:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeToString(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):142:144 -> a
+    68:70:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.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,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State):81 -> a
+    68:70: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,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State):42 -> a
+    71:71:com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.createInitialState(com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):60:60 -> a
+    71:71:com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State createInitialState(com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):42 -> a
     1:1:com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods access$100(com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer):42:42 -> b
     1:1:com.android.tools.r8.graph.DexType getType():65:65 -> getType
-com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State -> com.android.tools.r8.internal.qD$a:
+com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State -> com.android.tools.r8.internal.eC$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap unusedBuilders -> d
     com.android.tools.r8.ir.conversion.MethodProcessor methodProcessor -> b
     com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer this$0 -> e
     boolean $assertionsDisabled -> a
     com.android.tools.r8.ir.conversion.MethodProcessingId methodProcessingId -> c
-    1:1:void <clinit>():146:146 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):153:153 -> <init>
-    2:6:void <init>(com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):151:155 -> <init>
-    1:3:void computeIsUnusedBuilder(com.android.tools.r8.ir.code.Value):167:169 -> a
-    4:41:boolean com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State.computeAllAliasesIfUnusedStringBuilder(com.android.tools.r8.ir.code.Value,java.util.Set):179:216 -> a
-    4:41:void computeIsUnusedBuilder(com.android.tools.r8.ir.code.Value):170 -> a
-    42:135:boolean com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State.computeAllAliasesIfUnusedStringBuilder(com.android.tools.r8.ir.code.Value,java.util.Set):202:295 -> a
-    42:135:void computeIsUnusedBuilder(com.android.tools.r8.ir.code.Value):170 -> a
-    136:143:boolean com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State.computeAllAliasesIfUnusedStringBuilder(com.android.tools.r8.ir.code.Value,java.util.Set):254:261 -> a
-    136:143:void computeIsUnusedBuilder(com.android.tools.r8.ir.code.Value):170 -> a
-    144:152:boolean com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State.computeAllAliasesIfUnusedStringBuilder(com.android.tools.r8.ir.code.Value,java.util.Set):238:246 -> a
-    144:152:void computeIsUnusedBuilder(com.android.tools.r8.ir.code.Value):170 -> a
-    153:153:boolean com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods.isConstructorMethod(com.android.tools.r8.graph.DexMethod):1704:1704 -> a
-    153:153:boolean com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State.computeAllAliasesIfUnusedStringBuilder(com.android.tools.r8.ir.code.Value,java.util.Set):246 -> a
-    153:153:void computeIsUnusedBuilder(com.android.tools.r8.ir.code.Value):170 -> a
-    154:154:boolean com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State.computeAllAliasesIfUnusedStringBuilder(com.android.tools.r8.ir.code.Value,java.util.Set):229:229 -> a
-    154:154:void computeIsUnusedBuilder(com.android.tools.r8.ir.code.Value):170 -> a
-    155:155:void computeIsUnusedBuilder(com.android.tools.r8.ir.code.Value):171:171 -> a
-    156:156:void lambda$computeIsUnusedBuilder$0(boolean,com.android.tools.r8.ir.code.Value):171:171 -> a
-    1:5:boolean isUnusedBuilder(com.android.tools.r8.ir.code.Value):159:163 -> b
-com.android.tools.r8.ir.optimize.library.StringMethodOptimizer -> com.android.tools.r8.internal.xD:
+    1:1:void <clinit>():149:149 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):156:156 -> <init>
+    2:6:void <init>(com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):154:158 -> <init>
+    1:3:void computeIsUnusedBuilder(com.android.tools.r8.ir.code.Value):170:172 -> a
+    4:41:boolean com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State.computeAllAliasesIfUnusedStringBuilder(com.android.tools.r8.ir.code.Value,java.util.Set):182:219 -> a
+    4:41:void computeIsUnusedBuilder(com.android.tools.r8.ir.code.Value):173 -> a
+    42:135:boolean com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State.computeAllAliasesIfUnusedStringBuilder(com.android.tools.r8.ir.code.Value,java.util.Set):205:298 -> a
+    42:135:void computeIsUnusedBuilder(com.android.tools.r8.ir.code.Value):173 -> a
+    136:143:boolean com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State.computeAllAliasesIfUnusedStringBuilder(com.android.tools.r8.ir.code.Value,java.util.Set):257:264 -> a
+    136:143:void computeIsUnusedBuilder(com.android.tools.r8.ir.code.Value):173 -> a
+    144:152:boolean com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State.computeAllAliasesIfUnusedStringBuilder(com.android.tools.r8.ir.code.Value,java.util.Set):241:249 -> a
+    144:152:void computeIsUnusedBuilder(com.android.tools.r8.ir.code.Value):173 -> a
+    153:153:boolean com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods.isConstructorMethod(com.android.tools.r8.graph.DexMethod):1685:1685 -> a
+    153:153:boolean com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State.computeAllAliasesIfUnusedStringBuilder(com.android.tools.r8.ir.code.Value,java.util.Set):249 -> a
+    153:153:void computeIsUnusedBuilder(com.android.tools.r8.ir.code.Value):173 -> a
+    154:154:boolean com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State.computeAllAliasesIfUnusedStringBuilder(com.android.tools.r8.ir.code.Value,java.util.Set):232:232 -> a
+    154:154:void computeIsUnusedBuilder(com.android.tools.r8.ir.code.Value):173 -> a
+    155:155:void computeIsUnusedBuilder(com.android.tools.r8.ir.code.Value):174:174 -> a
+    156:156:void lambda$computeIsUnusedBuilder$0(boolean,com.android.tools.r8.ir.code.Value):174:174 -> a
+    1:5:boolean isUnusedBuilder(com.android.tools.r8.ir.code.Value):162:166 -> b
+com.android.tools.r8.ir.optimize.library.StringMethodOptimizer -> com.android.tools.r8.internal.lC:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> b
     1:3:void <init>(com.android.tools.r8.graph.AppView):30:32 -> <init>
@@ -48301,51 +48608,19 @@
     4: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):49 -> a
     11:12: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):50:51 -> a
     13:13:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():164:164 -> a
-    13:13:void com.android.tools.r8.ir.optimize.library.StringMethodOptimizer.optimizeValueOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeStatic,java.util.Set):73 -> a
+    13:13:void com.android.tools.r8.ir.optimize.library.StringMethodOptimizer.optimizeValueOf(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeStatic):70 -> a
     13:13: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):51 -> a
-    14:31:void com.android.tools.r8.ir.optimize.library.StringMethodOptimizer.optimizeValueOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeStatic,java.util.Set):74:91 -> a
-    14:31: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):51 -> a
-    32:48:boolean isPrunedClassNameComparison(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):102:118 -> a
-    49:49:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> a
-    49:49:boolean isPrunedClassNameComparison(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):118 -> a
-    50:52:boolean isPrunedClassNameComparison(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):122:124 -> a
-    53:53:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
-    53:53:boolean isPrunedClassNameComparison(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):124 -> a
-    54:56:boolean isPrunedClassNameComparison(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):124:126 -> a
+    14:16:void com.android.tools.r8.ir.optimize.library.StringMethodOptimizer.optimizeValueOf(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeStatic):70:72 -> a
+    14:16: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):51 -> a
+    17:33:boolean isPrunedClassNameComparison(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):84:100 -> a
+    34:34:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> a
+    34:34:boolean isPrunedClassNameComparison(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):100 -> a
+    35:37:boolean isPrunedClassNameComparison(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):104:106 -> a
+    38:38:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
+    38:38:boolean isPrunedClassNameComparison(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):106 -> a
+    39:41:boolean isPrunedClassNameComparison(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):106:108 -> a
     1:1:com.android.tools.r8.graph.DexType getType():37:37 -> getType
-com.android.tools.r8.ir.optimize.library.sideeffects.JavaLangObjectsSideEffectCollection -> com.android.tools.r8.internal.aj:
-    boolean $assertionsDisabled -> a
-    1:1:void <clinit>():18:18 -> <clinit>
-    1:12:boolean toStringMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.List):22:33 -> a
-    13:13:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):283:283 -> a
-    13:13:boolean toStringMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.List):33 -> a
-    14:20:boolean toStringMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.List):35:41 -> a
-    21:21:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeNoSideEffectsMethod(com.android.tools.r8.graph.DexMethod):587:587 -> a
-    21:21:boolean toStringMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.List):44 -> a
-    22:27:boolean toStringMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.List):49:54 -> a
-com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo -> com.android.tools.r8.internal.P1:
-    com.android.tools.r8.shaking.ProguardMemberRule rule -> b
-    com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$AssumeType type -> a
-    1:3:void <init>(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$AssumeType,com.android.tools.r8.shaking.ProguardMemberRule):26:28 -> <init>
-    1:1:com.android.tools.r8.shaking.ProguardMemberRuleReturnValue getReturnInfo():36:36 -> a
-    2:2:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo meet(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):48:48 -> a
-    3:5:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$AssumeType com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$AssumeType.meet(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$AssumeType):17:19 -> a
-    3:5:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo meet(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):48 -> a
-    6:6:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo meet(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):48:48 -> a
-    1:1:boolean hasReturnInfo():32:32 -> b
-    1:1:boolean isAssumeNoSideEffects():40:40 -> c
-    1:1:boolean isAssumeValues():44:44 -> d
-    1:5:boolean equals(java.lang.Object):56:60 -> equals
-    1:1:int hashCode():65:65 -> hashCode
-com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$AssumeType -> com.android.tools.r8.internal.O1:
-    com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$AssumeType ASSUME_VALUES -> b
-    com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$AssumeType ASSUME_NO_SIDE_EFFECTS -> a
-    1:2:void <clinit>():13:14 -> <clinit>
-    1:1:void <init>(java.lang.String,int):12:12 -> <init>
-com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfoLookup -> com.android.tools.r8.internal.Q1:
-    1:8:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo lookupAssumeInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClassAndMethod):22:29 -> a
-    9:23:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo lookupAssumeInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClassAndMember):35:49 -> a
-com.android.tools.r8.ir.optimize.peepholes.BasicBlockMuncher -> com.android.tools.r8.internal.j2:
+com.android.tools.r8.ir.optimize.peepholes.BasicBlockMuncher -> com.android.tools.r8.internal.e2:
     1:1:java.util.List com.android.tools.r8.ir.optimize.peepholes.BasicBlockMuncher.nonDestructivePeepholes():23:23 -> a
     1:1:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):39 -> a
     2:2:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):39:39 -> a
@@ -48363,10 +48638,10 @@
     43:45:void runPeepholes(com.android.tools.r8.ir.code.IRCode,java.util.List,com.android.tools.r8.utils.InternalOptions):79 -> a
     46:46:java.lang.Object com.android.tools.r8.ir.code.BasicBlockIterator.next():10:10 -> a
     46:46:void runPeepholes(com.android.tools.r8.ir.code.IRCode,java.util.List,com.android.tools.r8.utils.InternalOptions):81 -> a
-com.android.tools.r8.ir.optimize.peepholes.BasicBlockPeephole -> com.android.tools.r8.internal.k2:
+com.android.tools.r8.ir.optimize.peepholes.BasicBlockPeephole -> com.android.tools.r8.internal.f2:
     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.Ca:
+com.android.tools.r8.ir.optimize.peepholes.DupDupDupPeephole -> com.android.tools.r8.internal.Y9:
     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
@@ -48391,7 +48666,7 @@
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isDup():0:0 -> c
     2:2:boolean lambda$new$2(com.android.tools.r8.ir.code.Instruction):35 -> c
     3:3: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.ep:
+com.android.tools.r8.ir.optimize.peepholes.LoadLoadDupPeephole -> com.android.tools.r8.internal.ho:
     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
@@ -48402,14 +48677,15 @@
     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):39:39 -> 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.iq:
+com.android.tools.r8.ir.optimize.peepholes.Match -> com.android.tools.r8.internal.fp:
     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.tr:
-    com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout layout -> f
+com.android.tools.r8.ir.optimize.peepholes.MoveLoadUpPeephole -> com.android.tools.r8.internal.qq:
+    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
     com.android.tools.r8.ir.code.Value local -> b
+    com.android.tools.r8.ir.optimize.peepholes.Wildcard canMoveOver -> f
     boolean $assertionsDisabled -> a
     int stackHeight -> c
     1:1:void <clinit>():33:33 -> <clinit>
@@ -48438,12 +48714,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.bv:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression -> com.android.tools.r8.internal.Ut:
     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.cv:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeHelper -> com.android.tools.r8.internal.Vt:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:java.util.function.Predicate withoutLocalInfo(java.util.function.Predicate):17:17 -> a
@@ -48454,16 +48730,22 @@
     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.dv:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout -> com.android.tools.r8.internal.Wt:
     com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression[] expressions -> b
     java.util.List instructions -> a
     boolean backwards -> c
     1:8:void <init>(boolean,com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression[]):18:25 -> <init>
     1:1:com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout lookBackward(com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression[]):33:33 -> a
-    2:5:com.android.tools.r8.ir.optimize.peepholes.Match test(com.android.tools.r8.ir.code.InstructionListIterator):37:40 -> a
-    6:42:com.android.tools.r8.ir.optimize.peepholes.Match testDirection(java.util.function.Supplier,java.util.function.Supplier,java.lang.Runnable):48:84 -> a
+    2:2:java.lang.Boolean lambda$test$0(com.android.tools.r8.ir.code.InstructionListIterator):38:38 -> a
+    3:39:com.android.tools.r8.ir.optimize.peepholes.Match testDirection(java.util.function.Supplier,java.util.function.Supplier,java.lang.Runnable):48:84 -> a
     1:1:com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout lookForward(com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression[]):29:29 -> b
-com.android.tools.r8.ir.optimize.peepholes.Point -> com.android.tools.r8.internal.mv:
+    2:2:com.android.tools.r8.ir.code.Instruction lambda$test$1(com.android.tools.r8.ir.code.InstructionListIterator):38:38 -> b
+    1:1:void lambda$test$2(com.android.tools.r8.ir.code.InstructionListIterator):38:38 -> c
+    1:1:java.lang.Boolean lambda$test$3(com.android.tools.r8.ir.code.InstructionListIterator):40:40 -> d
+    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.fu:
     java.util.function.Predicate predicate -> b
     boolean $assertionsDisabled -> a
     int index -> c
@@ -48475,7 +48757,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.Vz:
+com.android.tools.r8.ir.optimize.peepholes.RemoveDebugPositionPeephole -> com.android.tools.r8.internal.Hy:
     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
@@ -48485,14 +48767,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.fD:
+com.android.tools.r8.ir.optimize.peepholes.StoreLoadPeephole -> com.android.tools.r8.internal.VB:
     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.gD:
+com.android.tools.r8.ir.optimize.peepholes.StoreLoadToDupStorePeephole -> com.android.tools.r8.internal.WB:
     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
@@ -48511,7 +48793,7 @@
     24:24:boolean com.android.tools.r8.ir.code.Instruction.isDup():0:0 -> a
     24:24:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):62 -> a
     25:43: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.hD:
+com.android.tools.r8.ir.optimize.peepholes.StoreSequenceLoadPeephole -> com.android.tools.r8.internal.XB:
     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
@@ -48537,7 +48819,7 @@
     3:3:boolean com.android.tools.r8.ir.code.Instruction.isLoad():0:0 -> c
     3:3:boolean lambda$new$2(com.android.tools.r8.ir.code.Instruction):73 -> c
     4:5: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.kH:
+com.android.tools.r8.ir.optimize.peepholes.Wildcard -> com.android.tools.r8.internal.CG:
     java.util.function.Predicate predicate -> b
     boolean $assertionsDisabled -> a
     int index -> c
@@ -48549,7 +48831,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.T6:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer -> com.android.tools.r8.internal.E6:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.ir.conversion.IRConverter converter -> d
     java.util.concurrent.ConcurrentHashMap candidates -> f
@@ -48568,106 +48850,103 @@
     62:63:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.markNotEligible(com.android.tools.r8.graph.DexType,java.util.Set):187:188 -> a
     62:63:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):139 -> a
     64:64:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):143:143 -> a
-    65:65:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.getProto():388:388 -> a
+    65:65:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.getProto():397:397 -> a
     65:65:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):144 -> a
-    66:66:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexMethod.getProto():62:62 -> a
-    66:66:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.getProto():388 -> a
-    66:66:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):144 -> a
-    67:67:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):144:144 -> a
-    68:69:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.markNotEligible(com.android.tools.r8.graph.DexType,java.util.Set):187:188 -> a
-    68:69:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):145 -> a
-    70:70:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():505:505 -> a
-    70:70:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):147 -> a
-    71:71:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):148:148 -> a
-    72:73:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.markNotEligible(com.android.tools.r8.graph.DexType,java.util.Set):187:188 -> a
-    72:73:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):148 -> a
-    74:86:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):153:165 -> a
-    87:88:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.markNotEligible(com.android.tools.r8.graph.DexType,java.util.Set):187:188 -> a
-    87:88:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):165 -> a
-    89:93:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):171:175 -> a
-    94:99:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isPinned(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):193:198 -> a
-    94:99:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):176 -> a
-    100:103:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):177:180 -> a
-    104:117:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):228:241 -> a
-    118:131:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):238:251 -> a
-    132:135:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):533:536 -> a
-    132:135:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):252 -> a
-    136:136:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    136:136:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):536 -> a
-    136:136:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):252 -> a
-    137:142:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):537:542 -> a
-    137:142:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):252 -> a
-    143:143:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
-    143:143:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):545 -> a
-    143:143:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):252 -> a
-    144:149:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):545:550 -> a
-    144:149:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):252 -> a
-    150:181:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):254:285 -> a
-    182:190:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):392:400 -> a
-    182:190:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):286 -> a
-    191:191:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.isHostClassInitializer(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    66:66:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):144:144 -> a
+    67:68:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.markNotEligible(com.android.tools.r8.graph.DexType,java.util.Set):187:188 -> a
+    67:68:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):145 -> a
+    69:69:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():518:518 -> a
+    69:69:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):147 -> a
+    70:70:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):148:148 -> a
+    71:72:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.markNotEligible(com.android.tools.r8.graph.DexType,java.util.Set):187:188 -> a
+    71:72:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):148 -> a
+    73:85:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):153:165 -> a
+    86:87:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.markNotEligible(com.android.tools.r8.graph.DexType,java.util.Set):187:188 -> a
+    86:87:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):165 -> a
+    88:92:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):171:175 -> a
+    93:98:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isPinned(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):193:198 -> a
+    93:98:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):176 -> a
+    99:102:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):177:180 -> a
+    103:116:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):228:241 -> a
+    117:130:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):238:251 -> a
+    131:134:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):533:536 -> a
+    131:134:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):252 -> a
+    135:135:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    135:135:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):536 -> a
+    135:135:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):252 -> a
+    136:141:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):537:542 -> a
+    136:141:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):252 -> a
+    142:142:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
+    142:142:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):545 -> a
+    142:142:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):252 -> a
+    143:148:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):545:550 -> a
+    143:148:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):252 -> a
+    149:180:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):254:285 -> a
+    181:189:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):392:400 -> a
+    181:189:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):286 -> a
+    190:190:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.isHostClassInitializer(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    190:190:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):403 -> a
+    190:190:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):286 -> a
+    191:191:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostType():87:87 -> a
+    191:191:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.isHostClassInitializer(com.android.tools.r8.graph.ProgramMethod):83 -> a
     191:191:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):403 -> a
     191:191:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):286 -> a
-    192:192:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostType():87:87 -> a
-    192:192:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.isHostClassInitializer(com.android.tools.r8.graph.ProgramMethod):83 -> a
-    192:192:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):403 -> a
-    192:192:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):286 -> a
-    193:233:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):406:446 -> a
-    193:233:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):286 -> a
-    234:234:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isNonThrowingConstInstruction(com.android.tools.r8.ir.code.Instruction):481:481 -> a
-    234:234:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):446 -> a
-    234:234:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):286 -> a
-    235:250:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):449:464 -> a
-    235:250:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):286 -> a
-    251:257:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidStaticPut(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction):516:522 -> a
-    251:257:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):465 -> a
-    251:257:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):286 -> a
-    258:267:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):466:475 -> a
-    258:267:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):286 -> a
-    268:274:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):288:294 -> a
-    275:276:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):383:384 -> a
-    275:276:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):294 -> a
-    277:277:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
-    277:277:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):385 -> a
+    192:232:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):406:446 -> a
+    192:232:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):286 -> a
+    233:233:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isNonThrowingConstInstruction(com.android.tools.r8.ir.code.Instruction):481:481 -> a
+    233:233:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):446 -> a
+    233:233:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):286 -> a
+    234:249:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):449:464 -> a
+    234:249:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):286 -> a
+    250:256:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidStaticPut(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction):516:522 -> a
+    250:256:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):465 -> a
+    250:256:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):286 -> a
+    257:266:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):466:475 -> a
+    257:266:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):286 -> a
+    267:273:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):288:294 -> a
+    274:275:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):383:384 -> a
+    274:275:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):294 -> a
+    276:276:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
+    276:276:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):385 -> a
+    276:276:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):294 -> a
+    277:277:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):386:386 -> a
     277:277:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):294 -> a
-    278:278:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):386:386 -> a
-    278:278:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):294 -> a
-    279:284:boolean com.android.tools.r8.ir.code.Goto.isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):104:109 -> a
-    279:284:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):386 -> a
-    279:284:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):294 -> a
-    285:285:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):387:387 -> a
-    285:285:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):294 -> a
-    286:303:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):295:312 -> a
-    304:304:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    304:304:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):317 -> a
-    305:305:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):319:319 -> a
-    306:318:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processStaticFieldRead(com.android.tools.r8.ir.code.StaticGet):563:575 -> a
-    306:318:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):319 -> a
-    319:331:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):321:333 -> a
-    332:341:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic):583:592 -> a
-    332:341:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):333 -> a
-    342:357:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):335:350 -> a
-    358:358:boolean com.android.tools.r8.ir.code.Instruction.isInvokeCustom():0:0 -> a
-    358:358:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):355 -> a
-    359:360:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):357:358 -> a
-    361:361:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
-    361:361:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):362 -> a
-    362:367:void examineMethodCode(com.android.tools.r8.ir.code.IRCode) -> a
-    368:371:void addReferencedFrom(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.graph.ProgramMethod):375:378 -> a
-    372:372:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder lambda$addReferencedFrom$2(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo):377:377 -> a
-    373:398:boolean isValidInitCall(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):486:511 -> a
-    399:399:boolean lambda$isValidInitCall$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):496:496 -> a
-    400:405:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):599:604 -> a
-    406:408:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):603:605 -> a
-    409:412: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
-    413:413:boolean isValidValueUser(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean,java.util.Set,com.android.tools.r8.ir.code.Instruction):634:634 -> a
-    414:414:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
-    414:414:boolean isValidValueUser(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean,java.util.Set,com.android.tools.r8.ir.code.Instruction):634 -> a
-    415:446:boolean isValidValueUser(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean,java.util.Set,com.android.tools.r8.ir.code.Instruction):635:666 -> a
-    447:447:void staticizeCandidates(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):690:690 -> a
+    278:283:boolean com.android.tools.r8.ir.code.Goto.isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):104:109 -> a
+    278:283:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):386 -> a
+    278:283:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):294 -> a
+    284:284:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):387:387 -> a
+    284:284:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):294 -> a
+    285:302:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):295:312 -> a
+    303:303:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    303:303:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):317 -> a
+    304:304:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):319:319 -> a
+    305:317:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processStaticFieldRead(com.android.tools.r8.ir.code.StaticGet):563:575 -> a
+    305:317:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):319 -> a
+    318:330:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):321:333 -> a
+    331:340:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic):583:592 -> a
+    331:340:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):333 -> a
+    341:356:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):335:350 -> a
+    357:357:boolean com.android.tools.r8.ir.code.Instruction.isInvokeCustom():0:0 -> a
+    357:357:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):355 -> a
+    358:359:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):357:358 -> a
+    360:360:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
+    360:360:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):362 -> a
+    361:366:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):362:367 -> a
+    367:370:void addReferencedFrom(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.graph.ProgramMethod):375:378 -> a
+    371:371:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder lambda$addReferencedFrom$2(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo):377:377 -> a
+    372:397:boolean isValidInitCall(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):486:511 -> a
+    398:398:boolean lambda$isValidInitCall$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):496:496 -> a
+    399:404:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):599:604 -> a
+    405:407:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):603:605 -> a
+    408:411: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
+    412:412:boolean isValidValueUser(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean,java.util.Set,com.android.tools.r8.ir.code.Instruction):634:634 -> a
+    413:413:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
+    413:413:boolean isValidValueUser(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean,java.util.Set,com.android.tools.r8.ir.code.Instruction):634 -> a
+    414:445:boolean isValidValueUser(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean,java.util.Set,com.android.tools.r8.ir.code.Instruction):635:666 -> a
+    446:446: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.Q6:
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator -> com.android.tools.r8.internal.R6:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1 -> com.android.tools.r8.internal.B6:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator -> com.android.tools.r8.internal.C6:
     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>
@@ -48689,7 +48968,7 @@
     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
     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.S6:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo -> com.android.tools.r8.internal.D6:
     java.util.concurrent.atomic.AtomicInteger fieldWrites -> e
     java.util.concurrent.atomic.AtomicInteger instancesCreated -> f
     java.util.concurrent.atomic.AtomicReference constructor -> g
@@ -48705,15 +48984,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:4:com.android.tools.r8.graph.DexProgramClass hostClass():91:92 -> a
+    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> 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.U6:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizerGraphLens -> com.android.tools.r8.internal.F6:
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():15:15 -> <clinit>
     1:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap):22:27 -> <init>
     7:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap):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):32:34 -> b
-com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor -> com.android.tools.r8.internal.dD:
+com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor -> com.android.tools.r8.internal.TB:
     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
@@ -48758,171 +49039,180 @@
     198:198:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
     198:198:boolean com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.validMethods(com.android.tools.r8.utils.collections.ProgramMethodSet):335 -> a
     198:198:void prepareCandidates(java.util.Map):326 -> a
-    199:200:boolean com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.validMethods(com.android.tools.r8.utils.collections.ProgramMethodSet):336:337 -> a
-    199:200:void prepareCandidates(java.util.Map):326 -> a
-    201:204:void prepareCandidates(java.util.Map):327:330 -> a
-    205:207:boolean lambda$prepareCandidates$8(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):312:314 -> a
-    208:212:void enqueueMethodsWithCodeOptimizations(java.lang.Iterable,java.util.function.Consumer):345:349 -> a
-    213:213:void enqueueMethodsWithCodeOptimizations(java.lang.Iterable,java.util.function.Consumer):348:348 -> a
-    214:214:void enqueueMethodsWithCodeOptimizations(java.lang.Iterable,java.util.function.Consumer):347:347 -> a
-    215:215:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder lambda$enqueueMethodsWithCodeOptimizations$9(com.android.tools.r8.graph.DexEncodedMethod):349:349 -> a
-    216:229:void processMethodsConcurrently(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):365:378 -> a
-    230:233:void lambda$processMethodsConcurrently$10(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId):369:369 -> a
-    234:237: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.OneTimeMethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):388:391 -> a
-    238:238:void lambda$forEachMethod$11(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,java.util.function.BiConsumer):389:389 -> a
-    239:241:void insertAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):395:397 -> a
-    242:242:java.util.function.BiConsumer collectOptimizationInfo(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):403:403 -> a
-    243:250:void lambda$collectOptimizationInfo$12(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):404:404 -> a
-    251:251:boolean lambda$rewriteReferences$13(com.android.tools.r8.ir.code.Instruction):472:472 -> a
-    252:252:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    252:252:boolean lambda$rewriteReferences$13(com.android.tools.r8.ir.code.Instruction):472 -> a
-    253:255:boolean lambda$rewriteReferences$13(com.android.tools.r8.ir.code.Instruction):472:474 -> a
-    256:260:boolean lambda$rewriteReferences$13(com.android.tools.r8.ir.code.Instruction):473:477 -> a
-    261:261:boolean lambda$rewriteReferences$13(com.android.tools.r8.ir.code.Instruction):476:476 -> a
-    262:282:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):505:525 -> a
-    283:287:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):532:536 -> a
-    288:305:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):535:552 -> a
-    306:317:boolean testAndCollectPhisComposedOfSameMember(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMember,java.util.Set):591:602 -> a
-    318:318:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    318:318:boolean testAndCollectPhisComposedOfSameMember(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMember,java.util.Set):602 -> a
-    319:319:boolean testAndCollectPhisComposedOfSameMember(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMember,java.util.Set):602:602 -> a
-    320:320:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    320:320:boolean testAndCollectPhisComposedOfSameMember(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMember,java.util.Set):605 -> a
-    321:335:boolean testAndCollectPhisComposedOfSameMember(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMember,java.util.Set):605:619 -> a
-    336:342:void fixupStaticizedFieldUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMember):627:633 -> a
-    343:360:void fixupStaticizedFieldUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMember):632:649 -> a
-    361:362:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):653:654 -> a
-    363:363:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
-    363:363:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):654 -> a
-    364:377:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):657:670 -> a
-    378:378:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):312:312 -> a
-    378:378:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):669 -> a
-    379:379:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
-    379:379:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):312 -> a
-    379:379:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):669 -> a
-    380:380:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):729:729 -> a
-    381:381:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():881:881 -> a
-    381:381:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):731 -> a
-    382:384:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):731:733 -> a
-    385:385:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():881:881 -> a
-    385:385:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):735 -> a
-    386:386:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):735:735 -> a
-    387:390:boolean classMembersConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):786:789 -> a
-    391:391:boolean lambda$classMembersConflict$14(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):788:788 -> a
-    392:392:boolean lambda$classMembersConflict$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):789:789 -> a
-    393:397:boolean hasMembersNotStaticized(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):795:799 -> a
-    398:398: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):873:873 -> a
-    399:399:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():881:881 -> a
-    399:399: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):874 -> a
-    400:401: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):875:876 -> a
-    402:402: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):874:874 -> a
+    199:199:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    199:199:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89 -> a
+    199:199:boolean com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.validMethods(com.android.tools.r8.utils.collections.ProgramMethodSet):335 -> a
+    199:199:void prepareCandidates(java.util.Map):326 -> a
+    200:201:boolean com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.validMethods(com.android.tools.r8.utils.collections.ProgramMethodSet):336:337 -> a
+    200:201:void prepareCandidates(java.util.Map):326 -> a
+    202:205:void prepareCandidates(java.util.Map):327:330 -> a
+    206:208:boolean lambda$prepareCandidates$8(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):312:314 -> a
+    209:213:void enqueueMethodsWithCodeOptimizations(java.lang.Iterable,java.util.function.Consumer):345:349 -> a
+    214:214:void enqueueMethodsWithCodeOptimizations(java.lang.Iterable,java.util.function.Consumer):348:348 -> a
+    215:215:void enqueueMethodsWithCodeOptimizations(java.lang.Iterable,java.util.function.Consumer):347:347 -> a
+    216:216:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder lambda$enqueueMethodsWithCodeOptimizations$9(com.android.tools.r8.graph.DexEncodedMethod):349:349 -> a
+    217:230:void processMethodsConcurrently(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):365:378 -> a
+    231:234:void lambda$processMethodsConcurrently$10(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId):369:369 -> a
+    235:238: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.OneTimeMethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):388:391 -> a
+    239:239:void lambda$forEachMethod$11(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,java.util.function.BiConsumer):389:389 -> a
+    240:242:void insertAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):395:397 -> a
+    243:243:java.util.function.BiConsumer collectOptimizationInfo(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):403:403 -> a
+    244:251:void lambda$collectOptimizationInfo$12(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):404:404 -> a
+    252:252:boolean lambda$rewriteReferences$13(com.android.tools.r8.ir.code.Instruction):471:471 -> a
+    253:253:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    253:253:boolean lambda$rewriteReferences$13(com.android.tools.r8.ir.code.Instruction):471 -> a
+    254:256:boolean lambda$rewriteReferences$13(com.android.tools.r8.ir.code.Instruction):471:473 -> a
+    257:261:boolean lambda$rewriteReferences$13(com.android.tools.r8.ir.code.Instruction):472:476 -> a
+    262:262:boolean lambda$rewriteReferences$13(com.android.tools.r8.ir.code.Instruction):475:475 -> a
+    263:283:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):504:524 -> a
+    284:288:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):531:535 -> a
+    289:306:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):534:551 -> a
+    307:318:boolean testAndCollectPhisComposedOfSameMember(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMember,java.util.Set):590:601 -> a
+    319:319:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    319:319:boolean testAndCollectPhisComposedOfSameMember(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMember,java.util.Set):601 -> a
+    320:320:boolean testAndCollectPhisComposedOfSameMember(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMember,java.util.Set):601:601 -> a
+    321:321:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    321:321:boolean testAndCollectPhisComposedOfSameMember(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMember,java.util.Set):604 -> a
+    322:336:boolean testAndCollectPhisComposedOfSameMember(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMember,java.util.Set):604:618 -> a
+    337:343:void fixupStaticizedFieldUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMember):626:632 -> a
+    344:361:void fixupStaticizedFieldUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMember):631:648 -> a
+    362:363:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):652:653 -> a
+    364:364:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
+    364:364:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):653 -> a
+    365:378:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):656:669 -> a
+    379:379:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):312:312 -> a
+    379:379:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):668 -> a
+    380:380:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
+    380:380:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):312 -> a
+    380:380:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):668 -> a
+    381:381:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):728:728 -> a
+    382:382:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():880:880 -> a
+    382:382:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):730 -> a
+    383:385:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):730:732 -> a
+    386:386:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():880:880 -> a
+    386:386:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):734 -> a
+    387:387:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):734:734 -> a
+    388:391:boolean classMembersConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):785:788 -> a
+    392:392:boolean lambda$classMembersConflict$14(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):787:787 -> a
+    393:393:boolean lambda$classMembersConflict$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):788:788 -> a
+    394:398:boolean hasMembersNotStaticized(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):794:798 -> a
+    399:399: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:872 -> a
+    400:400:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():880:880 -> a
+    400:400: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):873 -> a
+    401:402: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):874:875 -> a
+    403:403: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):873:873 -> a
     1:28:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):103:130 -> b
-    29:29:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():741:741 -> b
+    29:29:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():740:740 -> b
     29:29:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
     30:30:void com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap.<init>():21:21 -> b
-    30:30:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():741 -> b
+    30:30:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():740 -> b
     30:30:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
-    31:31:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():743:743 -> b
+    31:31:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():742:742 -> b
     31:31:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
     32:32:void com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap.<init>():21:21 -> b
-    32:32:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():743 -> b
+    32:32:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():742 -> b
     32:32:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
-    33:41:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():746:754 -> b
+    33:41:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():745:753 -> b
     33:41:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
-    42:42:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():881:881 -> b
-    42:42:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():755 -> b
+    42:42:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():880:880 -> b
+    42:42:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():754 -> b
     42:42:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
-    43:51:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():755:763 -> b
+    43:51:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():754:762 -> b
     43:51:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
     52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostType():87:87 -> b
-    52:52:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():766 -> b
+    52:52:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():765 -> b
     52:52:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
-    53:57:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():767:771 -> b
-    53:57:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
-    58:100:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):809:851 -> b
-    58:100:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():773 -> b
-    58:100:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
-    101:101:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():881:881 -> b
-    101:101:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):854 -> b
-    101:101:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():773 -> b
-    101:101:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
-    102:102:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):854:854 -> b
-    102:102:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():773 -> b
-    102:102:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
-    103:119:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):853:869 -> b
-    103:119:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():773 -> b
-    103:119:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
-    120:121:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():779:780 -> b
-    120:121:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
-    122:136:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):139:153 -> b
-    137:140:void lambda$run$3(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):144:147 -> b
-    141:141:boolean lambda$finalEligibilityCheck$4(com.android.tools.r8.graph.DexEncodedMethod):203:203 -> b
-    142:153:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):414:425 -> b
-    154:154:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():881:881 -> b
-    154:154:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):425 -> b
-    155:162:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):425:432 -> b
-    163:163:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):42:42 -> b
-    163:163:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):432 -> b
-    164:164:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):433:433 -> b
-    165:165:void com.android.tools.r8.ir.code.Instruction.removeOrReplaceByDebugLocalRead(com.android.tools.r8.ir.code.IRCode):308:308 -> b
-    165:165:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):434 -> b
-    166:172:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):437:443 -> b
-    173:173:void com.android.tools.r8.ir.code.Instruction.removeOrReplaceByDebugLocalRead(com.android.tools.r8.ir.code.IRCode):308:308 -> b
-    173:173:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):444 -> b
-    174:177:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):446:449 -> b
-    178:178:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):312:312 -> b
-    178:178:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):448 -> b
-    179:179:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> 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):312 -> 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.Instruction.removeOrReplaceByDebugLocalRead(com.android.tools.r8.ir.code.IRCode):308:308 -> b
-    180:180:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):451 -> b
-    181:181:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):457:457 -> b
+    53:54:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():766:767 -> b
+    53:54:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
+    55:55:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> b
+    55:55:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():767 -> b
+    55:55:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
+    56:59:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():767:770 -> b
+    56:59:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
+    60:102:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):808:850 -> b
+    60:102:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():772 -> b
+    60:102:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
+    103:103:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():880:880 -> b
+    103:103:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):853 -> b
+    103:103:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():772 -> b
+    103:103:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
+    104:104:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):853:853 -> b
+    104:104:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():772 -> b
+    104:104:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
+    105:121:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):852:868 -> b
+    105:121:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():772 -> b
+    105:121:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
+    122:123:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():778:779 -> b
+    122:123:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
+    124:138:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):139:153 -> b
+    139:142:void lambda$run$3(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):144:147 -> b
+    143:143:boolean lambda$finalEligibilityCheck$4(com.android.tools.r8.graph.DexEncodedMethod):203:203 -> b
+    144:155:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):414:425 -> b
+    156:156:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():880:880 -> b
+    156:156:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):425 -> b
+    157:164:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):425:432 -> b
+    165:165:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):42:42 -> b
+    165:165:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):432 -> b
+    166:166:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):433:433 -> b
+    167:167:void com.android.tools.r8.ir.code.Instruction.removeOrReplaceByDebugLocalRead(com.android.tools.r8.ir.code.IRCode):308:308 -> b
+    167:167:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):434 -> b
+    168:174:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):437:443 -> b
+    175:175:void com.android.tools.r8.ir.code.Instruction.removeOrReplaceByDebugLocalRead(com.android.tools.r8.ir.code.IRCode):308:308 -> b
+    175:175:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):444 -> b
+    176:179:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):446: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):312:312 -> 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):39:39 -> 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):312 -> 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):308:308 -> 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
     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):462:462 -> c
-    1:14:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):469:482 -> d
+    2:2:void removeReferencesToThis(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):461:461 -> c
+    1:14:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):468:481 -> d
     15:15:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> d
-    15:15:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):482 -> d
-    16:27:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):483:494 -> d
+    15:15:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):481 -> d
+    16:27:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):482:493 -> d
     28:28:void com.android.tools.r8.ir.code.Instruction.removeOrReplaceByDebugLocalRead(com.android.tools.r8.ir.code.IRCode):308:308 -> d
-    28:28:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):495 -> d
-    29:29:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):498:498 -> d
-    30:30:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1030:1030 -> d
-    30:30:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):676 -> d
-    30:30:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):499 -> d
-    31:34:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):677:680 -> d
-    31:34:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):499 -> d
+    28:28:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):494 -> d
+    29:29:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):497:497 -> d
+    30:30:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1025:1025 -> d
+    30:30:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):675 -> d
+    30:30:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):498 -> d
+    31:34:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):676:679 -> d
+    31:34:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):498 -> d
     35:35:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> d
-    35:35:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):680 -> d
-    35:35:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):499 -> d
-    36:45:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):681:690 -> d
-    36:45:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):499 -> d
-    46:48:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):689:691 -> d
-    46:48:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):499 -> d
-    49:49:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):688:688 -> d
-    49:49:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):499 -> d
+    35:35:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):679 -> d
+    35:35:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):498 -> d
+    36:45:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):680:689 -> d
+    36:45:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):498 -> d
+    46:48:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):688:690 -> d
+    46:48:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):498 -> d
+    49:49:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):687:687 -> d
+    49:49:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):498 -> d
     50:50:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> d
-    50:50:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):686 -> d
-    50:50:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):499 -> d
-    51:55:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):697:701 -> d
-    51:55:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):499 -> d
+    50:50:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):685 -> d
+    50:50:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):498 -> d
+    51:55:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):696:700 -> d
+    51:55:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):498 -> d
     56:56:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> d
-    56:56:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):701 -> d
-    56:56:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):499 -> d
-    57:60:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):706:709 -> d
-    57:60:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):499 -> d
-    61:61:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():881:881 -> d
-    61:61:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):711 -> d
-    61:61:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):499 -> d
-    62:70:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):711:719 -> d
-    62:70:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):499 -> d
-    71:73:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):718:720 -> d
-    71:73:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):499 -> d
-    74:78:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):717:721 -> d
-    74:78:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):499 -> d
+    56:56:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):700 -> d
+    56:56:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):498 -> d
+    57:60:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):705:708 -> d
+    57:60:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):498 -> d
+    61:61:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():880:880 -> d
+    61:61:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):710 -> d
+    61:61:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):498 -> d
+    62:70:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):710:718 -> d
+    62:70:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):498 -> d
+    71:73:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):717:719 -> d
+    71:73:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):498 -> d
+    74:78:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):716:720 -> d
+    74:78:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):498 -> d
     79:79:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> d
-    79:79:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):721 -> d
-    79:79:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):499 -> d
+    79:79:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):720 -> d
+    79:79: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:
 com.android.tools.r8.ir.optimize.string.StringBuilderAppendFlowAnalysis$1 -> com.android.tools.r8.ir.optimize.string.a:
 com.android.tools.r8.ir.optimize.string.StringBuilderAppendFlowAnalysis$AbstractStateImpl -> com.android.tools.r8.ir.optimize.string.b:
@@ -49063,10 +49353,12 @@
     2:5:void <init>(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer,com.android.tools.r8.ir.code.Value):902:905 -> <init>
     1:1:void logEscapingRoute(boolean):910:910 -> 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):920:929 -> a
-    12:12:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> 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):930 -> a
-    13:76: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):931:994 -> a
-    77:77: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):921:921 -> a
+    12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> 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):929 -> 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):930 -> a
+    14:77: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):931:994 -> a
+    78:78: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):921:921 -> a
 com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis -> com.android.tools.r8.ir.optimize.string.f$e:
     java.util.Map builderStates -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap builderToStringCounts -> c
@@ -49099,7 +49391,7 @@
     209:225:void logHistogramOfChains(java.util.List,boolean):551:567 -> a
     226:226:void logHistogramOfChains(java.util.List,boolean):562:562 -> a
     227:228:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):578:579 -> a
-    229:229:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1030:1030 -> a
+    229:229:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1025:1025 -> a
     229:229:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):579 -> a
     230:265:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):580:615 -> a
     266:270:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):614:618 -> a
@@ -49111,7 +49403,7 @@
     284:284:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
     284:284:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):596 -> a
     285:310:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):599:624 -> a
-    311:311:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
+    311:311:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
     311:311:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):624 -> a
     312:312:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):624:624 -> a
     313:339:boolean isToStringOfInterest(java.util.Set,com.android.tools.r8.ir.code.Instruction):630:656 -> a
@@ -49129,27 +49421,27 @@
     1:1:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$200(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):196:196 -> b
     2:40:java.lang.Number extractConstantNumber(com.android.tools.r8.ir.code.Value):472:510 -> b
     41:49:void removeTrivialBuilders():734:742 -> b
-    50:50:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1030:1030 -> b
+    50:50:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1025:1025 -> b
     50:50:void removeTrivialBuilders():742 -> b
     51:59:void removeTrivialBuilders():744:752 -> b
     60:60:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> b
     60:60:void removeTrivialBuilders():752 -> b
     61:83:void removeTrivialBuilders():756:778 -> b
-    84:84:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1030:1030 -> b
+    84:84:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1025:1025 -> b
     84:84:void removeTrivialBuilders():778 -> b
     85:100:void removeTrivialBuilders():779:794 -> b
     101:101:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> b
     101:101:void removeTrivialBuilders():798 -> b
     102:112:void removeTrivialBuilders():798:808 -> b
-    113:113:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1030:1030 -> b
+    113:113:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1025:1025 -> b
     113:113:void removeTrivialBuilders():808 -> b
     114:124:void removeTrivialBuilders():809:819 -> b
-    125:125:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> b
+    125:125:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> b
     125:125:void removeTrivialBuilders():819 -> b
     126:128:void removeTrivialBuilders():819:821 -> 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.zD:
+com.android.tools.r8.ir.optimize.string.StringOptimizer -> com.android.tools.r8.internal.nC:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.graph.AppView appView -> b
     int numberOfSimplifiedConversions -> j
@@ -49169,7 +49461,7 @@
     35:37:void lambda$logResult$0(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping,java.lang.Integer):87:87 -> a
     38:40:void lambda$logResult$2(java.lang.Integer,java.lang.Integer):101:101 -> a
     41:44:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):134:137 -> a
-    45:45:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1030:1030 -> a
+    45:45:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1025:1025 -> a
     45:45:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):138 -> a
     46:59:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):139:152 -> a
     60:60:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
@@ -49189,78 +49481,81 @@
     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):1133:1133 -> a
+    179:179:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1128:1128 -> 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):1133:1133 -> a
+    188:188:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1128:1128 -> 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):1133:1133 -> a
+    198:198:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1128:1128 -> 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):39:39 -> 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):41:41 -> a
+    203:203:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
     203:203:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):296 -> a
     204:204:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):296:296 -> a
     205:208:java.lang.Integer lambda$computeTrivialOperationsOnConstString$4(com.android.tools.r8.graph.DexString):217:220 -> a
     209:209:java.lang.Integer lambda$computeTrivialOperationsOnConstString$10(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):234:234 -> a
     210:210:java.lang.Integer lambda$computeTrivialOperationsOnConstString$13(com.android.tools.r8.graph.DexString,java.lang.Integer):240:240 -> a
-    211:211:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):302:302 -> a
-    212:212:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1030:1030 -> a
-    212:212:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):303 -> a
-    213:220:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):304:311 -> a
-    221:221:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1318:1318 -> a
-    221:221:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):311 -> a
-    222:241:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):315:334 -> a
-    242:242:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
-    242:242:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):335 -> a
-    243:323:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):336:416 -> a
-    324:325:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):397:398 -> a
-    326:326:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
-    326:326:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):399 -> a
-    327:355:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):419:447 -> a
-    356:358:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):446:448 -> a
-    359:359:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
-    359:359:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):449 -> a
-    360:366:void com.android.tools.r8.ir.optimize.string.StringOptimizer.logHistogramOfNames(com.android.tools.r8.graph.DexString):475:481 -> a
-    360:366:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):450 -> a
-    367:367:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):452:452 -> a
-    368:368:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
-    368:368:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):453 -> a
-    369:370:void com.android.tools.r8.ir.optimize.string.StringOptimizer.logHistogramOfNames(com.android.tools.r8.ir.code.DexItemBasedConstString):496:497 -> a
-    369:370:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):454 -> a
-    371:371:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
-    371:371:void com.android.tools.r8.ir.optimize.string.StringOptimizer.logHistogramOfNames(com.android.tools.r8.ir.code.DexItemBasedConstString):497 -> a
-    371:371:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):454 -> a
-    372:379:void com.android.tools.r8.ir.optimize.string.StringOptimizer.logHistogramOfNames(com.android.tools.r8.ir.code.DexItemBasedConstString):497:504 -> a
-    372:379:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):454 -> a
-    380:381:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):459:460 -> a
-    382:382:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    382:382:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):460 -> a
-    383:383:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):460:460 -> a
-    384:389:void logDeferredNameComputation(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping):486:491 -> a
+    211:214:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):303:306 -> a
+    215:215:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1025:1025 -> 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):1295:1295 -> 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):273:273 -> 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):39:39 -> 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):39:39 -> 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):39:39 -> 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
+    363:363:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
+    363:363:void com.android.tools.r8.ir.optimize.string.StringOptimizer.logHistogramOfNames(com.android.tools.r8.ir.code.DexItemBasedConstString):496 -> a
+    363:363:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):453 -> a
+    364:371:void com.android.tools.r8.ir.optimize.string.StringOptimizer.logHistogramOfNames(com.android.tools.r8.ir.code.DexItemBasedConstString):496:503 -> a
+    364:371:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):453 -> a
+    372:373:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):458:459 -> a
+    374:374:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
+    374:374:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):459 -> a
+    375:375:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):459:459 -> a
+    376:381:void logDeferredNameComputation(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping):485:490 -> a
     1:3:void lambda$logResult$1(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping,java.lang.Integer):94:94 -> b
     4:6:void lambda$logResult$3(java.lang.Integer,java.lang.Integer):109:109 -> b
     7:7:java.lang.Integer lambda$computeTrivialOperationsOnConstString$5(com.android.tools.r8.graph.DexString):224:224 -> b
     8:8:java.lang.Integer lambda$computeTrivialOperationsOnConstString$11(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):236:236 -> b
     9:9:java.lang.Integer lambda$computeTrivialOperationsOnConstString$15(com.android.tools.r8.graph.DexString,java.lang.Integer):244:244 -> b
-    10:15:void logNameComputation(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping):465:470 -> b
-    16:16:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):512:512 -> b
-    17:17:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1030:1030 -> b
-    17:17:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):513 -> b
-    18:37:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):514:533 -> b
-    38:41:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):532:535 -> b
+    10:15:void logNameComputation(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping):464:469 -> b
+    16:16:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):511:511 -> b
+    17:17:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1025:1025 -> b
+    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):39:39 -> b
-    42:42:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):536 -> b
-    43:80:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):537:574 -> b
-    81:81:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> b
-    81:81:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):574 -> b
-    82:82:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):574:574 -> 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
+    81:81:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):573 -> b
+    82:82:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):573:573 -> b
     1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$6(com.android.tools.r8.graph.DexString):226:226 -> c
     2:2:java.lang.Integer lambda$computeTrivialOperationsOnConstString$12(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):238:238 -> c
     1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$14(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):242:242 -> d
@@ -49270,15 +49565,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.yD:
+com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration -> com.android.tools.r8.internal.mC:
     com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration INSTANCE -> a
-    1:1:void <clinit>():581:581 -> <clinit>
-    1:1:void <init>():584:584 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration getInstance():587:587 -> 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):596:616 -> a
-com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations -> com.android.tools.r8.internal.o5:
-    1:3:void registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):35:37 -> a
-com.android.tools.r8.ir.optimize.typechecks.CheckCastAndInstanceOfMethodSpecialization -> com.android.tools.r8.internal.P5:
+    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.B5:
     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
@@ -49294,15 +49587,22 @@
     10:13:void execute():77:80 -> a
     14:25:void com.android.tools.r8.ir.optimize.typechecks.CheckCastAndInstanceOfMethodSpecialization.processCandidateForInstanceOfOptimization(com.android.tools.r8.graph.ProgramMethod):87:98 -> a
     14:25:void execute():81 -> a
-    26:37:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.optimize.typechecks.CheckCastAndInstanceOfMethodSpecialization.resolveOnSuperClass(com.android.tools.r8.graph.ProgramMethod):152:163 -> a
-    26:37:void com.android.tools.r8.ir.optimize.typechecks.CheckCastAndInstanceOfMethodSpecialization.processCandidateForInstanceOfOptimization(com.android.tools.r8.graph.ProgramMethod):102 -> a
-    26:37:void execute():81 -> a
-    38:71:void com.android.tools.r8.ir.optimize.typechecks.CheckCastAndInstanceOfMethodSpecialization.processCandidateForInstanceOfOptimization(com.android.tools.r8.graph.ProgramMethod):103:136 -> a
-    38:71:void execute():81 -> a
-    72:72:void com.android.tools.r8.ir.optimize.typechecks.CheckCastAndInstanceOfMethodSpecialization.processCandidateForInstanceOfOptimization(com.android.tools.r8.graph.ProgramMethod):135:135 -> a
-    72:72:void execute():81 -> a
-    73:87:void com.android.tools.r8.ir.optimize.typechecks.CheckCastAndInstanceOfMethodSpecialization.processCandidateForInstanceOfOptimization(com.android.tools.r8.graph.ProgramMethod):134:148 -> a
-    73:87:void execute():81 -> a
+    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):273:273 -> 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
+    29:39:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.optimize.typechecks.CheckCastAndInstanceOfMethodSpecialization.resolveOnSuperClass(com.android.tools.r8.graph.ProgramMethod):153:163 -> a
+    29:39:void com.android.tools.r8.ir.optimize.typechecks.CheckCastAndInstanceOfMethodSpecialization.processCandidateForInstanceOfOptimization(com.android.tools.r8.graph.ProgramMethod):102 -> a
+    29:39:void execute():81 -> a
+    40:73:void com.android.tools.r8.ir.optimize.typechecks.CheckCastAndInstanceOfMethodSpecialization.processCandidateForInstanceOfOptimization(com.android.tools.r8.graph.ProgramMethod):103:136 -> a
+    40:73:void execute():81 -> a
+    74:74:void com.android.tools.r8.ir.optimize.typechecks.CheckCastAndInstanceOfMethodSpecialization.processCandidateForInstanceOfOptimization(com.android.tools.r8.graph.ProgramMethod):135:135 -> a
+    74:74:void execute():81 -> a
+    75:89:void com.android.tools.r8.ir.optimize.typechecks.CheckCastAndInstanceOfMethodSpecialization.processCandidateForInstanceOfOptimization(com.android.tools.r8.graph.ProgramMethod):134:148 -> a
+    75:89:void execute():81 -> a
 com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator -> com.android.tools.r8.ir.regalloc.a:
     java.util.List moveExceptionIntervals -> p
     com.android.tools.r8.graph.AppView appView -> b
@@ -49357,14 +49657,14 @@
     99:104:void computeLiveRanges():2498:2503 -> a
     99:104:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():638 -> a
     99:104:void allocateRegisters():215 -> a
-    105:105:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisTypeVerifierBug():1595:1595 -> a
+    105:105:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisTypeVerifierBug():1721:1721 -> a
     105:105:void computeLiveRanges():2503 -> a
     105:105:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():638 -> a
     105:105:void allocateRegisters():215 -> a
     106:106:void computeLiveRanges():2503:2503 -> a
     106:106:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():638 -> a
     106:106:void allocateRegisters():215 -> a
-    107:107:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisJitCodeDebuggingBug():1604:1604 -> a
+    107:107:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisJitCodeDebuggingBug():1730:1730 -> a
     107:107:void computeLiveRanges():2503 -> a
     107:107:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():638 -> a
     107:107:void allocateRegisters():215 -> a
@@ -49374,7 +49674,7 @@
     118:118:void performAllocation():645:645 -> a
     118:118:void allocateRegisters():216 -> a
     119:131:void allocateRegisters():217:229 -> a
-    132:132:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1030:1030 -> a
+    132:132:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1025:1025 -> a
     132:132:void allocateRegisters():229 -> a
     133:135:void allocateRegisters():230:232 -> a
     136:136:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalRead():0:0 -> a
@@ -49731,7 +50031,7 @@
     1817:1821:boolean argumentsAreAlreadyLinked(com.android.tools.r8.ir.code.Invoke):2877:2881 -> a
     1817:1821:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2772 -> a
     1822:1855:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2773:2806 -> a
-    1856:1857:boolean com.android.tools.r8.ir.code.Value.hasRegisterConstraint():720:721 -> a
+    1856:1857:boolean com.android.tools.r8.ir.code.Value.hasRegisterConstraint():717:718 -> a
     1856:1857:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2808 -> a
     1858:1858:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2809:2809 -> a
     1859:1860:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeElement):2757:2758 -> a
@@ -49771,16 +50071,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():1610:1610 -> c
+    11:11:boolean com.android.tools.r8.utils.InternalOptions.canHaveOverlappingLongRegisterBug():1736:1736 -> 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():1643:1643 -> d
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1769:1769 -> 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():1817:1817 -> d
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1943:1943 -> d
     4:4:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1446 -> d
     5:19:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1449:1463 -> d
     20:20:boolean com.android.tools.r8.ir.code.Instruction.isCmp():0:0 -> d
@@ -49791,12 +50091,12 @@
     26:26:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1477:1477 -> d
     27:27:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1446:1446 -> d
     27:27:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1477 -> d
-    28:28:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1643:1643 -> d
+    28:28:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1769:1769 -> d
     28:28:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1446 -> d
     28:28:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1477 -> d
     29:29:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1446:1446 -> d
     29:29:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1477 -> d
-    30:30:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1817:1817 -> d
+    30:30:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1943:1943 -> d
     30:30:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1446 -> d
     30:30:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1477 -> d
     31:45:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1449:1463 -> d
@@ -50004,7 +50304,7 @@
     1:10:int nextOverlap(com.android.tools.r8.ir.regalloc.LiveIntervals):367:376 -> d
     11:13:int firstUseAfter(int):384:386 -> d
     14:14:int getFirstUse():393:393 -> d
-    1:1:java.lang.Integer getHint():100:100 -> e
+    1:1:java.lang.Integer getHint():100:100 -> f
     1:1:int getMaxNonSpilledRegister():308:308 -> g
     2:3:int computeMaxNonSpilledRegister():289:290 -> g
     2:3:int getMaxNonSpilledRegister():311 -> g
@@ -50059,7 +50359,7 @@
     1:1:boolean isLinked():138:138 -> x
     1:3:boolean isNewStringInstanceDisallowingSpilling():533:535 -> y
     1:1:boolean isSpilled():111:111 -> z
-com.android.tools.r8.ir.regalloc.LiveIntervalsUse -> com.android.tools.r8.internal.ap:
+com.android.tools.r8.ir.regalloc.LiveIntervalsUse -> com.android.tools.r8.internal.do:
     int limit -> b
     int position -> a
     1:3:void <init>(int,int):12:14 -> <init>
@@ -50071,7 +50371,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.cp:
+com.android.tools.r8.ir.regalloc.LiveRange -> com.android.tools.r8.internal.fo:
     com.android.tools.r8.ir.regalloc.LiveRange INFINITE -> a
     int start -> b
     int end -> c
@@ -50081,7 +50381,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.Ez:
+com.android.tools.r8.ir.regalloc.RegisterAllocator -> com.android.tools.r8.internal.qy:
     void addNewBlockToShareIdenticalSuffix(com.android.tools.r8.ir.code.BasicBlock,int,java.util.List) -> a
     void allocateRegisters() -> a
     int getRegisterForValue(com.android.tools.r8.ir.code.Value,int) -> a
@@ -50090,7 +50390,7 @@
     void mergeBlocks(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> b
     com.android.tools.r8.utils.InternalOptions options() -> b
     int registersUsed() -> c
-com.android.tools.r8.ir.regalloc.RegisterMove -> com.android.tools.r8.internal.Fz:
+com.android.tools.r8.ir.regalloc.RegisterMove -> com.android.tools.r8.internal.ry:
     com.android.tools.r8.ir.analysis.type.TypeElement type -> b
     com.android.tools.r8.ir.code.Instruction definition -> e
     int src -> d
@@ -50106,7 +50406,7 @@
     1:4:boolean writes(int):36:39 -> d
     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.Gz:
+com.android.tools.r8.ir.regalloc.RegisterMoveScheduler -> com.android.tools.r8.internal.sy:
     java.util.Map valueMap -> c
     int tempRegister -> g
     int usedTempRegisters -> d
@@ -50226,7 +50526,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():1579:1579 -> a
+    100:100:boolean com.android.tools.r8.utils.InternalOptions.canHaveBoundsCheckEliminationBug():1705:1705 -> 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
@@ -50250,7 +50550,7 @@
     7:7:void addSpillOrRestoreMove(int,com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):72 -> f
     8:43:void addSpillOrRestoreMove(int,com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):73:108 -> f
     44:44:java.util.Set lambda$scheduleMovesBeforeInstruction$5(java.lang.Integer):310:310 -> f
-com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode -> com.android.tools.r8.internal.O0:
+com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode -> com.android.tools.r8.internal.N0:
     1:1:void <init>():25:25 -> <init>
     boolean isEmptyVoidMethod() -> B
     java.util.function.Consumer getRegistryCallback() -> E
@@ -50268,27 +50568,27 @@
     1:1:java.lang.String com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode.toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):96:96 -> toString
     1:1:java.lang.String toString():67 -> toString
     int estimatedDexCodeSizeUpperBoundInBytes() -> x
-com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider -> com.android.tools.r8.internal.O0$a:
+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.z9:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider -> com.android.tools.r8.internal.W8:
     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.u9:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterConstructorCfCodeProvider -> com.android.tools.r8.internal.R8:
     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.v9:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterThrowRuntimeExceptionCfCodeProvider -> com.android.tools.r8.internal.S8:
     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.w9:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterVivifiedWrapperCfCodeProvider -> com.android.tools.r8.internal.T8:
     com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter converter -> e
     boolean itfCall -> f
     com.android.tools.r8.graph.DexField wrapperField -> c
@@ -50309,7 +50609,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.x9:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperCfCodeProvider -> com.android.tools.r8.internal.U8:
     com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter converter -> e
     boolean itfCall -> f
     com.android.tools.r8.graph.DexField wrapperField -> c
@@ -50327,7 +50627,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.y9:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperConversionCfCodeProvider -> com.android.tools.r8.internal.V8:
     com.android.tools.r8.graph.DexField wrapperField -> f
     com.android.tools.r8.graph.DexField reverseWrapperField -> e
     com.android.tools.r8.graph.DexType argType -> d
@@ -50340,7 +50640,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.Qa:
+com.android.tools.r8.ir.synthetic.EmulateInterfaceSyntheticCfCodeProvider -> com.android.tools.r8.internal.la:
     java.util.List extraDispatchCases -> f
     com.android.tools.r8.graph.DexType interfaceType -> c
     com.android.tools.r8.graph.DexMethod libraryMethod -> e
@@ -50352,7 +50652,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.rb:
+com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider -> com.android.tools.r8.internal.Ma:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():41:41 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):44:44 -> <init>
@@ -50361,7 +50661,7 @@
     4:4:void addCfInstructionsForAbstractValue(java.util.List,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexType):54 -> a
     5:8:void addCfInstructionsForAbstractValue(java.util.List,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexType):55:55 -> a
     12:12:void addCfInstructionsForAbstractValue(java.util.List,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexType):59:59 -> a
-com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingInstanceFieldCfCodeProvider -> com.android.tools.r8.internal.ob:
+com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingInstanceFieldCfCodeProvider -> com.android.tools.r8.internal.Ja:
     com.android.tools.r8.ir.analysis.value.AbstractValue nullValue -> f
     com.android.tools.r8.graph.DexType returnType -> d
     com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData fieldDataMap -> e
@@ -50371,7 +50671,7 @@
     3:3:com.android.tools.r8.graph.CfCode generateCfCode():94 -> a
     4:32:com.android.tools.r8.graph.CfCode generateCfCode():94:122 -> a
     33:40:void lambda$generateCfCode$0(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap,java.lang.Integer,com.android.tools.r8.ir.analysis.value.AbstractValue):102:109 -> a
-com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingValueOfCfCodeProvider -> com.android.tools.r8.internal.pb:
+com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingValueOfCfCodeProvider -> com.android.tools.r8.internal.Ka:
     com.android.tools.r8.graph.DexType enumType -> d
     com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData fieldDataMap -> e
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData):136:138 -> <init>
@@ -50382,7 +50682,7 @@
     46:46:com.android.tools.r8.graph.CfCode generateCfCode():194:194 -> a
     47:61:com.android.tools.r8.graph.CfCode generateCfCode():190:204 -> a
     62:71:void lambda$generateCfCode$0(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap,java.lang.Integer,com.android.tools.r8.ir.analysis.value.AbstractValue):175:184 -> a
-com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingValuesCfCodeProvider -> com.android.tools.r8.internal.qb:
+com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingValuesCfCodeProvider -> com.android.tools.r8.internal.La:
     com.android.tools.r8.graph.DexField utilityField -> e
     int numEnumInstances -> f
     com.android.tools.r8.graph.DexMethod initializationMethod -> g
@@ -50394,7 +50694,7 @@
     11:11:com.android.tools.r8.graph.CfCode generateCfCode():247 -> a
     12:12:com.android.tools.r8.graph.CfCode generateCfCode():247:247 -> a
     13:18:com.android.tools.r8.graph.CfCode generateCfCode():245:250 -> a
-com.android.tools.r8.ir.synthetic.ExceptionThrowingSourceCode -> com.android.tools.r8.internal.Gb:
+com.android.tools.r8.ir.synthetic.ExceptionThrowingSourceCode -> com.android.tools.r8.internal.ab:
     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
@@ -50403,170 +50703,143 @@
     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.FieldAccessorBuilder -> com.android.tools.r8.internal.Wb:
-    com.android.tools.r8.utils.OptionalBool isInstanceField -> c
-    com.android.tools.r8.utils.OptionalBool isSetter -> d
-    com.android.tools.r8.graph.DexField field -> b
-    com.android.tools.r8.graph.DexMethod sourceMethod -> e
-    boolean $assertionsDisabled -> a
-    1:1:void <clinit>():25:25 -> <clinit>
-    1:1:void <init>():32:32 -> <init>
-    2:3:void <init>():28:29 -> <init>
-    1:2:com.android.tools.r8.ir.synthetic.FieldAccessorBuilder setField(com.android.tools.r8.graph.DexClassAndField):44:45 -> a
-    3:4:com.android.tools.r8.ir.synthetic.FieldAccessorBuilder com.android.tools.r8.ir.synthetic.FieldAccessorBuilder.setStaticField(com.android.tools.r8.graph.DexField):71:72 -> a
-    3:4:com.android.tools.r8.ir.synthetic.FieldAccessorBuilder setField(com.android.tools.r8.graph.DexClassAndField):45 -> a
-    5:5:com.android.tools.r8.ir.synthetic.FieldAccessorBuilder setField(com.android.tools.r8.graph.DexClassAndField):46:46 -> a
-    6:7:com.android.tools.r8.ir.synthetic.FieldAccessorBuilder com.android.tools.r8.ir.synthetic.FieldAccessorBuilder.setInstanceField(com.android.tools.r8.graph.DexField):55:56 -> a
-    6:7:com.android.tools.r8.ir.synthetic.FieldAccessorBuilder setField(com.android.tools.r8.graph.DexClassAndField):46 -> a
-    8:8:com.android.tools.r8.ir.synthetic.FieldAccessorBuilder setSourceMethod(com.android.tools.r8.graph.DexMethod):66:66 -> a
-    9:9:com.android.tools.r8.graph.CfCode build():77:77 -> a
-    10:13:boolean com.android.tools.r8.ir.synthetic.FieldAccessorBuilder.validate():128:131 -> a
-    10:13:com.android.tools.r8.graph.CfCode build():77 -> a
-    14:14:com.android.tools.r8.graph.CfCode build():80:80 -> a
-    15:15:boolean com.android.tools.r8.ir.synthetic.FieldAccessorBuilder.isInstanceField():124:124 -> a
-    15:15:com.android.tools.r8.graph.CfCode build():81 -> a
-    16:16:com.android.tools.r8.graph.CfCode build():83:83 -> a
-    17:17:boolean com.android.tools.r8.ir.synthetic.FieldAccessorBuilder.isSetter():120:120 -> a
-    17:17:com.android.tools.r8.graph.CfCode build():88 -> a
-    18:18:com.android.tools.r8.graph.CfCode build():90:90 -> a
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():49:49 -> a
-    19:19:com.android.tools.r8.graph.CfCode build():90 -> a
-    20:22:com.android.tools.r8.graph.CfCode build():90:92 -> a
-    23:23:boolean com.android.tools.r8.ir.synthetic.FieldAccessorBuilder.isSetter():120:120 -> a
-    23:23:com.android.tools.r8.graph.CfCode build():97 -> a
-    24:25:com.android.tools.r8.graph.CfCode build():97:98 -> a
-    26:26:boolean com.android.tools.r8.ir.synthetic.FieldAccessorBuilder.isSetter():120:120 -> a
-    26:26:com.android.tools.r8.graph.CfCode build():101 -> a
-    27:29:com.android.tools.r8.graph.CfCode build():102:104 -> a
-    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():49:49 -> a
-    30:30:com.android.tools.r8.graph.CfCode build():104 -> a
-    31:41:com.android.tools.r8.graph.CfCode build():104:114 -> a
-    1:1:com.android.tools.r8.ir.synthetic.FieldAccessorBuilder builder():35:35 -> b
-    1:1:com.android.tools.r8.ir.synthetic.FieldAccessorBuilder setGetter():50:50 -> c
-    1:1:com.android.tools.r8.ir.synthetic.FieldAccessorBuilder setSetter():61:61 -> d
-com.android.tools.r8.ir.synthetic.ForwardMethodBuilder -> com.android.tools.r8.internal.Tc:
+com.android.tools.r8.ir.synthetic.FieldAccessorSourceCode -> com.android.tools.r8.internal.pb:
+    boolean $assertionsDisabled -> m
+    com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess fieldWithAccess -> n
+    1:1:void <clinit>():15:15 -> <clinit>
+    1:3: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.DexMethod,com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess):25:27 -> <init>
+    1:1:void lambda$prepareInstructions$0(int,int,com.android.tools.r8.ir.conversion.IRBuilder):36:36 -> b
+    2:2:void lambda$prepareInstructions$1(int,com.android.tools.r8.ir.conversion.IRBuilder):37:37 -> b
+    1:1:void lambda$prepareInstructions$2(int,com.android.tools.r8.ir.conversion.IRBuilder):41:41 -> c
+    2:2:void lambda$prepareInstructions$4(int,int,com.android.tools.r8.ir.conversion.IRBuilder):46:46 -> c
+    1:1:void lambda$prepareInstructions$3(int,com.android.tools.r8.ir.conversion.IRBuilder):42:42 -> d
+    1:1:void lambda$prepareInstructions$5(int,com.android.tools.r8.ir.conversion.IRBuilder):51:51 -> e
+    1:12:void prepareInstructions():32:43 -> i
+    13:13:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstance():498:498 -> i
+    13:13:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():514 -> i
+    13:13:void prepareInstructions():43 -> i
+    14:14:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():514:514 -> i
+    14:14:void prepareInstructions():43 -> i
+    15:20:void prepareInstructions():44:49 -> i
+    21:21:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isStaticPut():506:506 -> 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.ic:
     com.android.tools.r8.graph.DexItemFactory factory -> b
-    java.lang.Boolean isInterface -> h
-    boolean castResult -> i
-    boolean isConstructorDelegate -> j
-    boolean sourceMethodHasExtraUnusedParameter -> e
-    boolean staticSource -> f
+    java.lang.Boolean isInterface -> g
+    boolean isConstructorDelegate -> i
+    boolean staticSource -> e
     com.android.tools.r8.graph.DexMethod targetMethod -> d
+    boolean castResult -> h
     boolean $assertionsDisabled -> a
     com.android.tools.r8.graph.DexMethod sourceMethod -> c
-    com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfoForCastArguments -> k
-    com.android.tools.r8.ir.synthetic.ForwardMethodBuilder$InvokeType invokeType -> g
-    1:1:void <clinit>():29:29 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory):55:55 -> <init>
-    2:15:void <init>(com.android.tools.r8.graph.DexItemFactory):43:56 -> <init>
-    1:1:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder builder(com.android.tools.r8.graph.DexItemFactory):32:32 -> a
-    2:4:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.setDirectTarget(com.android.tools.r8.graph.DexMethod,boolean):102:104 -> a
-    2:4:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setConstructorTarget(com.android.tools.r8.graph.DexMethod):98 -> a
-    5:7:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setDirectTarget(com.android.tools.r8.graph.DexMethod,boolean):102:104 -> a
-    8:8:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setCastArguments(com.android.tools.r8.graph.AppInfoWithClassHierarchy):114:114 -> a
-    9:9:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setConstructorTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):119:119 -> a
-    10:10:boolean com.android.tools.r8.graph.DexMethod.isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):266:266 -> a
-    10:10:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setConstructorTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):119 -> a
-    11:15:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setConstructorTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):119:123 -> a
-    16:16:com.android.tools.r8.graph.CfCode build():128:128 -> a
-    17:20:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.validate():248:251 -> a
-    17:20:com.android.tools.r8.graph.CfCode build():128 -> a
-    21:21:int com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.sourceArguments():236:236 -> a
-    21:21:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.validate():252 -> a
-    21:21:com.android.tools.r8.graph.CfCode build():128 -> a
-    22:22:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethod.getParameters():58:58 -> a
-    22:22:int com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.sourceArguments():236 -> a
-    22:22:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.validate():252 -> a
-    22:22:com.android.tools.r8.graph.CfCode build():128 -> a
-    23:23:int com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.sourceArguments():236:236 -> a
-    23:23:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.validate():252 -> a
-    23:23:com.android.tools.r8.graph.CfCode build():128 -> a
-    24:24:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.isStaticSource():228:228 -> a
-    24:24:int com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.sourceArguments():237 -> a
-    24:24:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.validate():252 -> a
-    24:24:com.android.tools.r8.graph.CfCode build():128 -> a
-    25:26:int com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.sourceArguments():237:238 -> a
-    25:26:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.validate():252 -> a
-    25:26:com.android.tools.r8.graph.CfCode build():128 -> a
-    27:27:int com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.targetArguments():243:243 -> a
-    27:27:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.validate():252 -> a
-    27:27:com.android.tools.r8.graph.CfCode build():128 -> a
-    28:28:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethod.getParameters():58:58 -> a
-    28:28:int com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.targetArguments():243 -> a
-    28:28:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.validate():252 -> a
-    28:28:com.android.tools.r8.graph.CfCode build():128 -> a
-    29:29:int com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.targetArguments():243:243 -> a
-    29:29:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.validate():252 -> a
-    29:29:com.android.tools.r8.graph.CfCode build():128 -> a
-    30:30:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.isStaticTarget():232:232 -> a
-    30:30:int com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.targetArguments():244 -> a
-    30:30:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.validate():252 -> a
-    30:30:com.android.tools.r8.graph.CfCode build():128 -> a
-    31:31:int com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.targetArguments():244:244 -> a
-    31:31:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.validate():252 -> a
-    31:31:com.android.tools.r8.graph.CfCode build():128 -> a
-    32:33:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.validate():252:253 -> a
-    32:33:com.android.tools.r8.graph.CfCode build():128 -> a
-    34:34:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.isStaticSource():228:228 -> a
-    34:34:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.validate():254 -> a
-    34:34:com.android.tools.r8.graph.CfCode build():128 -> a
-    35:41:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.validate():254:260 -> a
-    35:41:com.android.tools.r8.graph.CfCode build():128 -> a
-    42:45:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.validate():259:262 -> a
-    42:45:com.android.tools.r8.graph.CfCode build():128 -> a
-    46:47:com.android.tools.r8.graph.CfCode build():131:132 -> a
-    48:48:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.isStaticSource():228:228 -> a
-    48:48:com.android.tools.r8.graph.CfCode build():135 -> a
-    49:52:com.android.tools.r8.graph.CfCode build():135:138 -> a
-    53:53:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.isStaticSource():228:228 -> a
-    53:53:com.android.tools.r8.graph.CfCode build():140 -> a
-    54:55:com.android.tools.r8.graph.CfCode build():142:143 -> a
-    56:56:com.android.tools.r8.graph.DexType[] com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.getSourceParameters():215:215 -> a
-    56:56:com.android.tools.r8.graph.CfCode build():147 -> a
-    57:57:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethod.getParameters():58:58 -> a
-    57:57:com.android.tools.r8.graph.DexType[] com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.getSourceParameters():215 -> a
-    57:57:com.android.tools.r8.graph.CfCode build():147 -> a
-    58:58:com.android.tools.r8.graph.DexType[] com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.getSourceParameters():215:215 -> a
-    58:58:com.android.tools.r8.graph.CfCode build():147 -> a
-    59:67:com.android.tools.r8.graph.CfCode build():149:157 -> a
-    68:76:int com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.getInvokeOpcode():203:211 -> a
-    68:76:com.android.tools.r8.graph.CfCode build():157 -> a
-    77:77:com.android.tools.r8.graph.CfCode build():157:157 -> a
-    78:78:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.isSourceReturnVoid():219:219 -> a
-    78:78:com.android.tools.r8.graph.CfCode build():158 -> a
-    79:88:com.android.tools.r8.graph.CfCode build():159:168 -> a
-    89:89:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.getSourceReturnType():223:223 -> a
-    89:89:com.android.tools.r8.graph.CfCode build():168 -> a
-    90:90:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.isSourceReturnVoid():219:219 -> a
-    90:90:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.getSourceReturnType():223 -> a
-    90:90:com.android.tools.r8.graph.CfCode build():168 -> a
-    91:92:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.getSourceReturnType():223:224 -> a
-    91:92:com.android.tools.r8.graph.CfCode build():168 -> a
-    93:101:com.android.tools.r8.graph.CfCode build():168:176 -> a
-    102:102:void maybeInsertArgumentCast(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):183:183 -> a
-    103:103:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.isStaticSource():228:228 -> a
-    103:103:void maybeInsertArgumentCast(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):187 -> a
-    104:104:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.isStaticTarget():232:232 -> a
-    104:104:void maybeInsertArgumentCast(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):187 -> a
-    105:106:void maybeInsertArgumentCast(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):193:194 -> a
-    107:107:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethod.getParameters():58:58 -> a
-    107:107:void maybeInsertArgumentCast(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):194 -> a
-    108:112:void maybeInsertArgumentCast(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):194:198 -> a
-    1:2:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setNonStaticSource(com.android.tools.r8.graph.DexMethod):65:66 -> b
-    3:5:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setStaticTarget(com.android.tools.r8.graph.DexMethod,boolean):84:86 -> b
-    6:6:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setCastResult():109:109 -> b
-    1:3:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setNonStaticSourceWithExtraUnusedParameter(com.android.tools.r8.graph.DexMethod):71:73 -> c
-    4:6:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setVirtualTarget(com.android.tools.r8.graph.DexMethod,boolean):91:93 -> c
-    1:2:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setStaticSource(com.android.tools.r8.graph.DexMethod):78:79 -> d
-com.android.tools.r8.ir.synthetic.ForwardMethodBuilder$InvokeType -> com.android.tools.r8.internal.Sc:
+    com.android.tools.r8.ir.synthetic.ForwardMethodBuilder$InvokeType invokeType -> f
+    com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfoForCastArguments -> j
+    1:1:void <clinit>():27:27 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory):52:52 -> <init>
+    2:14:void <init>(com.android.tools.r8.graph.DexItemFactory):41:53 -> <init>
+    1:1:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder builder(com.android.tools.r8.graph.DexItemFactory):30:30 -> a
+    2:3:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setNonStaticSource(com.android.tools.r8.graph.DexMethod):57:58 -> a
+    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: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
+    16:19:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.validate():225:228 -> a
+    16:19:com.android.tools.r8.graph.CfCode build():109 -> a
+    20:20:int com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.sourceArguments():215:215 -> a
+    20:20:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.validate():229 -> a
+    20:20:com.android.tools.r8.graph.CfCode build():109 -> a
+    21:21:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethod.getParameters():58:58 -> a
+    21:21:int com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.sourceArguments():215 -> a
+    21:21:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.validate():229 -> a
+    21:21:com.android.tools.r8.graph.CfCode build():109 -> a
+    22:22:int com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.sourceArguments():215:215 -> a
+    22:22:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.validate():229 -> a
+    22:22:com.android.tools.r8.graph.CfCode build():109 -> a
+    23:23:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.isStaticSource():207:207 -> a
+    23:23:int com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.sourceArguments():215 -> a
+    23:23:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.validate():229 -> a
+    23:23:com.android.tools.r8.graph.CfCode build():109 -> a
+    24:24:int com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.targetArguments():220:220 -> a
+    24:24:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.validate():229 -> a
+    24:24:com.android.tools.r8.graph.CfCode build():109 -> a
+    25:25:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethod.getParameters():58:58 -> a
+    25:25:int com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.targetArguments():220 -> a
+    25:25:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.validate():229 -> a
+    25:25:com.android.tools.r8.graph.CfCode build():109 -> a
+    26:26:int com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.targetArguments():220:220 -> a
+    26:26:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.validate():229 -> a
+    26:26:com.android.tools.r8.graph.CfCode build():109 -> a
+    27:27:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.isStaticTarget():211:211 -> a
+    27:27:int com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.targetArguments():221 -> a
+    27:27:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.validate():229 -> a
+    27:27:com.android.tools.r8.graph.CfCode build():109 -> a
+    28:28:int com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.targetArguments():221:221 -> a
+    28:28:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.validate():229 -> a
+    28:28:com.android.tools.r8.graph.CfCode build():109 -> a
+    29:30:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.validate():229:230 -> a
+    29:30:com.android.tools.r8.graph.CfCode build():109 -> a
+    31:31:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.isStaticSource():207:207 -> a
+    31:31:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.validate():231 -> a
+    31:31:com.android.tools.r8.graph.CfCode build():109 -> a
+    32:38:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.validate():231:237 -> a
+    32:38:com.android.tools.r8.graph.CfCode build():109 -> a
+    39:42:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.validate():236:239 -> a
+    39:42:com.android.tools.r8.graph.CfCode build():109 -> a
+    43:44:com.android.tools.r8.graph.CfCode build():112:113 -> a
+    45:45:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.isStaticSource():207:207 -> a
+    45:45:com.android.tools.r8.graph.CfCode build():116 -> a
+    46:49:com.android.tools.r8.graph.CfCode build():116:119 -> a
+    50:50:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.isStaticSource():207:207 -> a
+    50:50:com.android.tools.r8.graph.CfCode build():121 -> a
+    51:52:com.android.tools.r8.graph.CfCode build():123:124 -> a
+    53:53:com.android.tools.r8.graph.DexType[] com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.getSourceParameters():194:194 -> a
+    53:53:com.android.tools.r8.graph.CfCode build():128 -> a
+    54:54:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethod.getParameters():58:58 -> a
+    54:54:com.android.tools.r8.graph.DexType[] com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.getSourceParameters():194 -> a
+    54:54:com.android.tools.r8.graph.CfCode build():128 -> a
+    55:55:com.android.tools.r8.graph.DexType[] com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.getSourceParameters():194:194 -> a
+    55:55:com.android.tools.r8.graph.CfCode build():128 -> a
+    56:63:com.android.tools.r8.graph.CfCode build():129:136 -> a
+    64:72:int com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.getInvokeOpcode():182:190 -> a
+    64:72:com.android.tools.r8.graph.CfCode build():136 -> a
+    73:73:com.android.tools.r8.graph.CfCode build():136:136 -> a
+    74:74:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.isSourceReturnVoid():198:198 -> a
+    74:74:com.android.tools.r8.graph.CfCode build():137 -> a
+    75:84:com.android.tools.r8.graph.CfCode build():138:147 -> a
+    85:85:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.getSourceReturnType():202:202 -> a
+    85:85:com.android.tools.r8.graph.CfCode build():147 -> a
+    86:86:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.isSourceReturnVoid():198:198 -> a
+    86:86:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.getSourceReturnType():202 -> a
+    86:86:com.android.tools.r8.graph.CfCode build():147 -> a
+    87:88:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.getSourceReturnType():202:203 -> a
+    87:88:com.android.tools.r8.graph.CfCode build():147 -> a
+    89:97:com.android.tools.r8.graph.CfCode build():147:155 -> a
+    98:98:void maybeInsertArgumentCast(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):162:162 -> a
+    99:99:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.isStaticSource():207:207 -> a
+    99:99:void maybeInsertArgumentCast(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):166 -> a
+    100:100:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.isStaticTarget():211:211 -> a
+    100:100:void maybeInsertArgumentCast(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):166 -> a
+    101:102:void maybeInsertArgumentCast(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):172:173 -> a
+    103:103:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethod.getParameters():58:58 -> a
+    103:103:void maybeInsertArgumentCast(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):173 -> a
+    104:108:void maybeInsertArgumentCast(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):173:177 -> a
+    1:2:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setStaticSource(com.android.tools.r8.graph.DexMethod):63:64 -> b
+    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.hc:
     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
     com.android.tools.r8.ir.synthetic.ForwardMethodBuilder$InvokeType[] $VALUES -> d
-    1:3:void <clinit>():36:38 -> <clinit>
-    4:4:void <clinit>():35:35 -> <clinit>
-    1:1:void <init>(java.lang.String,int):35:35 -> <init>
-com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode -> com.android.tools.r8.internal.Uc:
+    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.jc:
     boolean $assertionsDisabled -> m
     int $r8$clinit -> n
     com.android.tools.r8.graph.DexType targetReceiver -> o
@@ -50583,12 +50856,13 @@
     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.Uc$a:
+com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder -> com.android.tools.r8.internal.jc$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
     boolean isInterface -> g
     com.android.tools.r8.graph.DexType receiver -> a
+    boolean extraNullParameter -> h
     com.android.tools.r8.graph.DexMethod originalMethod -> c
     com.android.tools.r8.graph.DexMethod method -> b
     1:3:void <init>(com.android.tools.r8.graph.DexMethod):39:41 -> <init>
@@ -50596,10 +50870,11 @@
     2:2:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder setOriginalMethod(com.android.tools.r8.graph.DexMethod):55:55 -> a
     3:3:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder setInvokeType(com.android.tools.r8.ir.code.Invoke$Type):70:70 -> a
     4:4:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder setIsInterface(boolean):80:80 -> a
-    5:5:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode build(com.android.tools.r8.ir.code.Position):90:90 -> a
+    5:5:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder setExtraNullParameter():85:85 -> a
+    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.rE:
+com.android.tools.r8.ir.synthetic.SynthesizedCode -> com.android.tools.r8.internal.eD:
     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>
@@ -50607,7 +50882,7 @@
     1:1:java.util.function.Consumer getRegistryCallback():32:32 -> E
     1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():27:27 -> F
     1:1:void registerReachableDefinitionsDefault(com.android.tools.r8.graph.UseRegistry):36:36 -> a
-com.android.tools.r8.ir.synthetic.SyntheticCfCodeProvider -> com.android.tools.r8.internal.vE:
+com.android.tools.r8.ir.synthetic.SyntheticCfCodeProvider -> com.android.tools.r8.internal.jD:
     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>
@@ -50615,7 +50890,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.AE:
+com.android.tools.r8.ir.synthetic.SyntheticSourceCode -> com.android.tools.r8.internal.tD:
     int[] paramRegisters -> i
     com.android.tools.r8.ir.code.Position position -> l
     int receiverRegister -> h
@@ -50668,22 +50943,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.Arrays -> com.android.tools.r8.internal.B1:
-    1:1:void ensureFromTo(int,int,int):57:57 -> a
-    2:2:void ensureFromTo(int,int,int):56:56 -> a
-    3:3:void ensureFromTo(int,int,int):55:55 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.Function -> com.android.tools.r8.internal.Zc:
-com.android.tools.r8.it.unimi.dsi.fastutil.Hash$Strategy -> com.android.tools.r8.internal.Bd:
+com.android.tools.r8.it.unimi.dsi.fastutil.Function -> com.android.tools.r8.internal.oc:
+com.android.tools.r8.it.unimi.dsi.fastutil.Hash$Strategy -> com.android.tools.r8.internal.Pc:
     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.Md:
+com.android.tools.r8.it.unimi.dsi.fastutil.HashCommon -> com.android.tools.r8.internal.ad:
     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.EC:
+com.android.tools.r8.it.unimi.dsi.fastutil.Stack -> com.android.tools.r8.internal.pB:
 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
@@ -50702,33 +50973,16 @@
     1:1:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanIterator.next():57:57 -> next
     1:1:java.lang.Object next():33 -> next
     1:1:void remove():68:68 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanListIterator -> com.android.tools.r8.internal.j:
-    1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanBidirectionalIterator.<init>():34:34 -> <init>
-    1:1:void <init>():35 -> <init>
-    1:1:void add(java.lang.Object):34:34 -> add
-    2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanListIterator.add(java.lang.Boolean):83:83 -> add
-    2:2:void add(java.lang.Object):34 -> add
-    3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanListIterator.add(boolean):57:57 -> add
-    3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanListIterator.add(java.lang.Boolean):83 -> add
-    3:3:void add(java.lang.Object):34 -> add
-    boolean com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanBidirectionalIterator.previousBoolean() -> f
-    1:1:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanBidirectionalIterator.previous():56:56 -> previous
-    1:1:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanBidirectionalIterator.previous():0 -> previous
-    1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanBidirectionalIterator.previous():33 -> previous
-    1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanBidirectionalIterator.previous():0 -> previous
-    1:1:void set(java.lang.Object):34:34 -> set
-    2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanListIterator.set(java.lang.Boolean):70:70 -> set
-    2:2:void set(java.lang.Object):34 -> set
-    3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanListIterator.set(boolean):46:46 -> set
-    3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanListIterator.set(java.lang.Boolean):70 -> set
-    3:3:void set(java.lang.Object):34 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanSet -> com.android.tools.r8.internal.k:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanSet -> com.android.tools.r8.internal.j:
     1:1:void <init>():32:32 -> <init>
     1:1:boolean rem(boolean):87:87 -> c
     boolean remove(boolean) -> d
     1:4:boolean equals(java.lang.Object):41:44 -> equals
-    1:5:int hashCode():57:61 -> hashCode
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet -> com.android.tools.r8.internal.I2:
+    1:2:int hashCode():57:58 -> hashCode
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet.iterator():119:119 -> hashCode
+    3:3:int hashCode():58 -> hashCode
+    4:4:int hashCode():61:61 -> hashCode
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet -> com.android.tools.r8.internal.D2:
     int size -> b
     1:4:void <init>(boolean[],int):104:107 -> <init>
     1:1:int access$000(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet):29:29 -> a
@@ -50748,29 +51002,20 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet.iterator():119:119 -> iterator
     2:2:java.util.Iterator iterator():29 -> iterator
     1:1:int size():148:148 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet$1 -> com.android.tools.r8.internal.H2:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet$1 -> com.android.tools.r8.internal.C2:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet this$0 -> b
     int next -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet):119:120 -> <init>
     1:3:boolean nextBoolean():129:129 -> h
     1:1:boolean hasNext():124:124 -> hasNext
     1:2:void remove():135:136 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArrays -> com.android.tools.r8.internal.J2:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArrays -> com.android.tools.r8.internal.E2:
     boolean[] EMPTY_ARRAY -> a
     1:1:void <clinit>():95:95 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection -> com.android.tools.r8.internal.L2:
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections -> com.android.tools.r8.internal.O2:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection -> com.android.tools.r8.internal.G2:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections -> com.android.tools.r8.internal.I2:
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection):536:536 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections$EmptyCollection -> com.android.tools.r8.internal.M2:
-    1:1:void <init>():39:39 -> <init>
-    1:1:boolean addAll(java.util.Collection):81:81 -> addAll
-    boolean contains(boolean) -> b
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator():38:38 -> iterator
-    2:2:java.util.Iterator iterator():38:38 -> iterator
-    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.booleans.BooleanCollections$UnmodifiableCollection -> com.android.tools.r8.internal.N2:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections$UnmodifiableCollection -> com.android.tools.r8.internal.H2:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection collection -> a
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection):369:371 -> <init>
     1:1:boolean add(java.lang.Object):365:365 -> add
@@ -50798,64 +51043,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.booleans.BooleanIterator -> com.android.tools.r8.internal.Q2:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator -> com.android.tools.r8.internal.K2:
     boolean nextBoolean() -> h
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators -> com.android.tools.r8.internal.U2:
-    com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$EmptyIterator EMPTY_ITERATOR -> a
-    1:1:void <clinit>():103:103 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$EmptyIterator -> com.android.tools.r8.internal.R2:
-    1:1:void <init>():42:42 -> <init>
-    1:1:java.lang.Object clone():87:87 -> clone
-    1:1:boolean previousBoolean():62:62 -> f
-    1:1:boolean nextBoolean():57:57 -> h
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$SingletonIterator -> com.android.tools.r8.internal.S2:
-    boolean element -> a
-    int curr -> b
-    1:2:void <init>(boolean):110:111 -> <init>
-    1:4:boolean previousBoolean():133:133 -> f
-    1:4:boolean nextBoolean():126:126 -> h
-    1:1:boolean hasNext():116:116 -> hasNext
-    1:1:boolean hasPrevious():121:121 -> hasPrevious
-    1:1:int nextIndex():140:140 -> nextIndex
-    1:1:int previousIndex():145:145 -> previousIndex
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$UnmodifiableIterator -> com.android.tools.r8.internal.T2:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$UnmodifiableIterator -> com.android.tools.r8.internal.L2:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator i -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator):724:725 -> <init>
     1:1:boolean nextBoolean():735:735 -> h
     1:1:boolean hasNext():730:730 -> hasNext
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSet -> com.android.tools.r8.internal.Y2:
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSets -> com.android.tools.r8.internal.b3:
-    com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSets$EmptySet EMPTY_SET -> a
-    1:1:void <clinit>():76:76 -> <clinit>
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSet singleton(boolean):159:159 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSets$EmptySet -> com.android.tools.r8.internal.Z2:
-    1:1:void <init>():42:42 -> <init>
-    boolean rem(boolean) -> c
-    1:1:java.lang.Object clone():52:52 -> clone
-    1:1:boolean equals(java.lang.Object):58:58 -> equals
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSets$Singleton -> com.android.tools.r8.internal.a3:
-    boolean element -> a
-    1:2:void <init>(boolean):89:90 -> <init>
-    1:1:boolean addAll(java.util.Collection):115:115 -> addAll
-    1:1:boolean contains(boolean):95:95 -> b
-    1:1:boolean remove(boolean):100:100 -> d
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanListIterator com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSets$Singleton.iterator():105:105 -> iterator
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator():85 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanListIterator com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators.singleton(boolean):159:159 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanListIterator com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSets$Singleton.iterator():105 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator():85 -> iterator
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanListIterator com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSets$Singleton.iterator():105:105 -> iterator
-    3:3:java.util.Iterator iterator():85 -> iterator
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanListIterator com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators.singleton(boolean):159:159 -> iterator
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanListIterator com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSets$Singleton.iterator():105 -> iterator
-    4:4:java.util.Iterator iterator():85 -> iterator
-    1:1:boolean removeAll(java.util.Collection):120:120 -> removeAll
-    1:1:boolean retainAll(java.util.Collection):125:125 -> retainAll
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntMap -> com.android.tools.r8.internal.t:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntMap -> com.android.tools.r8.internal.s:
     int com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntFunction.defRetValue -> a
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntFunction.<init>():44:44 -> <init>
     1:1:void <init>():46 -> <init>
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap.int2IntEntrySet() -> a
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap.int2IntEntrySet() -> b
     int com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntFunction.put(int,int) -> b
     1:1:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntFunction.containsKey(java.lang.Object):105:105 -> containsKey
     1:1:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntFunction.containsKey(java.lang.Object):0 -> containsKey
@@ -50896,7 +51095,7 @@
     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 -> toString
     2:2:java.lang.String toString():343 -> toString
     3:17:java.lang.String toString():343:357 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntMap$BasicEntry -> com.android.tools.r8.internal.s:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntMap$BasicEntry -> com.android.tools.r8.internal.r:
     int value -> b
     int key -> a
     1:3:void <init>(int,int):122:124 -> <init>
@@ -50915,7 +51114,7 @@
     3:3:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntMap$BasicEntry.setValue(java.lang.Integer):175 -> setValue
     3:3:java.lang.Object setValue(java.lang.Object):113 -> setValue
     1:1:java.lang.String toString():194:194 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceFunction -> com.android.tools.r8.internal.u:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceFunction -> com.android.tools.r8.internal.t:
     java.lang.Object defRetValue -> a
     1:1:void <init>():44:44 -> <init>
     1:1:java.lang.Object put(int,java.lang.Object):71:71 -> a
@@ -50925,10 +51124,10 @@
     1:1:java.lang.Object put(java.lang.Object,java.lang.Object):41:41 -> put
     1:1:java.lang.Object remove(int):82:82 -> remove
     2:4:java.lang.Object remove(java.lang.Object):153:155 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceMap -> com.android.tools.r8.internal.w:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceMap -> com.android.tools.r8.internal.v:
     1:1:void <init>():45:45 -> <init>
     boolean containsKey(int) -> a
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():273:273 -> a
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():273:273 -> b
     1:1:java.util.Set entrySet():42:42 -> entrySet
     1:4:boolean equals(java.lang.Object):296:299 -> equals
     1:4:int hashCode():286:289 -> hashCode
@@ -50938,7 +51137,7 @@
     14:16:void putAll(java.util.Map):82 -> putAll
     1:17:java.lang.String toString():304:320 -> toString
     1:1:java.util.Collection com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap.values():1435:1435 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceMap$BasicEntry -> com.android.tools.r8.internal.v:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceMap$BasicEntry -> com.android.tools.r8.internal.u:
     java.lang.Object value -> b
     int key -> a
     1:3:void <init>(int,java.lang.Object):109:111 -> <init>
@@ -50950,14 +51149,14 @@
     1:1:int hashCode():151:151 -> hashCode
     1:1:java.lang.Object setValue(java.lang.Object):138:138 -> setValue
     1:1:java.lang.String toString():156:156 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap -> com.android.tools.r8.internal.x:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap -> com.android.tools.r8.internal.w:
     1:1:void <init>():33:33 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(java.lang.Integer):59:59 -> a
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(java.lang.Integer,java.lang.Integer):72:72 -> a
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap.entrySet():293:293 -> a
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():30 -> a
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(java.lang.Integer):46:46 -> b
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap.int2ReferenceEntrySet():1435:1435 -> b
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap.entrySet():293:293 -> b
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():30 -> b
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap.int2ReferenceEntrySet():1435:1435 -> c
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():293:293 -> entrySet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap.entrySet():293:293 -> entrySet
     2:2:java.util.Set entrySet():30 -> entrySet
@@ -50978,7 +51177,7 @@
     1:1:java.util.SortedMap tailMap(java.lang.Object):30:30 -> tailMap
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap.tailMap(java.lang.Integer):59:59 -> tailMap
     2:2:java.util.SortedMap tailMap(java.lang.Object):30 -> tailMap
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap$KeySet -> com.android.tools.r8.internal.x$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap$KeySet -> com.android.tools.r8.internal.w$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap):122:122 -> <init>
     1:1:void clear():135:135 -> clear
@@ -50986,7 +51185,7 @@
     1:1:java.util.Comparator comparator():122 -> comparator
     1:1:boolean contains(int):125:125 -> d
     1:1:int size():130:130 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection -> com.android.tools.r8.internal.y:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection -> com.android.tools.r8.internal.x:
     1:1:void <init>():37:37 -> <init>
     1:1:boolean add(int):68:68 -> a
     2:2:boolean add(java.lang.Integer):114:114 -> a
@@ -51003,19 +51202,19 @@
     1:1:boolean add(java.lang.Object):36:36 -> add
     1:1:boolean contains(java.lang.Object):129:129 -> contains
     boolean contains(int) -> d
+    1:1:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray(int[]):167:167 -> f
+    1:1:int[] toIntArray():155 -> f
     1:4:boolean rem(int):94:97 -> g
-    5:5:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray(int[]):167:167 -> g
-    5:5:int[] toIntArray():155 -> g
     1:1:java.util.Iterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeySet.iterator():803:803 -> iterator
     1:1:boolean remove(java.lang.Object):143:143 -> remove
     1:14:java.lang.String toString():206:219 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator -> com.android.tools.r8.internal.z:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator -> com.android.tools.r8.internal.y:
     1:1:void <init>():34:34 -> <init>
     int nextInt() -> l
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():57:57 -> next
     1:1:java.lang.Object next():33 -> next
     1:1:void remove():68:68 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList -> com.android.tools.r8.internal.C:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList -> com.android.tools.r8.internal.B:
     1:1:void <init>():33:33 -> <init>
     boolean addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList) -> a
     1:1:boolean add(int):86:86 -> a
@@ -51071,7 +51270,7 @@
     2:2:java.lang.Object set(int,java.lang.Object):32 -> set
     1:1:java.util.List subList(int,int):32:32 -> subList
     1:14:java.lang.String toString():709:722 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList$IntSubList -> com.android.tools.r8.internal.B:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList$IntSubList -> com.android.tools.r8.internal.A:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList l -> b
     int to -> d
     boolean $assertionsDisabled -> a
@@ -51126,11 +51325,12 @@
     5:5:java.lang.Object set(int,java.lang.Object):726 -> set
     1:1:int size():792:792 -> size
     1:1:java.util.List subList(int,int):726:726 -> subList
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList$IntSubList$1 -> com.android.tools.r8.internal.A:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList$IntSubList$1 -> com.android.tools.r8.internal.z:
+    int val$index -> d
     boolean $assertionsDisabled -> a
     int pos -> b
-    com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList$IntSubList this$0 -> d
     int last -> c
+    com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList$IntSubList this$0 -> e
     1:1:void <clinit>():822:822 -> <clinit>
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList$IntSubList,int):822:823 -> <init>
     1:5:void add(int):852:852 -> a
@@ -51142,7 +51342,7 @@
     1:1:int nextIndex():844:844 -> nextIndex
     1:1:int previousIndex():848:848 -> previousIndex
     1:11:void remove():864:864 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntListIterator -> com.android.tools.r8.internal.D:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntListIterator -> com.android.tools.r8.internal.C:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntBidirectionalIterator.<init>():34:34 -> <init>
     1:1:void <init>():35 -> <init>
     1:1:void add(int):57:57 -> a
@@ -51158,13 +51358,13 @@
     1:1:void set(java.lang.Object):34:34 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntListIterator.set(java.lang.Integer):70:70 -> set
     2:2:void set(java.lang.Object):34 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntSet -> com.android.tools.r8.internal.E:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntSet -> com.android.tools.r8.internal.D:
     1:1:void <init>():32:32 -> <init>
     1:4:boolean equals(java.lang.Object):41:44 -> equals
     1:1:boolean rem(int):87:87 -> g
     1:5:int hashCode():57:61 -> hashCode
     1:1:boolean remove(int):75:75 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntSortedSet -> com.android.tools.r8.internal.F:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntSortedSet -> com.android.tools.r8.internal.E:
     1:1:void <init>():23:23 -> <init>
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntSortedSet.first():94:94 -> first
     1:1:java.lang.Object first():22 -> first
@@ -51200,7 +51400,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.pg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap -> com.android.tools.r8.internal.Bf:
     int[] key -> b
     int[] value -> c
     int size -> d
@@ -51208,11 +51408,11 @@
     4:6:void <init>(int):81:83 -> <init>
     1:1:int access$000(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap):37:37 -> a
     2:2:int access$300(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap,int):37:37 -> a
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap.int2IntEntrySet():230:230 -> a
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2IntEntrySet():37 -> a
-    4:4:boolean containsKey(int):261:261 -> a
+    3:3:boolean containsKey(int):261:261 -> a
     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
+    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 -> b
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2IntEntrySet():37 -> b
+    3:22: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
     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
@@ -51222,10 +51422,10 @@
     1:1:int[] access$200(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap):37:37 -> d
     2:3:boolean containsValue(int):266:267 -> d
     1:7:int remove(int):304:310 -> f
-    8:8:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():321:321 -> f
-    9:9: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 -> f
-    9:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():321 -> f
     1:3:int findKey(int):234:236 -> g
+    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():321:321 -> g
+    5:5: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 -> g
+    5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():321 -> g
     1:4:int get(int):243:246 -> get
     1:1:boolean isEmpty():273:273 -> isEmpty
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keySet():316:316 -> keySet
@@ -51237,8 +51437,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.mg:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet -> com.android.tools.r8.internal.og:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$1 -> com.android.tools.r8.internal.yf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet -> com.android.tools.r8.internal.Af:
     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>
@@ -51248,7 +51448,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.ng:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.zf:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet this$1 -> c
     int next -> b
     int curr -> a
@@ -51257,13 +51457,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.qg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntFunction -> com.android.tools.r8.internal.Cf:
     boolean containsKey(int) -> a
     int put(int,int) -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry -> com.android.tools.r8.internal.rg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry -> com.android.tools.r8.internal.Df:
     int getIntKey() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet -> com.android.tools.r8.internal.sg:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap -> com.android.tools.r8.internal.Bg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet -> com.android.tools.r8.internal.Ef:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap -> com.android.tools.r8.internal.Nf:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet entries -> i
     int[] key -> b
     int[] value -> c
@@ -51282,23 +51482,23 @@
     1:1:int access$300(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):50:50 -> a
     2:2:int access$400(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap,int):50:50 -> a
     3:12:boolean containsKey(int):387:396 -> a
-    13:14:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.int2IntEntrySet():773:774 -> a
-    13:14:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2IntEntrySet():50 -> a
     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
+    20:21:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.int2IntEntrySet():773:774 -> b
+    20:21:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2IntEntrySet():50 -> b
     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
     11:11:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.clone():1019:1019 -> clone
     11:11:java.lang.Object clone():50 -> clone
     1:5:boolean containsValue(int):403:407 -> d
-    1:4:int removeNullEntry():228:231 -> f
-    5:16:int remove(int):352:363 -> f
-    1:7:void rehash(int):979:985 -> g
-    8:8:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.realSize():206:206 -> g
-    8:8:void rehash(int):986 -> g
-    9:21:void rehash(int):987:999 -> g
+    1:12:int remove(int):352:363 -> f
+    1:4:int removeNullEntry():228:231 -> g
+    5:11:void rehash(int):979:985 -> g
+    12:12:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.realSize():206:206 -> g
+    12:12:void rehash(int):986 -> g
+    13:25:void rehash(int):987:999 -> g
     1:11:int get(int):370:380 -> get
     1:2:int removeEntry(int):220:221 -> h
     3:8:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.shiftKeys(int):333:338 -> h
@@ -51324,14 +51524,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.tg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$1 -> com.android.tools.r8.internal.Ff:
     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:void clear():884:884 -> clear
     1:1:boolean contains(int):879:879 -> d
     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.ug:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Gf:
     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>
@@ -51339,13 +51539,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.vg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Hf:
     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 -> l
     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.wg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.If:
     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>
@@ -51354,7 +51554,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.xg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.Jf:
     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>
@@ -51375,7 +51575,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.yg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Kf:
     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>
@@ -51384,7 +51584,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.zg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapIterator -> com.android.tools.r8.internal.Lf:
     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
@@ -51392,7 +51592,7 @@
     boolean mustReturnNullKey -> d
     1:24:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):552:575 -> <init>
     25:25:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$1):552:552 -> <init>
-    1:19:int nextEntry():587:587 -> f
+    1:19:int nextEntry():587:587 -> e
     1:1:boolean hasNext():583:583 -> hasNext
     1:4:void remove():641:644 -> remove
     5:10:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapIterator.shiftKeys(int):619:624 -> remove
@@ -51402,13 +51602,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.Ag:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Mf:
     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 -> l
     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.Hg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap -> com.android.tools.r8.internal.Tf:
     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
@@ -51503,13 +51703,12 @@
     124:124:java.lang.Object put(int,java.lang.Object):283 -> a
     125:125:boolean containsKey(int):980:980 -> a
     126:126:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):1421:1421 -> a
-    1:79:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet():1161:1239 -> b
-    80:80:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):1416:1416 -> b
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):1416:1416 -> b
     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:5:int firstIntKey():1001:1001 -> c
-    6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):1411:1411 -> c
+    3:81:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet():1161:1239 -> c
+    82:82: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
@@ -51541,8 +51740,9 @@
     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:1:void allocatePaths():278:278 -> f
+    1:1:void allocatePaths():278:278 -> g
     1:2:java.lang.Object get(int):995:996 -> get
     1:3:int lastIntKey():1007:1007 -> i
     1:1:boolean isEmpty():990:990 -> isEmpty
@@ -51597,14 +51797,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.Cg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1 -> com.android.tools.r8.internal.Of:
     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.Eg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2 -> com.android.tools.r8.internal.Qf:
     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>
@@ -51627,20 +51827,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.Dg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2$1 -> com.android.tools.r8.internal.Pf:
     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.Fg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$3 -> com.android.tools.r8.internal.Rf:
     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.Gg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry -> com.android.tools.r8.internal.Sf:
     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
@@ -51667,7 +51867,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.Hg$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$EntryIterator -> com.android.tools.r8.internal.Tf$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
@@ -51679,7 +51879,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.Hg$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeyIterator -> com.android.tools.r8.internal.Tf$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
@@ -51693,12 +51893,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.Hg$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeySet -> com.android.tools.r8.internal.Tf$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.Hg$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap -> com.android.tools.r8.internal.Tf$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
@@ -51713,18 +51913,18 @@
     2:2:boolean containsKey(int):1624 -> a
     3:6:java.lang.Object put(int,java.lang.Object):1648:1651 -> a
     7:11:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):1698:1702 -> a
-    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:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):1692:1693 -> b
+    1:81:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet():1497:1577 -> c
+    82:83:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):1686:1687 -> 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
-    1:13:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry firstEntry():1712:1724 -> f
+    2:4:int firstIntKey():1753:1755 -> d
+    5:5:int firstIntKey():1754:1754 -> d
+    1:13:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry firstEntry():1712:1724 -> g
     1:1:java.lang.Object get(int):1643:1643 -> get
     1:3:int lastIntKey():1760:1762 -> i
     4:4:int lastIntKey():1761:1761 -> i
@@ -51740,7 +51940,7 @@
     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.Ig:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$1 -> com.android.tools.r8.internal.Uf:
     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
@@ -51770,19 +51970,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.Jg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$2 -> com.android.tools.r8.internal.Vf:
     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.Hg$d$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$KeySet -> com.android.tools.r8.internal.Tf$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.Hg$d$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.Tf$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
@@ -51794,12 +51994,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.Hg$d$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.Tf$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.Hg$d$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.Tf$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
@@ -51813,14 +52013,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.Hg$d$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.Tf$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.Hg$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$TreeIterator -> com.android.tools.r8.internal.Tf$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
@@ -51828,7 +52028,7 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry next -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1042:1042 -> <init>
     2:5:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1040:1043 -> <init>
-    1:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry nextEntry():1068:1068 -> f
+    1:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry nextEntry():1068:1068 -> e
     1:1:boolean hasNext():1056:1056 -> hasNext
     1:1:boolean hasPrevious():1060:1060 -> hasPrevious
     1:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry previousEntry():1080:1080 -> k
@@ -51837,14 +52037,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.Hg$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$ValueIterator -> com.android.tools.r8.internal.Tf$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.Mg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap -> com.android.tools.r8.internal.Yf:
     java.lang.Object[] value -> c
     int[] key -> b
     int size -> d
@@ -51855,9 +52055,9 @@
     3:3:boolean containsKey(int):265:265 -> a
     4:23:java.lang.Object put(int,java.lang.Object):283:302 -> a
     1:1:int access$010(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap):37:37 -> b
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap.int2ReferenceEntrySet():231:231 -> b
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ReferenceEntrySet():37 -> b
     1:1:int[] access$100(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap):37:37 -> c
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap.int2ReferenceEntrySet():231:231 -> c
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ReferenceEntrySet():37 -> c
     1:4:void clear():257:260 -> clear
     1:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap.clone():344:349 -> clone
     1:6:java.lang.Object clone():37 -> clone
@@ -51872,8 +52072,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.Kg:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet -> com.android.tools.r8.internal.Mg$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$1 -> com.android.tools.r8.internal.Wf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet -> com.android.tools.r8.internal.Yf$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>
@@ -51883,7 +52083,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.Lg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet$1 -> com.android.tools.r8.internal.Xf:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet this$1 -> c
     int next -> b
     int curr -> a
@@ -51892,23 +52092,23 @@
     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.Ng:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunction -> com.android.tools.r8.internal.Zf:
     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.Og:
-    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.Og$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap -> com.android.tools.r8.internal.ag:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ReferenceEntrySet() -> c
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry -> com.android.tools.r8.internal.ag$a:
     int getIntKey() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet -> com.android.tools.r8.internal.Pg:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps -> com.android.tools.r8.internal.Rg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet -> com.android.tools.r8.internal.bg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps -> com.android.tools.r8.internal.dg:
     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.Qg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps$EmptyMap -> com.android.tools.r8.internal.cg:
     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
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():75:75 -> a
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ReferenceEntrySet():62:62 -> b
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():75:75 -> b
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ReferenceEntrySet():62:62 -> c
     void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunctions$EmptyFunction.clear() -> clear
     1:1:java.lang.Object clone():95:95 -> clone
     1:1:java.util.Set entrySet():43:43 -> entrySet
@@ -51921,7 +52121,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.Tg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap -> com.android.tools.r8.internal.fg:
     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
@@ -51943,8 +52143,8 @@
     3:18:java.lang.Object put(int,java.lang.Object):271 -> a
     19:21:java.lang.Object put(int,java.lang.Object):272:274 -> a
     22:31:boolean containsKey(int):344:353 -> a
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.int2ReferenceEntrySet():707:708 -> b
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ReferenceEntrySet():49 -> b
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.int2ReferenceEntrySet():707:708 -> c
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ReferenceEntrySet():49 -> c
     1:5:void clear():377:381 -> clear
     1:10:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.clone():945:954 -> clone
     1:10:java.lang.Object clone():49 -> clone
@@ -51961,7 +52161,7 @@
     11:11:java.lang.Object removeEntry(int):223:223 -> e
     12:17:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.shiftKeys(int):298:303 -> e
     12:17:java.lang.Object removeEntry(int):222 -> e
-    1:5:java.lang.Object removeNullEntry():228:232 -> f
+    1:5:java.lang.Object removeNullEntry():228:232 -> g
     1:11:java.lang.Object get(int):327:337 -> get
     1:1:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.realSize():205:205 -> hashCode
     1:1:int hashCode():971 -> hashCode
@@ -51980,14 +52180,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.Sg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1 -> com.android.tools.r8.internal.eg:
     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.Tg$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.internal.fg$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>
@@ -51995,13 +52195,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.Tg$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.internal.fg$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 -> l
     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.Tg$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.internal.fg$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>
@@ -52010,7 +52210,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.Tg$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.internal.fg$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>
@@ -52022,7 +52222,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.Tg$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.fg$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>
@@ -52031,7 +52231,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.Tg$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.internal.fg$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList wrapped -> e
     int last -> b
     int pos -> a
@@ -52039,7 +52239,7 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> f
     1:24:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):486:509 -> <init>
     25:25:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1):486:486 -> <init>
-    1:19:int nextEntry():521:521 -> f
+    1:19:int nextEntry():521:521 -> e
     1:1:boolean hasNext():517:517 -> hasNext
     1:5:void remove():576:580 -> remove
     6:12:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapIterator.shiftKeys(int):553:559 -> remove
@@ -52049,11 +52249,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.Tg$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.internal.fg$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.Zg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap -> com.android.tools.r8.internal.lg:
     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
@@ -52108,11 +52308,10 @@
     112:112:java.lang.Object put(int,java.lang.Object):288 -> a
     113:113:boolean containsKey(int):946:946 -> a
     114:114:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):1389:1389 -> a
-    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: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:4:int firstIntKey():967:967 -> c
-    5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):1379:1379 -> c
+    2:80:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet():1127:1205 -> c
+    81:81: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
@@ -52144,11 +52343,12 @@
     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:2:void allocatePaths():282:283 -> f
+    1:2:void allocatePaths():282:283 -> g
     1:2:java.lang.Object get(int):961:962 -> get
     1:3:int lastIntKey():973:973 -> i
     1:1:boolean isEmpty():956:956 -> isEmpty
@@ -52175,8 +52375,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.Ug:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2 -> com.android.tools.r8.internal.Wg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$1 -> com.android.tools.r8.internal.gg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2 -> com.android.tools.r8.internal.ig:
     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>
@@ -52199,20 +52399,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.Vg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2$1 -> com.android.tools.r8.internal.hg:
     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.Xg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$3 -> com.android.tools.r8.internal.jg:
     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.Yg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry -> com.android.tools.r8.internal.kg:
     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
@@ -52239,7 +52439,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.Zg$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$EntryIterator -> com.android.tools.r8.internal.lg$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
@@ -52251,7 +52451,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.Zg$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$KeyIterator -> com.android.tools.r8.internal.lg$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
@@ -52265,12 +52465,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.Zg$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$KeySet -> com.android.tools.r8.internal.lg$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.Zg$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap -> com.android.tools.r8.internal.lg$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
@@ -52291,17 +52491,15 @@
     12:12:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.compare(int,int):234:234 -> a
     12:12:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):1665 -> a
     13:15:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):1665:1667 -> a
-    1:81:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet():1465:1545 -> b
-    82:83:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):1657:1658 -> b
-    84:84:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.compare(int,int):234:234 -> b
-    84:84:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):1658 -> b
-    85:85:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):1658:1658 -> b
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):1651:1652 -> c
-    3:3:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.compare(int,int):234:234 -> c
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):1652 -> c
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):1652:1652 -> c
-    5:7:int firstIntKey():1718:1720 -> c
-    8:8:int firstIntKey():1719:1719 -> c
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):1657:1658 -> b
+    3:3:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.compare(int,int):234:234 -> b
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):1658 -> b
+    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):1658:1658 -> b
+    1:81:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet():1465:1545 -> c
+    82:83:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):1651:1652 -> c
+    84:84:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.compare(int,int):234:234 -> c
+    84:84:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):1652 -> c
+    85:85:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):1652:1652 -> 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
@@ -52312,12 +52510,14 @@
     3:3:boolean in(int):1460:1460 -> d
     4:4:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.compare(int,int):234:234 -> d
     4:4:boolean in(int):1460 -> d
-    1:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry firstEntry():1677:1685 -> f
-    10:10:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.compare(int,int):234:234 -> f
-    10:10:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry firstEntry():1685 -> f
-    11:15:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry firstEntry():1685:1689 -> f
-    16:16:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.compare(int,int):234:234 -> f
-    16:16:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry firstEntry():1689 -> f
+    5:7:int firstIntKey():1718:1720 -> d
+    8:8:int firstIntKey():1719:1719 -> d
+    1:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry firstEntry():1677:1685 -> g
+    10:10:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.compare(int,int):234:234 -> g
+    10:10:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry firstEntry():1685 -> g
+    11:15:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry firstEntry():1685:1689 -> g
+    16:16:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.compare(int,int):234:234 -> g
+    16:16:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry firstEntry():1689 -> g
     1:1:java.lang.Object get(int):1608:1608 -> get
     1:3:int lastIntKey():1725:1727 -> i
     4:4:int lastIntKey():1726:1726 -> i
@@ -52338,7 +52538,7 @@
     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.ah:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$1 -> com.android.tools.r8.internal.mg:
     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
@@ -52368,19 +52568,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.bh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$2 -> com.android.tools.r8.internal.ng:
     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.Zg$d$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$KeySet -> com.android.tools.r8.internal.lg$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.Zg$d$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.lg$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
@@ -52392,7 +52592,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.Zg$d$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.lg$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
@@ -52403,7 +52603,7 @@
     3:3:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.compare(int,int):234:234 -> o
     3:3:void updatePrevious():1763 -> o
     4:4:void updatePrevious():1763:1763 -> o
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.Zg$d$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.lg$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
@@ -52417,14 +52617,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.Zg$d$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.lg$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.Zg$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$TreeIterator -> com.android.tools.r8.internal.lg$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
@@ -52432,7 +52632,7 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap this$0 -> e
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1008:1008 -> <init>
     2:5:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1006:1009 -> <init>
-    1:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry nextEntry():1034:1034 -> f
+    1:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry nextEntry():1034:1034 -> e
     1:1:boolean hasNext():1022:1022 -> hasNext
     1:1:boolean hasPrevious():1026:1026 -> hasPrevious
     1:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry previousEntry():1046:1046 -> k
@@ -52441,38 +52641,38 @@
     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.Zg$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$ValueIterator -> com.android.tools.r8.internal.lg$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.ch:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap -> com.android.tools.r8.internal.og:
     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
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet() -> c
+    int firstIntKey() -> d
     int lastIntKey() -> i
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps -> com.android.tools.r8.internal.eh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps -> com.android.tools.r8.internal.qg:
     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.dh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps$EmptySortedMap -> com.android.tools.r8.internal.pg:
     1:1:void <init>():60:60 -> <init>
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():57:57 -> a
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):95:95 -> a
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(java.lang.Integer):141:141 -> a
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(java.lang.Integer,java.lang.Integer):153:153 -> a
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ReferenceEntrySet():57:57 -> b
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet():71:71 -> b
-    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
-    2:2:int firstIntKey():112:112 -> c
+    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
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(java.lang.Integer,java.lang.Integer):153:153 -> a
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():57:57 -> b
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):107:107 -> b
+    3:3: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.objects.ObjectSet int2ReferenceEntrySet():57:57 -> c
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet():71:71 -> c
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):101:101 -> c
+    1:1:int firstIntKey():112:112 -> d
     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
@@ -52486,7 +52686,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.gh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList -> com.android.tools.r8.internal.sg:
     int size -> b
     1:3:void <init>(int):81:83 -> <init>
     4:4:void <init>(int):82:82 -> <init>
@@ -52528,9 +52728,10 @@
     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.fh:
-    com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList this$0 -> c
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList$1 -> com.android.tools.r8.internal.rg:
+    com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList this$0 -> d
     int last -> b
+    int val$index -> c
     int pos -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList,int):494:495 -> <init>
     1:2:void add(int):524:525 -> a
@@ -52542,7 +52743,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.ih:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet -> com.android.tools.r8.internal.ug:
     int size -> b
     1:2:void <init>():55:56 -> <init>
     3:4:void <init>(int):65:66 -> <init>
@@ -52564,25 +52765,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.hh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet$1 -> com.android.tools.r8.internal.tg:
     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 -> l
     1:2:void remove():135:136 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrays -> com.android.tools.r8.internal.jh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrays -> com.android.tools.r8.internal.vg:
     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.kh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator -> com.android.tools.r8.internal.wg:
     int previousInt() -> d
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection -> com.android.tools.r8.internal.mh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection -> com.android.tools.r8.internal.yg:
     boolean add(int) -> a
     boolean contains(int) -> d
-    int[] toIntArray() -> g
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections -> com.android.tools.r8.internal.ph:
+    int[] toIntArray() -> f
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections -> com.android.tools.r8.internal.Bg:
     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.nh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections$EmptyCollection -> com.android.tools.r8.internal.zg:
     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
@@ -52593,7 +52794,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.oh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections$UnmodifiableCollection -> com.android.tools.r8.internal.Ag:
     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
@@ -52617,18 +52818,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.qh:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator -> com.android.tools.r8.internal.sh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator -> com.android.tools.r8.internal.Cg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator -> com.android.tools.r8.internal.Eg:
     int nextInt() -> l
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators -> com.android.tools.r8.internal.wh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators -> com.android.tools.r8.internal.Ig:
     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.th:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$EmptyIterator -> com.android.tools.r8.internal.Fg:
     1:1:void <init>():42:42 -> <init>
     1:1:java.lang.Object clone():87:87 -> clone
     1:1:int previousInt():62:62 -> d
     1:1:int nextInt():57:57 -> l
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$SingletonIterator -> com.android.tools.r8.internal.uh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$SingletonIterator -> com.android.tools.r8.internal.Gg:
     int curr -> b
     int element -> a
     1:2:void <init>(int):110:111 -> <init>
@@ -52638,12 +52839,12 @@
     1:4:int nextInt():126:126 -> l
     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.vh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$UnmodifiableIterator -> com.android.tools.r8.internal.Hg:
     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 -> l
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList -> com.android.tools.r8.internal.xh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList -> com.android.tools.r8.internal.Jg:
     boolean add(int) -> a
     boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList) -> a
     void getElements(int,int[],int,int) -> a
@@ -52652,13 +52853,13 @@
     int set(int,int) -> c
     int removeInt(int) -> e
     int getInt(int) -> f
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator -> com.android.tools.r8.internal.yh:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists -> com.android.tools.r8.internal.Ah:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator -> com.android.tools.r8.internal.Kg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists -> com.android.tools.r8.internal.Mg:
     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.zh:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$EmptyList -> com.android.tools.r8.internal.Ah$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$1 -> com.android.tools.r8.internal.Lg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$EmptyList -> com.android.tools.r8.internal.Mg$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
@@ -52698,7 +52899,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.Bh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$Singleton -> com.android.tools.r8.internal.Ng:
     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>
@@ -52712,8 +52913,8 @@
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList subList(int,int):392:392 -> d
     1:1:int removeInt(int):353:353 -> e
     1:2:int getInt(int):342:343 -> f
+    3:4:int[] toIntArray():364:365 -> f
     1:1:boolean rem(int):348:348 -> g
-    2:3:int[] toIntArray():364:365 -> g
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$Singleton.iterator():376:376 -> iterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():332 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator iterator():376:376 -> iterator
@@ -52728,7 +52929,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.Hh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet -> com.android.tools.r8.internal.Tg:
     float f -> g
     int size -> f
     int n -> d
@@ -52781,8 +52982,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.Fh:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$SetIterator -> com.android.tools.r8.internal.Gh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$1 -> com.android.tools.r8.internal.Rg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$SetIterator -> com.android.tools.r8.internal.Sg:
     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
@@ -52800,21 +53001,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.Mh:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets -> com.android.tools.r8.internal.Oh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet -> com.android.tools.r8.internal.Zg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets -> com.android.tools.r8.internal.bh:
     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.Nh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets$EmptySet -> com.android.tools.r8.internal.ah:
     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.Ph:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets -> com.android.tools.r8.internal.Rh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet -> com.android.tools.r8.internal.ch:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets -> com.android.tools.r8.internal.eh:
     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.Qh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets$EmptySet -> com.android.tools.r8.internal.dh:
     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
@@ -52830,16 +53031,16 @@
     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.Sh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntStack -> com.android.tools.r8.internal.fh:
 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>
     java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceFunction.put(long,java.lang.Object) -> a
     java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceFunction.remove(long) -> a
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():273:273 -> a
-    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 -> a
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap.long2ReferenceEntrySet():49 -> a
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():273 -> a
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():273:273 -> b
+    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 -> b
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap.long2ReferenceEntrySet():49 -> b
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():273 -> b
     1:1:boolean com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceFunction.containsKey(java.lang.Object):105:105 -> containsKey
     1:1:boolean com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceFunction.containsKey(java.lang.Object):0 -> containsKey
     1:1:java.util.Set entrySet():42:42 -> entrySet
@@ -53035,7 +53236,8 @@
     1:1:int size():791:791 -> size
     1:1:java.util.List subList(int,int):725:725 -> subList
 com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongList$LongSubList$1 -> com.android.tools.r8.internal.O:
-    com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongList$LongSubList this$0 -> d
+    com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongList$LongSubList this$0 -> e
+    int val$index -> d
     boolean $assertionsDisabled -> a
     int pos -> b
     int last -> c
@@ -53070,9 +53272,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$Entry -> com.android.tools.r8.internal.op:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$FastEntrySet -> com.android.tools.r8.internal.pp:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap -> com.android.tools.r8.internal.rp:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$Entry -> com.android.tools.r8.internal.ro:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$FastEntrySet -> com.android.tools.r8.internal.so:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap -> com.android.tools.r8.internal.uo:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> j
     java.lang.Object[] value -> b
     long[] key -> a
@@ -53110,7 +53312,7 @@
     11:11:java.lang.Object removeEntry(int):223:223 -> e
     12:17:void com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap.shiftKeys(int):298:303 -> e
     12:17:java.lang.Object removeEntry(int):222 -> e
-    1:5:java.lang.Object removeNullEntry():228:232 -> f
+    1:5:java.lang.Object removeNullEntry():228:232 -> g
     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
@@ -53129,14 +53331,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.qp:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$1 -> com.android.tools.r8.internal.to:
     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.rp$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.internal.uo$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>
@@ -53144,13 +53346,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.rp$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.internal.uo$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.rp$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.internal.uo$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>
@@ -53158,7 +53360,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.rp$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.internal.uo$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>
@@ -53169,7 +53371,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.rp$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.uo$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>
@@ -53178,7 +53380,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.rp$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.internal.uo$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
@@ -53186,7 +53388,7 @@
     boolean mustReturnNullKey -> d
     1:24:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):486:509 -> <init>
     25:25:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$1):486:486 -> <init>
-    1:19:int nextEntry():521:521 -> f
+    1:19:int nextEntry():521:521 -> e
     1:1:boolean hasNext():517:517 -> hasNext
     1:5:void remove():576:580 -> remove
     6:12:void com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapIterator.shiftKeys(int):553:559 -> remove
@@ -53196,11 +53398,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.rp$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.internal.uo$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.tp:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList -> com.android.tools.r8.internal.wo:
     int size -> b
     1:3:void <init>(int):81:83 -> <init>
     4:4:void <init>(int):82:82 -> <init>
@@ -53226,9 +53428,10 @@
     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.sp:
-    com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList this$0 -> c
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList$1 -> com.android.tools.r8.internal.vo:
+    com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList this$0 -> d
     int last -> b
+    int val$index -> c
     int pos -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList,int):494:495 -> <init>
     1:3:long nextLong():506:506 -> a
@@ -53240,25 +53443,25 @@
     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.up:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongBidirectionalIterator -> com.android.tools.r8.internal.xo:
     long previousLong() -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection -> com.android.tools.r8.internal.vp:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator -> com.android.tools.r8.internal.xp:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection -> com.android.tools.r8.internal.yo:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator -> com.android.tools.r8.internal.Ao:
     long nextLong() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongList -> com.android.tools.r8.internal.yp:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongList -> com.android.tools.r8.internal.Bo:
     void add(int,long) -> a
     void removeElements(int,int) -> a
     long getLong(int) -> b
     long set(int,long) -> b
     long removeLong(int) -> c
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongSet -> com.android.tools.r8.internal.Cp:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongSet -> com.android.tools.r8.internal.Eo:
 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>
     boolean containsValue(boolean) -> a
     boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.put(java.lang.Object,boolean) -> a
+    boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.removeBoolean(java.lang.Object) -> c
     1:1:boolean containsValue(java.lang.Object):62:62 -> containsValue
-    boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.removeBoolean(java.lang.Object) -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap.entrySet():297:297 -> entrySet
     1:1:java.util.Set entrySet():42 -> entrySet
     1:3:boolean equals(java.lang.Object):320:322 -> equals
@@ -53315,8 +53518,8 @@
     java.lang.Object key -> a
     boolean value -> b
     1:3:void <init>(java.lang.Object,boolean):121:123 -> <init>
+    1:1:boolean getBooleanValue():145:145 -> b
     1:4:boolean equals(java.lang.Object):167:170 -> equals
-    1:1:boolean getBooleanValue():145:145 -> getBooleanValue
     1:1:java.lang.Object getKey():128:128 -> getKey
     1:1:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap$BasicEntry.getValue():140:140 -> getValue
     1:1:java.lang.Object getValue():112 -> getValue
@@ -53333,8 +53536,8 @@
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.<init>():44:44 -> <init>
     1:1:void <init>():45 -> <init>
     int com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.put(java.lang.Object,int) -> a
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> a
-    int com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.removeInt(java.lang.Object) -> c
+    int com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.removeInt(java.lang.Object) -> b
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> b
     1:1:boolean containsValue(java.lang.Object):62:62 -> containsValue
     boolean containsValue(int) -> d
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.defaultReturnValue(int):55:55 -> e
@@ -53381,12 +53584,12 @@
     1:1:java.lang.String toString():180:180 -> toString
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntSortedMap -> com.android.tools.r8.internal.l0:
     1:1:void <init>():34:34 -> <init>
-    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 -> a
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():31 -> a
-    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 -> a
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.object2IntEntrySet():87 -> a
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntSortedMap.entrySet():229 -> a
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():31 -> a
+    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 -> b
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():31 -> b
+    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 -> b
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.object2IntEntrySet():87 -> b
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntSortedMap.entrySet():229 -> b
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():31 -> b
     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 -> entrySet
     1:1:java.util.Set entrySet():31 -> entrySet
     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 -> entrySet
@@ -53398,12 +53601,12 @@
     1:1:void <init>():45 -> <init>
     boolean containsValue(long) -> a
     long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.put(java.lang.Object,long) -> a
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> a
-    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 -> a
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.object2LongEntrySet():49 -> a
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297 -> a
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> b
+    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 -> b
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.object2LongEntrySet():49 -> b
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297 -> b
+    long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.removeLong(java.lang.Object) -> c
     1:1:boolean containsValue(java.lang.Object):62:62 -> containsValue
-    long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.removeLong(java.lang.Object) -> d
     1:1:java.util.Set entrySet():42:42 -> entrySet
     1:3:boolean equals(java.lang.Object):320:322 -> equals
     4:4:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.size():429:429 -> equals
@@ -53479,56 +53682,67 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap.object2ObjectEntrySet():85:85 -> entrySet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ObjectSortedMap.entrySet():226 -> entrySet
     2:2:java.util.Set entrySet():31 -> entrySet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceMap -> com.android.tools.r8.internal.p0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceMap -> com.android.tools.r8.internal.q0:
+    java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceFunction.defRetValue -> a
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceFunction.<init>():44:44 -> <init>
     1:1:void <init>():45 -> <init>
-    1:3:boolean equals(java.lang.Object):272:274 -> equals
-    4:4:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.size():730:730 -> equals
-    4:4:boolean equals(java.lang.Object):274 -> equals
-    5:5:boolean equals(java.lang.Object):275:275 -> equals
-    6:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceSortedMap.entrySet():226:226 -> equals
-    6:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceSortedMap.entrySet():31 -> equals
-    6:6:boolean equals(java.lang.Object):275 -> equals
-    7:8:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap$FastSortedEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.object2ReferenceEntrySet():1348:1349 -> equals
-    7:8:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.object2ReferenceEntrySet():85 -> equals
-    7:8:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceSortedMap.entrySet():226 -> equals
-    7:8:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceSortedMap.entrySet():31 -> equals
-    7:8:boolean equals(java.lang.Object):275 -> equals
-    9:9:boolean equals(java.lang.Object):275:275 -> equals
+    void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceFunction.clear() -> clear
+    1:4:boolean equals(java.lang.Object):272:275 -> equals
+    5:5:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceSortedMap.entrySet():226:226 -> equals
+    5:5:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceSortedMap.entrySet():31 -> equals
+    5:5:boolean equals(java.lang.Object):275 -> equals
+    6:6:boolean equals(java.lang.Object):275:275 -> equals
+    1:2:int hashCode():262:263 -> hashCode
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceSortedMap.entrySet():226:226 -> hashCode
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceSortedMap.entrySet():31 -> hashCode
+    3:3:int hashCode():263 -> hashCode
+    4:6:int hashCode():263:265 -> hashCode
     java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceFunction.put(java.lang.Object,java.lang.Object) -> put
     1:13:void putAll(java.util.Map):69:81 -> putAll
     1:2:java.lang.String toString():280:281 -> toString
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceSortedMap.entrySet():226:226 -> toString
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceSortedMap.entrySet():31 -> toString
     3:3:java.lang.String toString():281 -> toString
-    4:5:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap$FastSortedEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.object2ReferenceEntrySet():1348:1349 -> toString
-    4:5:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.object2ReferenceEntrySet():85 -> toString
-    4:5:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceSortedMap.entrySet():226 -> toString
-    4:5:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceSortedMap.entrySet():31 -> toString
-    4:5:java.lang.String toString():281 -> toString
-    6:6:java.lang.String toString():281:281 -> toString
-    7:7:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntrySet.iterator():1197:1197 -> toString
-    7:7:java.lang.String toString():281 -> toString
-    8:8:java.lang.String toString():282:282 -> toString
-    9:9:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.size():730:730 -> toString
-    9:9:java.lang.String toString():282 -> toString
-    10:22:java.lang.String toString():285:297 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceSortedMap -> com.android.tools.r8.internal.q0:
+    4:20:java.lang.String toString():281:297 -> toString
+    1:1:java.util.Collection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.values():85:85 -> values
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceMap$BasicEntry -> com.android.tools.r8.internal.p0:
+    java.lang.Object value -> b
+    java.lang.Object key -> a
+    1:3:void <init>(java.lang.Object,java.lang.Object):103:105 -> <init>
+    1:1:java.lang.Object getKey():110:110 -> getKey
+    1:1:java.lang.Object getValue():115:115 -> getValue
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceSortedMap -> com.android.tools.r8.internal.r0:
     1:1:void <init>():34:34 -> <init>
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap.object2ReferenceEntrySet():1366:1366 -> a
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceSortedMap.entrySet():226:226 -> entrySet
     1:1:java.util.Set entrySet():31 -> entrySet
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap$FastSortedEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.object2ReferenceEntrySet():1348:1349 -> entrySet
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.object2ReferenceEntrySet():85 -> entrySet
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceSortedMap.entrySet():226 -> entrySet
-    2:3:java.util.Set entrySet():31 -> entrySet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectCollection -> com.android.tools.r8.internal.r0:
+    1:1:java.util.SortedMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap.headMap(java.lang.Object):1366:1366 -> headMap
+    1:1:java.util.Set com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.keySet():85:85 -> keySet
+    1:1:java.util.SortedMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap.subMap(java.lang.Object,java.lang.Object):1366:1366 -> subMap
+    1:1:java.util.SortedMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap.tailMap(java.lang.Object):1366:1366 -> tailMap
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceSortedMap$KeySet -> com.android.tools.r8.internal.r0$a:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceSortedMap this$0 -> a
+    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceSortedMap):58:58 -> <init>
+    1:1:void clear():71:71 -> clear
+    1:1:java.util.Comparator comparator():76:76 -> comparator
+    1:1:boolean contains(java.lang.Object):61:61 -> contains
+    1:1:java.lang.Object first():81:81 -> first
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceSortedMap$KeySet.headSet(java.lang.Object):91:91 -> headSet
+    1:1:java.util.SortedSet headSet(java.lang.Object):58 -> headSet
+    1:1:java.lang.Object last():86:86 -> last
+    1:1:int size():66:66 -> size
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceSortedMap$KeySet.subSet(java.lang.Object,java.lang.Object):101:101 -> subSet
+    1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):58 -> subSet
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceSortedMap$KeySet.tailSet(java.lang.Object):96:96 -> tailSet
+    1:1:java.util.SortedSet tailSet(java.lang.Object):58 -> tailSet
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectCollection -> com.android.tools.r8.internal.s0:
     1:1:void <init>():37:37 -> <init>
     1:1:java.util.Iterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntrySet.iterator():689:689 -> iterator
     1:15:java.lang.String toString():61:75 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectIterator -> com.android.tools.r8.internal.s0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectIterator -> com.android.tools.r8.internal.t0:
     1:1:void <init>():34:34 -> <init>
     1:1:void remove():45:45 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectList -> com.android.tools.r8.internal.v0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectList -> com.android.tools.r8.internal.w0:
     1:1:void <init>():34:34 -> <init>
     void removeElements(int,int) -> a
     1:1:int compareTo(java.util.List):458:458 -> a
@@ -53581,7 +53795,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectList.iterator():181 -> toString
     2:2:java.lang.String toString():503 -> toString
     3:15:java.lang.String toString():504:516 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectList$ObjectSubList -> com.android.tools.r8.internal.u0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectList$ObjectSubList -> com.android.tools.r8.internal.v0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectList l -> b
     int to -> d
     boolean $assertionsDisabled -> a
@@ -53613,8 +53827,9 @@
     1:2:java.lang.Object set(int,java.lang.Object):580:581 -> set
     1:1:int size():586:586 -> size
     1:1:java.util.List subList(int,int):520:520 -> subList
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectList$ObjectSubList$1 -> com.android.tools.r8.internal.t0:
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectList$ObjectSubList this$0 -> d
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectList$ObjectSubList$1 -> com.android.tools.r8.internal.u0:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectList$ObjectSubList this$0 -> e
+    int val$index -> d
     boolean $assertionsDisabled -> a
     int pos -> b
     int last -> c
@@ -53629,75 +53844,70 @@
     1:1:int previousIndex():642:642 -> previousIndex
     1:11:void remove():658:658 -> remove
     1:3:void set(java.lang.Object):653:653 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectListIterator -> com.android.tools.r8.internal.w0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectListIterator -> com.android.tools.r8.internal.x0:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectBidirectionalIterator.<init>():34:34 -> <init>
     1:1:void <init>():35 -> <init>
     1:1:void add(java.lang.Object):57:57 -> add
     1:1:void set(java.lang.Object):46:46 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectSet -> com.android.tools.r8.internal.x0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectSet -> com.android.tools.r8.internal.y0:
     1:1:void <init>():32:32 -> <init>
     1:4:boolean equals(java.lang.Object):41:44 -> equals
     1:7:int hashCode():57:63 -> hashCode
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectSortedSet -> com.android.tools.r8.internal.y0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectSortedSet -> com.android.tools.r8.internal.z0:
     1:1:void <init>():23:23 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2.iterator():1161:1161 -> iterator
     2:2:java.util.Iterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2.iterator():1161:1161 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanFunction -> com.android.tools.r8.internal.A0:
-    1:1:void <init>():44:44 -> <init>
-    1:1:boolean put(java.lang.Object,boolean):71:71 -> a
-    1:1:void clear():93:93 -> clear
-    1:1:boolean removeBoolean(java.lang.Object):82:82 -> d
-    1:1:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanFunction.get(java.lang.Object):108:108 -> get
-    1:1:java.lang.Object get(java.lang.Object):41 -> get
-    1:1:java.lang.Object put(java.lang.Object,java.lang.Object):41:41 -> 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
-    2:4:java.lang.Object put(java.lang.Object,java.lang.Object):41 -> put
-    1:3:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanFunction.remove(java.lang.Object):140:142 -> remove
-    1:3:java.lang.Object remove(java.lang.Object):41 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanMap -> com.android.tools.r8.internal.C0:
-    1:1:void <init>():45:45 -> <init>
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanMap -> com.android.tools.r8.internal.B0:
+    1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanFunction.<init>():44:44 -> <init>
+    1:1:void <init>():45 -> <init>
     boolean containsValue(boolean) -> a
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> a
-    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 -> a
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap.reference2BooleanEntrySet():49 -> a
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297 -> a
+    boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanFunction.put(java.lang.Object,boolean) -> a
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> b
+    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 -> b
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap.reference2BooleanEntrySet():49 -> b
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297 -> b
+    boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanFunction.removeBoolean(java.lang.Object) -> c
     1:1:boolean containsValue(java.lang.Object):62:62 -> containsValue
     1:1:java.util.Set entrySet():42:42 -> entrySet
     1:3:boolean equals(java.lang.Object):320:322 -> equals
     4:4:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap.size():384:384 -> equals
     4:4:boolean equals(java.lang.Object):322 -> equals
     5:5:boolean equals(java.lang.Object):323:323 -> equals
-    1:13:void putAll(java.util.Map):82:94 -> putAll
-    14:15:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanFunction.put(java.lang.Object,java.lang.Boolean):123:124 -> putAll
-    14:15:void putAll(java.util.Map):94 -> putAll
+    1:1:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanFunction.get(java.lang.Object):108:108 -> get
+    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: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
+    2:4:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanFunction.put(java.lang.Object,java.lang.Boolean):0 -> put
+    2:4:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanFunction.put(java.lang.Object,java.lang.Object):41 -> put
+    2:4:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanFunction.put(java.lang.Object,java.lang.Object):0 -> put
+    1:7:void putAll(java.util.Map):82:88 -> putAll
+    8:8:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry.getBooleanValue():442:442 -> putAll
+    8:8:void putAll(java.util.Map):88 -> putAll
+    9:15:void putAll(java.util.Map):88:94 -> putAll
+    16:17:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanFunction.put(java.lang.Object,java.lang.Boolean):123:124 -> putAll
+    16:17:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanFunction.put(java.lang.Object,java.lang.Boolean):0 -> putAll
+    16:17:void putAll(java.util.Map):94 -> putAll
+    1:3:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanFunction.remove(java.lang.Object):140:142 -> remove
+    1:3:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanFunction.remove(java.lang.Object):0 -> remove
+    1:3:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanFunction.remove(java.lang.Object):41 -> remove
+    1:3:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanFunction.remove(java.lang.Object):0 -> remove
     1:3:java.lang.String toString():328:330 -> toString
     4:4:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap.size():384:384 -> toString
     4:4:java.lang.String toString():330 -> toString
-    5:16:java.lang.String toString():333:344 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanMap$BasicEntry -> com.android.tools.r8.internal.B0:
-    java.lang.Object key -> a
-    boolean value -> b
-    1:3:void <init>(java.lang.Object,boolean):121:123 -> <init>
-    1:4:boolean equals(java.lang.Object):167:170 -> equals
-    1:1:boolean getBooleanValue():145:145 -> getBooleanValue
-    1:1:java.lang.Object getKey():128:128 -> getKey
-    1:1:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanMap$BasicEntry.getValue():140:140 -> getValue
-    1:1:java.lang.Object getValue():112 -> getValue
-    1:1:int hashCode():175:175 -> hashCode
-    1:1:java.lang.Object setValue(java.lang.Object):112:112 -> setValue
-    2:2:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanMap$BasicEntry.setValue(java.lang.Boolean):162:162 -> setValue
-    2:2:java.lang.Object setValue(java.lang.Object):112 -> setValue
-    3:3:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanMap$BasicEntry.setValue(boolean):150:150 -> setValue
-    3:3:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanMap$BasicEntry.setValue(java.lang.Boolean):162 -> setValue
-    3:3:java.lang.Object setValue(java.lang.Object):112 -> setValue
-    1:1:java.lang.String toString():180:180 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntMap -> com.android.tools.r8.internal.E0:
+    5:12:java.lang.String toString():333:340 -> toString
+    13:13:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry.getBooleanValue():442:442 -> toString
+    13:13:java.lang.String toString():341 -> toString
+    14:17:java.lang.String toString():341:344 -> toString
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntMap -> com.android.tools.r8.internal.D0:
     int com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.defRetValue -> a
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.<init>():44:44 -> <init>
     1:1:void <init>():45 -> <init>
     int com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.put(java.lang.Object,int) -> a
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> a
-    int com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.removeInt(java.lang.Object) -> c
+    int com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.removeInt(java.lang.Object) -> b
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> b
     1:1:boolean containsValue(java.lang.Object):62:62 -> containsValue
     boolean containsValue(int) -> d
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.defaultReturnValue(int):55:55 -> e
@@ -53725,7 +53935,7 @@
     1:3:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.remove(java.lang.Object):41 -> remove
     1:3:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.remove(java.lang.Object):0 -> remove
     1:17:java.lang.String toString():328:344 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntMap$BasicEntry -> com.android.tools.r8.internal.D0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntMap$BasicEntry -> com.android.tools.r8.internal.C0:
     java.lang.Object key -> a
     int value -> b
     1:3:void <init>(java.lang.Object,int):121:123 -> <init>
@@ -53742,29 +53952,29 @@
     3:3:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntMap$BasicEntry.setValue(java.lang.Integer):162 -> setValue
     3:3:java.lang.Object setValue(java.lang.Object):112 -> setValue
     1:1:java.lang.String toString():180:180 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntSortedMap -> com.android.tools.r8.internal.F0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntSortedMap -> com.android.tools.r8.internal.E0:
     1:1:void <init>():34:34 -> <init>
-    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 -> a
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():31 -> a
-    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 -> a
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntSortedMap.entrySet():229 -> a
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():31 -> a
+    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 -> b
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():31 -> b
+    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 -> b
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntSortedMap.entrySet():229 -> b
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():31 -> b
     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 -> entrySet
     1:1:java.util.Set entrySet():31 -> entrySet
     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
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongMap -> com.android.tools.r8.internal.G0:
+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>
     boolean containsValue(long) -> a
     long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.put(java.lang.Object,long) -> a
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> a
-    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 -> a
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.reference2LongEntrySet():49 -> a
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297 -> a
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> b
+    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 -> b
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.reference2LongEntrySet():49 -> b
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297 -> b
+    long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.removeLong(java.lang.Object) -> c
     1:1:boolean containsValue(java.lang.Object):62:62 -> containsValue
-    long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.removeLong(java.lang.Object) -> d
     1:1:java.util.Set entrySet():42:42 -> entrySet
     1:3:boolean equals(java.lang.Object):320:322 -> equals
     4:4:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.size():429:429 -> equals
@@ -53798,11 +54008,11 @@
     13:13:long com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntry.getLongValue():487:487 -> toString
     13:13:java.lang.String toString():341 -> toString
     14:17:java.lang.String toString():341:344 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceCollection -> com.android.tools.r8.internal.H0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceCollection -> com.android.tools.r8.internal.G0:
     1:1:void <init>():37:37 -> <init>
     1:1:java.util.Iterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$3.iterator():1384:1384 -> iterator
     1:15:java.lang.String toString():61:75 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceList -> com.android.tools.r8.internal.K0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceList -> com.android.tools.r8.internal.J0:
     1:1:void <init>():34:34 -> <init>
     void removeElements(int,int) -> a
     1:5:boolean addAll(int,java.util.Collection):121:125 -> addAll
@@ -53842,7 +54052,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceList.iterator():181 -> toString
     2:2:java.lang.String toString():462 -> toString
     3:15:java.lang.String toString():463:475 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceList$ReferenceSubList -> com.android.tools.r8.internal.J0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceList$ReferenceSubList -> com.android.tools.r8.internal.I0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceList l -> b
     int to -> d
     boolean $assertionsDisabled -> a
@@ -53873,8 +54083,9 @@
     1:2:java.lang.Object set(int,java.lang.Object):539:540 -> set
     1:1:int size():545:545 -> size
     1:1:java.util.List subList(int,int):479:479 -> subList
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceList$ReferenceSubList$1 -> com.android.tools.r8.internal.I0:
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceList$ReferenceSubList this$0 -> d
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceList$ReferenceSubList$1 -> com.android.tools.r8.internal.H0:
+    int val$index -> d
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceList$ReferenceSubList this$0 -> e
     boolean $assertionsDisabled -> a
     int pos -> b
     int last -> c
@@ -53889,26 +54100,26 @@
     1:1:int previousIndex():601:601 -> previousIndex
     1:11:void remove():617:617 -> remove
     1:3:void set(java.lang.Object):612:612 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceSet -> com.android.tools.r8.internal.L0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceSet -> com.android.tools.r8.internal.K0:
     1:1:void <init>():32:32 -> <init>
     1:4:boolean equals(java.lang.Object):41:44 -> equals
     1:7:int hashCode():57:63 -> hashCode
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceSortedSet -> com.android.tools.r8.internal.M0:
+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.dt:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap -> com.android.tools.r8.internal.Vr:
     java.lang.Object[] key -> a
     boolean[] value -> b
     int size -> c
     1:3:void <init>():70:72 -> <init>
     1:1:int access$000(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap):37:37 -> a
     2:2:int access$300(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap,java.lang.Object):37:37 -> a
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap.object2BooleanEntrySet():231:231 -> a
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2BooleanEntrySet():37 -> a
-    4:5:boolean containsValue(boolean):270:271 -> a
-    6:24:boolean put(java.lang.Object,boolean):283:301 -> a
+    3:4:boolean containsValue(boolean):270:271 -> a
+    5:23:boolean put(java.lang.Object,boolean):283:301 -> a
     1:1:int access$010(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap):37:37 -> b
-    2:4:boolean getBoolean(java.lang.Object):244:246 -> b
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap.object2BooleanEntrySet():231:231 -> b
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2BooleanEntrySet():37 -> b
     1:1:java.lang.Object[] access$100(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap):37:37 -> c
+    2:9:boolean removeBoolean(java.lang.Object):308:315 -> c
     1:4:void clear():257:260 -> clear
     1:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap.clone():344:349 -> clone
     1:6:java.lang.Object clone():37 -> clone
@@ -53916,16 +54127,16 @@
     7:7:java.lang.Object clone():37 -> clone
     1:1:boolean containsKey(java.lang.Object):265:265 -> containsKey
     1:1:boolean[] access$200(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap):37:37 -> d
-    2:9:boolean removeBoolean(java.lang.Object):308:315 -> d
-    1:3:int findKey(java.lang.Object):235:237 -> e
+    2:4:int findKey(java.lang.Object):235:237 -> d
+    1:3:boolean getBoolean(java.lang.Object):244:246 -> e
     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.bt:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet -> com.android.tools.r8.internal.dt$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$1 -> com.android.tools.r8.internal.Tr:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet -> com.android.tools.r8.internal.Vr$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>
@@ -53935,7 +54146,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.ct:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet$1 -> com.android.tools.r8.internal.Ur:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet this$1 -> c
     int next -> b
     int curr -> a
@@ -53944,9 +54155,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.et:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$Entry -> com.android.tools.r8.internal.et$a:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap -> com.android.tools.r8.internal.ht:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap -> com.android.tools.r8.internal.Wr:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$Entry -> com.android.tools.r8.internal.Wr$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap -> com.android.tools.r8.internal.Zr:
     java.lang.Object[] key -> b
     int[] value -> c
     int size -> d
@@ -53958,8 +54169,9 @@
     3:6:int getInt(java.lang.Object):244:247 -> a
     7:26:int put(java.lang.Object,int):283:302 -> a
     1:1:int access$010(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap):37:37 -> b
+    2:9:int removeInt(java.lang.Object):308:315 -> b
     1:1:java.lang.Object[] access$100(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap):37:37 -> c
-    2:9:int removeInt(java.lang.Object):308:315 -> c
+    2:4:int findKey(java.lang.Object):235:237 -> c
     1:4:void clear():257:260 -> clear
     1:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap.clone():344:349 -> clone
     1:6:java.lang.Object clone():37 -> clone
@@ -53967,8 +54179,7 @@
     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.Object2IntArrayMap):37:37 -> d
-    2:4:int findKey(java.lang.Object):235:237 -> d
-    5:6:boolean containsValue(int):270:271 -> 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 -> h
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2IntEntrySet():37 -> h
     1:1:boolean isEmpty():277:277 -> isEmpty
@@ -53976,8 +54187,8 @@
     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.ft:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet -> com.android.tools.r8.internal.ht$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$1 -> com.android.tools.r8.internal.Xr:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet -> com.android.tools.r8.internal.Zr$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>
@@ -53987,7 +54198,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.gt:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.Yr:
     int next -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet this$1 -> c
     int curr -> a
@@ -53996,10 +54207,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.it:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntFunction -> com.android.tools.r8.internal.as:
     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.kt:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap -> com.android.tools.r8.internal.cs:
     java.lang.Object[] key -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> n
     int maxFill -> j
@@ -54024,8 +54235,8 @@
     3:27:int put(java.lang.Object,int):338 -> a
     28:30:int put(java.lang.Object,int):339:341 -> a
     31:41:int getInt(java.lang.Object):721:731 -> a
-    1:12:int removeInt(java.lang.Object):431:442 -> c
-    13:36:void fixPointers(int,int):937:960 -> c
+    1:12:int removeInt(java.lang.Object):431:442 -> b
+    1:24:void fixPointers(int,int):937:960 -> c
     1:5:void clear():771:775 -> clear
     1:11:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.clone():1768:1778 -> clone
     1:11:java.lang.Object clone():87 -> clone
@@ -54033,10 +54244,10 @@
     12:12:java.lang.Object clone():87 -> clone
     1:11:boolean containsKey(java.lang.Object):738:748 -> containsKey
     1:5:boolean containsValue(int):754:758 -> d
-    1:6:int removeNullEntry():285:290 -> f
-    7:31:void fixPointers(int):899:923 -> f
+    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
+    1:6:int removeNullEntry():285:290 -> g
+    7:48: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
@@ -54072,14 +54283,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.jt:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$1 -> com.android.tools.r8.internal.bs:
     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:void clear():1614:1614 -> clear
     1:1:boolean contains(int):1609:1609 -> d
     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.kt$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.cs$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>
@@ -54094,14 +54305,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.kt$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.cs$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.kt$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.cs$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>
@@ -54121,7 +54332,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.kt$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.cs$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>
@@ -54140,7 +54351,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.kt$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.cs$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>
@@ -54162,7 +54373,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.kt$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.cs$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> e
     int index -> d
     int next -> b
@@ -54171,7 +54382,7 @@
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$1):1032:1032 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1057:1057 -> <init>
     3:24:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1038:1059 -> <init>
-    1:14:void ensureIndexKnown():1099:1112 -> f
+    1:14:void ensureIndexKnown():1099:1112 -> e
     1:1:boolean hasNext():1091:1091 -> hasNext
     1:1:boolean hasPrevious():1095:1095 -> hasPrevious
     1:6:int nextEntry():1127:1127 -> k
@@ -54180,7 +54391,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.kt$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.cs$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
@@ -54195,11 +54406,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.nt:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap -> com.android.tools.r8.internal.fs:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2IntEntrySet() -> h
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry -> com.android.tools.r8.internal.lt:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet -> com.android.tools.r8.internal.mt:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap -> com.android.tools.r8.internal.pt:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry -> com.android.tools.r8.internal.ds:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet -> com.android.tools.r8.internal.es:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap -> com.android.tools.r8.internal.hs:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet keys -> j
     java.lang.Object[] key -> b
     int[] value -> c
@@ -54219,7 +54430,7 @@
     3:18:int put(java.lang.Object,int):270 -> a
     19:21:int put(java.lang.Object,int):271:273 -> a
     22:32:int getInt(java.lang.Object):371:381 -> a
-    1:12:int removeInt(java.lang.Object):353:364 -> c
+    1:12:int removeInt(java.lang.Object):353:364 -> b
     1:4:void clear():421:424 -> clear
     1:10:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.clone():999:1008 -> clone
     1:10:java.lang.Object clone():49 -> clone
@@ -54227,17 +54438,17 @@
     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:5:int removeNullEntry():227:231 -> f
-    6:12:void rehash(int):961:967 -> f
-    13:13:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.realSize():205:205 -> f
-    13:13:void rehash(int):968 -> f
-    14:26:void rehash(int):969:981 -> f
+    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: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:20:int removeNullEntry():227:231 -> g
     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 -> h
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2IntEntrySet():49 -> h
     1:1:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.realSize():205:205 -> hashCode
@@ -54257,14 +54468,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.ot:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$1 -> com.android.tools.r8.internal.gs:
     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:void clear():866:866 -> clear
     1:1:boolean contains(int):861:861 -> d
     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.pt$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.hs$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>
@@ -54272,11 +54483,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.pt$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$KeyIterator -> com.android.tools.r8.internal.hs$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.pt$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.hs$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>
@@ -54285,7 +54496,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.pt$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.hs$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>
@@ -54304,7 +54515,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.pt$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.hs$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>
@@ -54313,7 +54524,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.pt$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapIterator -> com.android.tools.r8.internal.hs$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
@@ -54321,7 +54532,7 @@
     boolean mustReturnNullKey -> d
     1:24:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):541:564 -> <init>
     25:25:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$1):541:541 -> <init>
-    1:19:int nextEntry():576:576 -> f
+    1:19:int nextEntry():576:576 -> e
     1:1:boolean hasNext():572:572 -> hasNext
     1:5:void remove():630:634 -> remove
     6:11:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapIterator.shiftKeys(int):608:613 -> remove
@@ -54331,17 +54542,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.pt$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.hs$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 -> l
     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.qt:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap -> com.android.tools.r8.internal.rt:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$Entry -> com.android.tools.r8.internal.rt$a:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$FastEntrySet -> com.android.tools.r8.internal.st:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap -> com.android.tools.r8.internal.ut:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.is:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap -> com.android.tools.r8.internal.js:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$Entry -> com.android.tools.r8.internal.js$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$FastEntrySet -> com.android.tools.r8.internal.ks:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap -> com.android.tools.r8.internal.ms:
     java.lang.Object[] key -> a
     long[] value -> b
     int maxFill -> f
@@ -54362,25 +54573,25 @@
     3:18:long put(java.lang.Object,long):270 -> a
     19:20:long put(java.lang.Object,long):272:273 -> a
     21:25:boolean containsValue(long):404:408 -> a
+    1:12:long removeLong(java.lang.Object):353:364 -> c
     1:4:void clear():421:424 -> clear
     1:10:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.clone():999:1008 -> clone
     1:10:java.lang.Object clone():49 -> clone
     11:11:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.clone():1001:1001 -> clone
     11:11:java.lang.Object clone():49 -> clone
     1:11:boolean containsKey(java.lang.Object):388:398 -> containsKey
-    1:12:long removeLong(java.lang.Object):353:364 -> d
-    13:19:void rehash(int):961:967 -> d
-    20:20:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.realSize():205:205 -> d
-    20:20:void rehash(int):968 -> d
-    21:33:void rehash(int):969:981 -> d
+    1:7:void rehash(int):961:967 -> d
+    8:8:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.realSize():205:205 -> d
+    8:8:void rehash(int):968 -> d
+    9:21:void rehash(int):969:981 -> d
     1:2:long removeEntry(int):219:220 -> e
     3:8:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.shiftKeys(int):333:338 -> e
     3:8:long removeEntry(int):221 -> e
     9:9:long removeEntry(int):222:222 -> e
     10:15:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.shiftKeys(int):341:346 -> e
     10:15:long removeEntry(int):221 -> e
-    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 -> f
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2LongEntrySet():49 -> f
+    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 -> g
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2LongEntrySet():49 -> g
     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
@@ -54400,14 +54611,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.tt:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$1 -> com.android.tools.r8.internal.ls:
     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.ut$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$EntryIterator -> com.android.tools.r8.internal.ms$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>
@@ -54415,11 +54626,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.ut$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$KeyIterator -> com.android.tools.r8.internal.ms$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.ut$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$KeySet -> com.android.tools.r8.internal.ms$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>
@@ -54428,7 +54639,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.ut$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntry -> com.android.tools.r8.internal.ms$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>
@@ -54447,7 +54658,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.ut$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.ms$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>
@@ -54456,7 +54667,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.ut$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapIterator -> com.android.tools.r8.internal.ms$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
@@ -54464,7 +54675,7 @@
     boolean mustReturnNullKey -> d
     1:24:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):541:564 -> <init>
     25:25:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$1):541:541 -> <init>
-    1:19:int nextEntry():576:576 -> f
+    1:19:int nextEntry():576:576 -> e
     1:1:boolean hasNext():572:572 -> hasNext
     1:5:void remove():630:634 -> remove
     6:11:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapIterator.shiftKeys(int):608:613 -> remove
@@ -54474,13 +54685,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.ut$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$ValueIterator -> com.android.tools.r8.internal.ms$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.wt:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap -> com.android.tools.r8.internal.os:
     java.lang.Object[] value -> b
     int maxFill -> j
     java.lang.Object[] key -> a
@@ -54501,7 +54712,7 @@
     61:61:void <init>(int,float,com.android.tools.r8.it.unimi.dsi.fastutil.Hash$Strategy):151:151 -> <init>
     1:1:java.lang.Object access$200(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):85:85 -> a
     2:2:java.lang.Object access$300(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap,int):85:85 -> a
-    3:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap$FastSortedEntrySet object2ObjectEntrySet():1379:1380 -> a
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap$FastSortedEntrySet object2ObjectEntrySet():1379:1380 -> b
     1:24:void fixPointers(int,int):894:917 -> c
     1:6:void clear():751:756 -> clear
     1:12:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap.clone():1701:1712 -> clone
@@ -54518,8 +54729,8 @@
     12:12:java.lang.Object removeEntry(int):310:310 -> f
     13:19:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap.shiftKeys(int):396:402 -> f
     13:19:java.lang.Object removeEntry(int):309 -> f
-    20:26:java.lang.Object removeNullEntry():315:321 -> f
     1:3:java.lang.Object firstKey():927:927 -> firstKey
+    1:7:java.lang.Object removeNullEntry():315:321 -> g
     1:11:java.lang.Object get(java.lang.Object):701:711 -> get
     1:1:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap.realSize():291:291 -> hashCode
     1:1:int hashCode():1729 -> hashCode
@@ -54550,14 +54761,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.vt:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$1 -> com.android.tools.r8.internal.ns:
     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.wt$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$EntryIterator -> com.android.tools.r8.internal.os$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>
@@ -54572,14 +54783,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.wt$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeyIterator -> com.android.tools.r8.internal.os$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.wt$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeySet -> com.android.tools.r8.internal.os$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>
@@ -54599,7 +54810,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.wt$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntry -> com.android.tools.r8.internal.os$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>
@@ -54609,7 +54820,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.wt$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntrySet -> com.android.tools.r8.internal.os$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>
@@ -54631,7 +54842,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.wt$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapIterator -> com.android.tools.r8.internal.os$f:
     int index -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> e
     int next -> b
@@ -54640,7 +54851,7 @@
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$1):989:989 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1014:1014 -> <init>
     3:24:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):995:1016 -> <init>
-    1:14:void ensureIndexKnown():1056:1069 -> f
+    1:14:void ensureIndexKnown():1056:1069 -> e
     1:1:boolean hasNext():1048:1048 -> hasNext
     1:1:boolean hasPrevious():1052:1052 -> hasPrevious
     1:6:int nextEntry():1084:1084 -> k
@@ -54649,30 +54860,30 @@
     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.wt$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$ValueIterator -> com.android.tools.r8.internal.os$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.yt:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry -> com.android.tools.r8.internal.xt:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.zt:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap -> com.android.tools.r8.internal.Bt:
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keys -> l
-    java.lang.Object[] value -> b
-    int size -> j
-    java.lang.Object[] key -> a
-    int n -> h
-    int maxFill -> i
-    int last -> f
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap$FastSortedEntrySet entries -> k
-    int first -> e
-    long[] link -> g
-    int mask -> c
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> m
-    boolean containsNullKey -> d
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap -> com.android.tools.r8.internal.qs:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry -> com.android.tools.r8.internal.ps:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.rs:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap -> com.android.tools.r8.internal.ts:
+    java.lang.Object[] key -> b
+    java.lang.Object[] value -> c
+    int maxFill -> j
+    int size -> k
+    int n -> i
+    int first -> f
+    int last -> g
+    int mask -> d
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap$FastSortedEntrySet entries -> l
+    long[] link -> h
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> n
+    boolean containsNullKey -> e
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keys -> m
     1:1:void <init>(int,float):145:145 -> <init>
     2:56:void <init>(int,float):100:154 -> <init>
     57:57:void <init>(int,float):147:147 -> <init>
@@ -54681,6 +54892,9 @@
     2:2:java.lang.Object access$300(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap,int):85:85 -> a
     3:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap$FastSortedEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.object2ReferenceEntrySet():1348:1349 -> a
     3:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2ReferenceEntrySet():85 -> a
+    5:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap$FastSortedEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.object2ReferenceEntrySet():1348:1349 -> a
+    5:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet object2ReferenceEntrySet():85 -> a
+    1:7:java.lang.Object removeNullEntry():284:290 -> b
     1:24:void fixPointers(int,int):863:886 -> c
     1:6:void clear():720:725 -> clear
     1:11:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.clone():1670:1680 -> clone
@@ -54697,21 +54911,20 @@
     12:12:java.lang.Object removeEntry(int):279:279 -> f
     13:19:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.shiftKeys(int):365:371 -> f
     13:19:java.lang.Object removeEntry(int):278 -> f
-    20:26:java.lang.Object removeNullEntry():284:290 -> f
     1:3:java.lang.Object firstKey():896:896 -> firstKey
     1:11:java.lang.Object get(java.lang.Object):670:680 -> get
     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 com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.headMap(java.lang.Object):928:928 -> headMap
-    1:1:java.util.SortedMap headMap(java.lang.Object):85 -> headMap
+    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:1:boolean isEmpty():735:735 -> isEmpty
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.keySet():1457:1458 -> keySet
-    1:2:java.util.Set keySet():85 -> keySet
+    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
     1:25:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.insert(java.lang.Object,java.lang.Object):307:331 -> put
     1:25:java.lang.Object put(java.lang.Object,java.lang.Object):338 -> put
-    26:27:java.lang.Object put(java.lang.Object,java.lang.Object):340:341 -> put
+    26:28:java.lang.Object put(java.lang.Object,java.lang.Object):339:341 -> put
     1:1:void putAll(java.util.Map):296:296 -> putAll
     2:3:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.ensureCapacity(int):264:265 -> putAll
     2:3:void putAll(java.util.Map):296 -> putAll
@@ -54723,20 +54936,21 @@
     8:8:void putAll(java.util.Map):301:301 -> putAll
     1:12:java.lang.Object remove(java.lang.Object):378:389 -> remove
     1:1:int size():730:730 -> size
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.subMap(java.lang.Object,java.lang.Object):938:938 -> subMap
-    1:1:java.util.SortedMap subMap(java.lang.Object,java.lang.Object):85 -> subMap
-    1:1: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
-    1:1:java.util.SortedMap tailMap(java.lang.Object):85 -> tailMap
-    1:1:java.util.Collection values():85:85 -> values
-    2:23: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.At:
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap subMap(java.lang.Object,java.lang.Object):938:938 -> subMap
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.subMap(java.lang.Object,java.lang.Object):938:938 -> subMap
+    2:2:java.util.SortedMap subMap(java.lang.Object,java.lang.Object):85 -> subMap
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap tailMap(java.lang.Object):918:918 -> tailMap
+    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.ss:
     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.Bt$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.ts$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>
@@ -54751,14 +54965,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.Bt$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.ts$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.Bt$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.ts$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>
@@ -54778,7 +54992,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.Bt$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.ts$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>
@@ -54788,7 +55002,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.Bt$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.ts$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>
@@ -54810,7 +55024,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.Bt$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.ts$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> e
     int index -> d
     int next -> b
@@ -54819,7 +55033,7 @@
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$1):958:958 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):983:983 -> <init>
     3:24:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):964:985 -> <init>
-    1:14:void ensureIndexKnown():1025:1038 -> f
+    1:14:void ensureIndexKnown():1025:1038 -> e
     1:1:boolean hasNext():1017:1017 -> hasNext
     1:1:boolean hasPrevious():1021:1021 -> hasPrevious
     1:6:int nextEntry():1053:1053 -> k
@@ -54828,17 +55042,386 @@
     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.Bt$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.ts$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.Dt:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry -> com.android.tools.r8.internal.Ct:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.Et:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList -> com.android.tools.r8.internal.Kt:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap -> com.android.tools.r8.internal.vs:
+    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.us:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap -> com.android.tools.r8.internal.As:
+    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
+    boolean modified -> i
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry tree -> b
+    java.util.Comparator storedComparator -> j
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> f
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry firstEntry -> d
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry lastEntry -> e
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry[] nodePath -> m
+    int count -> c
+    boolean[] dirPath -> l
+    1:1:void <init>():81:81 -> <init>
+    2:10:void <init>():75:83 -> <init>
+    11:13:void <init>(java.util.Comparator):108:110 -> <init>
+    1:77:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet object2ReferenceEntrySet():1116:1192 -> a
+    1:1:int compare(java.lang.Object,java.lang.Object):220:220 -> b
+    2:3:void allocatePaths():268:269 -> b
+    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry findKey(java.lang.Object):233:235 -> c
+    4:4:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap.compare(java.lang.Object,java.lang.Object):220:220 -> c
+    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry findKey(java.lang.Object):235 -> c
+    5:5:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry findKey(java.lang.Object):236:236 -> c
+    1:6:void clear():666:671 -> clear
+    1:7:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap.clone():1850:1856 -> clone
+    1:7:java.lang.Object clone():43 -> clone
+    8:9:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap.allocatePaths():268:269 -> clone
+    8:9:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap.clone():1857 -> clone
+    8:9:java.lang.Object clone():43 -> clone
+    10:21:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap.clone():1858:1869 -> clone
+    10:21:java.lang.Object clone():43 -> clone
+    22:23:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry.succ(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry):802:803 -> clone
+    22:23:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap.clone():1870 -> clone
+    22:23:java.lang.Object clone():43 -> clone
+    24:25:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry.left(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry):813:814 -> clone
+    24:25:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap.clone():1871 -> clone
+    24:25:java.lang.Object clone():43 -> clone
+    26:49:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap.clone():1872:1895 -> clone
+    26:49:java.lang.Object clone():43 -> clone
+    50:51:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry.pred(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry):791:792 -> clone
+    50:51:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap.clone():1896 -> clone
+    50:51:java.lang.Object clone():43 -> clone
+    52:53:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry.right(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry):824:825 -> clone
+    52:53:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap.clone():1897 -> clone
+    52:53:java.lang.Object clone():43 -> clone
+    54:54:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap.clone():1852:1852 -> clone
+    54:54:java.lang.Object clone():43 -> clone
+    1:1:java.util.Comparator comparator():1337:1337 -> comparator
+    1:1:boolean containsKey(java.lang.Object):934:934 -> containsKey
+    1:3:boolean containsValue(java.lang.Object):654:656 -> containsValue
+    4:4:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$ValueIterator.next():1278:1278 -> containsValue
+    4:4:boolean containsValue(java.lang.Object):658 -> containsValue
+    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry locateKey(java.lang.Object):250:252 -> d
+    4:4:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap.compare(java.lang.Object,java.lang.Object):220:220 -> d
+    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry locateKey(java.lang.Object):252 -> d
+    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:1:void setActualComparator():98:98 -> g
+    1:2:java.lang.Object get(java.lang.Object):950:951 -> get
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap headMap(java.lang.Object):1342:1342 -> headMap
+    1:1:boolean isEmpty():944:944 -> isEmpty
+    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
+    1:11:java.lang.Object put(java.lang.Object,java.lang.Object):274 -> put
+    12:12:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap.compare(java.lang.Object,java.lang.Object):220:220 -> put
+    12:12: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):306 -> put
+    12:12:java.lang.Object put(java.lang.Object,java.lang.Object):274 -> put
+    13:23: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):310:320 -> put
+    13:23:java.lang.Object put(java.lang.Object,java.lang.Object):274 -> put
+    24:25:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry.right(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry):824:825 -> put
+    24:25: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):321 -> put
+    24:25:java.lang.Object put(java.lang.Object,java.lang.Object):274 -> put
+    26:33: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):324:331 -> put
+    26:33:java.lang.Object put(java.lang.Object,java.lang.Object):274 -> put
+    34:35:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry.left(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry):813:814 -> put
+    34:35: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):332 -> put
+    34:35:java.lang.Object put(java.lang.Object,java.lang.Object):274 -> put
+    36:56: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):338:358 -> put
+    36:56:java.lang.Object put(java.lang.Object,java.lang.Object):274 -> put
+    57:58:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry.succ(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry):802:803 -> put
+    57:58: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):359 -> put
+    57:58:java.lang.Object put(java.lang.Object,java.lang.Object):274 -> put
+    59:70: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):362:373 -> put
+    59:70:java.lang.Object put(java.lang.Object,java.lang.Object):274 -> put
+    71:72:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry.pred(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry):791:792 -> put
+    71:72: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):374 -> put
+    71:72:java.lang.Object put(java.lang.Object,java.lang.Object):274 -> put
+    73:89: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):379:395 -> put
+    73:89:java.lang.Object put(java.lang.Object,java.lang.Object):274 -> put
+    90:91:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry.pred(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry):791:792 -> put
+    90:91: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):396 -> put
+    90:91:java.lang.Object put(java.lang.Object,java.lang.Object):274 -> put
+    92:103: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):399:410 -> put
+    92:103:java.lang.Object put(java.lang.Object,java.lang.Object):274 -> put
+    104:105:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry.succ(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry):802:803 -> put
+    104:105: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):411 -> put
+    104:105:java.lang.Object put(java.lang.Object,java.lang.Object):274 -> put
+    106:109: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):418:421 -> put
+    106:109:java.lang.Object put(java.lang.Object,java.lang.Object):274 -> put
+    110:111:java.lang.Object put(java.lang.Object,java.lang.Object):275:276 -> put
+    112:112: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):335:335 -> put
+    112:112:java.lang.Object put(java.lang.Object,java.lang.Object):274 -> put
+    1:8:java.lang.Object remove(java.lang.Object):436:443 -> remove
+    9:9:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap.compare(java.lang.Object,java.lang.Object):220:220 -> remove
+    9:9:java.lang.Object remove(java.lang.Object):443 -> remove
+    10:56:java.lang.Object remove(java.lang.Object):464:510 -> remove
+    57:58:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry.pred(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry):791:792 -> remove
+    57:58:java.lang.Object remove(java.lang.Object):510 -> remove
+    59:116:java.lang.Object remove(java.lang.Object):511:568 -> remove
+    117:118:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry.pred(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry):791:792 -> remove
+    117:118:java.lang.Object remove(java.lang.Object):568 -> remove
+    119:131:java.lang.Object remove(java.lang.Object):571:583 -> remove
+    132:133:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry.succ(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry):802:803 -> remove
+    132:133:java.lang.Object remove(java.lang.Object):583 -> remove
+    134:194:java.lang.Object remove(java.lang.Object):557:617 -> remove
+    195:196:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry.succ(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry):802:803 -> remove
+    195:196:java.lang.Object remove(java.lang.Object):617 -> remove
+    197:209:java.lang.Object remove(java.lang.Object):620:632 -> remove
+    210:211:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry.pred(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry):791:792 -> remove
+    210:211:java.lang.Object remove(java.lang.Object):632 -> remove
+    212:255:java.lang.Object remove(java.lang.Object):606:649 -> remove
+    256:272:java.lang.Object remove(java.lang.Object):444:460 -> remove
+    1:1:int size():939:939 -> size
+    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.xs:
+    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>
+    1:1:void clear():1164:1164 -> clear
+    1:1:java.util.Comparator comparator():1125:1125 -> comparator
+    1:4:boolean contains(java.lang.Object):1141:1144 -> contains
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1.first():1169:1169 -> first
+    1:1:java.lang.Object first():1116 -> first
+    1:1:java.util.SortedSet headSet(java.lang.Object):1116:1116 -> headSet
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1.headSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1184:1184 -> headSet
+    2:2:java.util.SortedSet headSet(java.lang.Object):1116 -> headSet
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1130:1130 -> iterator
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1.last():1174:1174 -> last
+    1:1:java.lang.Object last():1116 -> last
+    1:4:boolean remove(java.lang.Object):1150:1153 -> remove
+    1:1:int size():1159:1159 -> size
+    1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):1116:1116 -> subSet
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1.subSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1179:1179 -> subSet
+    2:2:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):1116 -> subSet
+    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.ws:
+    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.ys:
+    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.zs:
+    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
+    1:1:void <init>():707:707 -> <init>
+    2:3:void <init>(java.lang.Object,java.lang.Object):719:720 -> <init>
+    1:2:void left(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry):813:814 -> a
+    3:4:void black(boolean):845:846 -> a
+    1:2:void pred(boolean):768:769 -> b
+    3:4:void pred(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry):791:792 -> b
+    5:5:boolean black():834:834 -> b
+    1:2:void succ(boolean):780:781 -> c
+    3:4:void right(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry):824:825 -> c
+    5:11:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry clone():886:892 -> c
+    12:12:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry clone():888:888 -> c
+    1:1:java.lang.Object clone():685:685 -> clone
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry left():729:729 -> d
+    2:3:void succ(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry):802:803 -> d
+    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry next():855:857 -> e
+    1:3:boolean equals(java.lang.Object):899:901 -> equals
+    1:1:boolean pred():748:748 -> f
+    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry prev():868:870 -> g
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry right():739:739 -> h
+    1:1:int hashCode():906:906 -> hashCode
+    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.As$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
+    2:2:void add(java.lang.Object):1085 -> add
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$EntryIterator.next():1095:1095 -> next
+    1:1:java.lang.Object next():1085 -> next
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$EntryIterator.previous():1100:1100 -> previous
+    1:1:java.lang.Object previous():1085 -> previous
+    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.As$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.As$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.As$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
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> f
+    java.lang.Object from -> b
+    boolean top -> e
+    java.lang.Object to -> c
+    boolean bottom -> d
+    1:7:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap,java.lang.Object,boolean,java.lang.Object,boolean):1397:1403 -> <init>
+    1:79:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet object2ReferenceEntrySet():1428:1506 -> a
+    1:13:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry firstEntry():1638:1650 -> b
+    1:1:boolean in(java.lang.Object):1423:1423 -> c
+    2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap.compare(java.lang.Object,java.lang.Object):220:220 -> c
+    2:2:boolean in(java.lang.Object):1423 -> c
+    3:3:boolean in(java.lang.Object):1423:1423 -> c
+    4:4:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap.compare(java.lang.Object,java.lang.Object):220:220 -> c
+    4:4:boolean in(java.lang.Object):1423 -> c
+    1:4:void clear():1408:1411 -> clear
+    1:1:java.util.Comparator comparator():1607:1607 -> comparator
+    1:1:boolean containsKey(java.lang.Object):1550:1550 -> containsKey
+    2:2:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap.containsKey(java.lang.Object):934:934 -> containsKey
+    2:2:boolean containsKey(java.lang.Object):1550 -> containsKey
+    1:4:boolean containsValue(java.lang.Object):1555:1558 -> containsValue
+    1:3:java.lang.Object firstKey():1679:1681 -> firstKey
+    4:4:java.lang.Object firstKey():1680:1680 -> firstKey
+    1:13:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry lastEntry():1661:1673 -> g
+    1:1:java.lang.Object get(java.lang.Object):1569:1569 -> get
+    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: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
+    2:2: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 -> isEmpty
+    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: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
+    1:4:java.lang.Object put(java.lang.Object,java.lang.Object):1574:1577 -> put
+    1:4:java.lang.Object remove(java.lang.Object):1583:1586 -> remove
+    1:5:int size():1591:1595 -> size
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap subMap(java.lang.Object,java.lang.Object):1624:1625 -> subMap
+    3:3:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap.compare(java.lang.Object,java.lang.Object):220:220 -> subMap
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap subMap(java.lang.Object,java.lang.Object):1625 -> subMap
+    4:5:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap subMap(java.lang.Object,java.lang.Object):1625:1626 -> subMap
+    6:6:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap.compare(java.lang.Object,java.lang.Object):220:220 -> subMap
+    6:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap subMap(java.lang.Object,java.lang.Object):1626 -> subMap
+    7:9:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap subMap(java.lang.Object,java.lang.Object):1626:1628 -> subMap
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap tailMap(java.lang.Object):1618:1619 -> tailMap
+    3:3:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap.compare(java.lang.Object,java.lang.Object):220:220 -> tailMap
+    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.Bs:
+    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
+    1:1:java.util.Comparator comparator():1441:1441 -> comparator
+    1:4:boolean contains(java.lang.Object):1447:1450 -> contains
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$1.first():1483:1483 -> first
+    1:1:java.lang.Object first():1428 -> first
+    1:1:java.util.SortedSet headSet(java.lang.Object):1428:1428 -> headSet
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$1.headSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1498:1498 -> headSet
+    2:2:java.util.SortedSet headSet(java.lang.Object):1428 -> headSet
+    1:1:boolean isEmpty():1473:1473 -> isEmpty
+    2:2: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
+    2:2:boolean isEmpty():1473 -> isEmpty
+    3:3: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
+    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):1703 -> isEmpty
+    3:3:boolean isEmpty():1473 -> isEmpty
+    4:4: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
+    4:4:boolean isEmpty():1473 -> isEmpty
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1431:1431 -> iterator
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$1.last():1488:1488 -> last
+    1:1:java.lang.Object last():1428 -> last
+    1:4:boolean remove(java.lang.Object):1456:1459 -> remove
+    1:1:int size():1466:1466 -> size
+    1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):1428:1428 -> subSet
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$1.subSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1493:1493 -> subSet
+    2:2:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):1428 -> subSet
+    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.Cs:
+    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.As$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.As$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
+    2:2:void add(java.lang.Object):1733 -> add
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapEntryIterator.next():1743:1743 -> next
+    1:1:java.lang.Object next():1733 -> next
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapEntryIterator.previous():1748:1748 -> previous
+    1:1:java.lang.Object previous():1733 -> previous
+    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.As$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.As$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.As$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.As$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
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry curr -> c
+    int index -> d
+    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap):997:997 -> <init>
+    2:5:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap):995:998 -> <init>
+    1:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry nextEntry():1023:1023 -> e
+    1:1:boolean hasNext():1011:1011 -> hasNext
+    1:1:boolean hasPrevious():1015:1015 -> hasPrevious
+    1:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry previousEntry():1035:1035 -> k
+    1:1:void updateNext():1019:1019 -> n
+    1:1:int nextIndex():1043:1043 -> nextIndex
+    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.As$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.Es:
+    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.Ds:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList -> com.android.tools.r8.internal.Ks:
     int size -> b
     1:3:void <init>(int):96:98 -> <init>
     4:4:void <init>(int):97:97 -> <init>
@@ -54861,9 +55444,10 @@
     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.Jt:
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList this$0 -> c
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList$1 -> com.android.tools.r8.internal.Js:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList this$0 -> d
     int last -> b
+    int val$index -> c
     int pos -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList,int):498:499 -> <init>
     1:2:void add(java.lang.Object):528:529 -> add
@@ -54875,7 +55459,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.Mt:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet -> com.android.tools.r8.internal.Ms:
     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
@@ -54895,19 +55479,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.Lt:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet$1 -> com.android.tools.r8.internal.Ls:
     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.Nt:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrays -> com.android.tools.r8.internal.Ns:
     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.Pt:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection -> com.android.tools.r8.internal.Qt:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$EmptyCollection -> com.android.tools.r8.internal.Rt:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator -> com.android.tools.r8.internal.Os:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection -> com.android.tools.r8.internal.Ps:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$EmptyCollection -> com.android.tools.r8.internal.Qs:
     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
@@ -54916,65 +55500,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.St:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators -> com.android.tools.r8.internal.Wt:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator -> com.android.tools.r8.internal.Rs:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators -> com.android.tools.r8.internal.Us:
     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.Tt:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$EmptyIterator -> com.android.tools.r8.internal.Ss:
     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$SingletonIterator -> com.android.tools.r8.internal.Ut:
-    java.lang.Object element -> a
-    int curr -> b
-    1:2:void <init>(java.lang.Object):127:128 -> <init>
-    1:1:boolean hasNext():133:133 -> hasNext
-    1:1:boolean hasPrevious():138:138 -> hasPrevious
-    1:4:java.lang.Object next():143:143 -> next
-    1:1:int nextIndex():157:157 -> nextIndex
-    1:4:java.lang.Object previous():150:150 -> previous
-    1:1:int previousIndex():162:162 -> previousIndex
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$UnmodifiableIterator -> com.android.tools.r8.internal.Vt:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$UnmodifiableIterator -> com.android.tools.r8.internal.Ts:
     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.Xt:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectList -> com.android.tools.r8.internal.Vs:
     void removeElements(int,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator -> com.android.tools.r8.internal.Yt:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet -> com.android.tools.r8.internal.au:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets -> com.android.tools.r8.internal.du:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator -> com.android.tools.r8.internal.Ws:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet -> com.android.tools.r8.internal.Ys:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets -> com.android.tools.r8.internal.at:
     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.bu:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets$EmptySet -> com.android.tools.r8.internal.Zs:
     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.ObjectSets$Singleton -> com.android.tools.r8.internal.cu:
-    java.lang.Object element -> a
-    1:2:void <init>(java.lang.Object):96:97 -> <init>
-    1:1:boolean addAll(java.util.Collection):122:122 -> addAll
-    1:1:boolean contains(java.lang.Object):102:102 -> contains
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets$Singleton.iterator():112:112 -> iterator
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():92 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators.singleton(java.lang.Object):176:176 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets$Singleton.iterator():112 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():92 -> iterator
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets$Singleton.iterator():112:112 -> iterator
-    3:3:java.util.Iterator iterator():92 -> iterator
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators.singleton(java.lang.Object):176:176 -> iterator
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets$Singleton.iterator():112 -> iterator
-    4:4:java.util.Iterator iterator():92 -> iterator
-    1:1:boolean remove(java.lang.Object):107:107 -> remove
-    1:1:boolean removeAll(java.util.Collection):127:127 -> removeAll
-    1:1:boolean retainAll(java.util.Collection):132:132 -> retainAll
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet -> com.android.tools.r8.internal.eu:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets -> com.android.tools.r8.internal.gu:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet -> com.android.tools.r8.internal.bt:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets -> com.android.tools.r8.internal.dt:
     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.fu:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets$EmptySet -> com.android.tools.r8.internal.ct:
     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
@@ -54985,78 +55541,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.Reference2BooleanFunction -> com.android.tools.r8.internal.Ny:
-    boolean put(java.lang.Object,boolean) -> a
-    boolean getBoolean(java.lang.Object) -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap -> com.android.tools.r8.internal.Oy:
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2BooleanEntrySet() -> g
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$Entry -> com.android.tools.r8.internal.Oy$a:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$FastEntrySet -> com.android.tools.r8.internal.Py:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps -> com.android.tools.r8.internal.Sy:
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$EmptyMap EMPTY_MAP -> a
-    1:1:void <clinit>():135:135 -> <clinit>
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap singleton(java.lang.Object,boolean):260:260 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$EmptyMap -> com.android.tools.r8.internal.Qy:
-    1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanFunctions$EmptyFunction.<init>():41:41 -> <init>
-    1:1:void <init>():46 -> <init>
-    boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanFunctions$EmptyFunction.getBoolean(java.lang.Object) -> b
-    void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanFunctions$EmptyFunction.clear() -> clear
-    1:1:java.lang.Object clone():106:106 -> clone
-    boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanFunctions$EmptyFunction.containsKey(java.lang.Object) -> containsKey
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$EmptyMap.reference2BooleanEntrySet():73:73 -> entrySet
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$EmptyMap.entrySet():86 -> entrySet
-    1:1:java.util.Set entrySet():43 -> entrySet
-    1:2:boolean equals(java.lang.Object):121:122 -> equals
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2BooleanEntrySet():73:73 -> g
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keySet():92:92 -> keySet
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$EmptyMap.keySet():92:92 -> keySet
-    2:2:java.util.Set keySet():43 -> keySet
-    1:1:void putAll(java.util.Map):67:67 -> putAll
-    int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanFunctions$EmptyFunction.size() -> size
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$EmptyMap.values():97:97 -> values
-    1:1:java.util.Collection values():43 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$Singleton -> com.android.tools.r8.internal.Ry:
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keys -> d
-    com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection values -> e
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entries -> c
-    java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanFunctions$Singleton.key -> a
-    boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanFunctions$Singleton.value -> b
-    1:3:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanFunctions$Singleton.<init>(java.lang.Object,boolean):123:125 -> <init>
-    1:3:void <init>(java.lang.Object,boolean):164 -> <init>
-    1:1:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanFunctions$Singleton.getBoolean(java.lang.Object):135:135 -> b
-    1:1:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanFunctions$Singleton.getBoolean(java.lang.Object):0 -> b
-    java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanFunctions$Singleton.clone() -> clone
-    1:1:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanFunctions$Singleton.containsKey(java.lang.Object):130:130 -> containsKey
-    1:1:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanFunctions$Singleton.containsKey(java.lang.Object):0 -> containsKey
-    1:1:boolean containsValue(java.lang.Object):180:180 -> containsValue
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$Singleton.entrySet():204:204 -> entrySet
-    1:1:java.util.Set entrySet():157 -> entrySet
-    1:4:boolean equals(java.lang.Object):232:235 -> equals
-    5:5:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$Singleton.entrySet():204:204 -> equals
-    5:5:boolean equals(java.lang.Object):235 -> equals
-    6:6:boolean equals(java.lang.Object):235:235 -> equals
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2BooleanEntrySet():190:190 -> g
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets.singleton(java.lang.Object):151:151 -> g
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2BooleanEntrySet():190 -> g
-    3:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2BooleanEntrySet():190:191 -> g
-    1:1:int hashCode():226:226 -> hashCode
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keySet():209:209 -> keySet
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets.singleton(java.lang.Object):151:151 -> keySet
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keySet():209 -> keySet
-    3:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keySet():209:210 -> keySet
-    5:5:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$Singleton.keySet():209:209 -> keySet
-    5:5:java.util.Set keySet():157 -> keySet
-    6:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets.singleton(java.lang.Object):151:151 -> keySet
-    6:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$Singleton.keySet():209 -> keySet
-    6:6:java.util.Set keySet():157 -> keySet
-    7:8:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$Singleton.keySet():209:210 -> keySet
-    7:8:java.util.Set keySet():157 -> keySet
-    1:1:void putAll(java.util.Map):185:185 -> putAll
-    int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanFunctions$Singleton.size() -> size
-    1:1:java.lang.String toString():240:240 -> toString
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$Singleton.values():215:216 -> values
-    1:2:java.util.Collection values():157 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap -> com.android.tools.r8.internal.Uy:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$Entry -> com.android.tools.r8.internal.Ex:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$FastEntrySet -> com.android.tools.r8.internal.Fx:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap -> com.android.tools.r8.internal.Hx:
     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
@@ -55077,34 +55564,31 @@
     3:18:boolean put(java.lang.Object,boolean):270 -> a
     19:20:boolean put(java.lang.Object,boolean):272:273 -> a
     21:25:boolean containsValue(boolean):359:363 -> a
-    1:11:boolean getBoolean(java.lang.Object):326:336 -> b
+    1:12:boolean removeBoolean(java.lang.Object):308:319 -> c
     1:4:void clear():376:379 -> clear
     1:10:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap.clone():954:963 -> clone
     1:10:java.lang.Object clone():49 -> clone
     11:11:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap.clone():956:956 -> clone
     11:11:java.lang.Object clone():49 -> clone
     1:10:boolean containsKey(java.lang.Object):343:352 -> containsKey
-    1:12:boolean removeBoolean(java.lang.Object):308:319 -> d
-    13:19:void rehash(int):916:922 -> d
-    20:20:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap.realSize():205:205 -> d
-    20:20:void rehash(int):923 -> d
-    21:33:void rehash(int):924:936 -> d
+    1:11:boolean getBoolean(java.lang.Object):326:336 -> d
+    12:18:void rehash(int):916:922 -> d
+    19:19:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap.realSize():205:205 -> d
+    19:19:void rehash(int):923 -> d
+    20:32:void rehash(int):924:936 -> d
     1:2:boolean removeEntry(int):219:220 -> e
     3:8:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap.shiftKeys(int):288:293 -> e
     3:8:boolean removeEntry(int):221 -> e
     9:9:boolean removeEntry(int):222:222 -> e
     10:15:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap.shiftKeys(int):296:301 -> e
     10:15:boolean removeEntry(int):221 -> e
-    1:5:boolean removeNullEntry():227:231 -> f
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap.reference2BooleanEntrySet():716:717 -> g
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2BooleanEntrySet():49 -> g
+    1:5:boolean removeNullEntry():227:231 -> g
     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:1:boolean isEmpty():389:389 -> isEmpty
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keySet():771:772 -> keySet
-    3:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap.keySet():771:772 -> keySet
-    3:4:java.util.Set keySet():49 -> keySet
+    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
     2:3:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap.ensureCapacity(int):209:210 -> putAll
     2:3:void putAll(java.util.Map):237 -> putAll
@@ -55117,14 +55601,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.Ty:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1 -> com.android.tools.r8.internal.Gx:
     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.Uy$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Hx$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>
@@ -55132,11 +55616,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.Uy$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Hx$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.Uy$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeySet -> com.android.tools.r8.internal.Hx$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>
@@ -55145,12 +55629,11 @@
     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.Uy$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry -> com.android.tools.r8.internal.Hx$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>
     1:3:boolean equals(java.lang.Object):479:481 -> equals
-    1:1:boolean getBooleanValue():442:442 -> getBooleanValue
     1:1:java.lang.Object getKey():437:437 -> getKey
     1:1:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry.getValue():461:461 -> getValue
     1:1:java.lang.Object getValue():423 -> getValue
@@ -55164,7 +55647,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.Uy$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Hx$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>
@@ -55173,7 +55656,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.Uy$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapIterator -> com.android.tools.r8.internal.Hx$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
@@ -55181,7 +55664,7 @@
     boolean mustReturnNullKey -> d
     1:24:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):496:519 -> <init>
     25:25:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1):496:496 -> <init>
-    1:19:int nextEntry():531:531 -> f
+    1:19:int nextEntry():531:531 -> e
     1:1:boolean hasNext():527:527 -> hasNext
     1:5:void remove():585:589 -> remove
     6:11:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapIterator.shiftKeys(int):563:568 -> remove
@@ -55191,13 +55674,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.Uy$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Hx$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 -> h
     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.Xy:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap -> com.android.tools.r8.internal.Kx:
     java.lang.Object[] key -> b
     int[] value -> c
     int size -> d
@@ -55207,8 +55690,9 @@
     3:6:int getInt(java.lang.Object):244:247 -> a
     7:26:int put(java.lang.Object,int):283:302 -> a
     1:1:int access$010(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap):37:37 -> b
+    2:9:int removeInt(java.lang.Object):308:315 -> b
     1:1:java.lang.Object[] access$100(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap):37:37 -> c
-    2:9:int removeInt(java.lang.Object):308:315 -> c
+    2:4:int findKey(java.lang.Object):235:237 -> c
     1:4:void clear():257:260 -> clear
     1:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap.clone():344:349 -> clone
     1:6:java.lang.Object clone():37 -> clone
@@ -55216,17 +55700,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: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:5:int findKey(java.lang.Object):235:237 -> d
-    6:7:boolean containsValue(int):270:271 -> 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
     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.Vy:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet -> com.android.tools.r8.internal.Xy$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$1 -> com.android.tools.r8.internal.Ix:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet -> com.android.tools.r8.internal.Kx$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>
@@ -55236,7 +55719,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.Wy:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.Jx:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet this$1 -> c
     int next -> b
     int curr -> a
@@ -55245,11 +55728,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.Yy:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntFunction -> com.android.tools.r8.internal.Lx:
     int getInt(java.lang.Object) -> a
     int put(java.lang.Object,int) -> a
-    int removeInt(java.lang.Object) -> c
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap -> com.android.tools.r8.internal.az:
+    int removeInt(java.lang.Object) -> b
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap -> com.android.tools.r8.internal.Nx:
     java.lang.Object[] key -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> n
     int maxFill -> j
@@ -55274,20 +55757,20 @@
     3:27:int put(java.lang.Object,int):338 -> a
     28:30:int put(java.lang.Object,int):339:341 -> a
     31:41:int getInt(java.lang.Object):721:731 -> a
-    1:12:int removeInt(java.lang.Object):431:442 -> c
-    13:36:void fixPointers(int,int):937:960 -> c
+    1:12:int removeInt(java.lang.Object):431:442 -> b
+    1:24:void fixPointers(int,int):937:960 -> c
     1:5:void clear():771:775 -> clear
     1:11:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.clone():1768:1778 -> clone
     1:11:java.lang.Object clone():87 -> clone
     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:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet():87:87 -> d
-    2:6:boolean containsValue(int):754:758 -> d
+    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:25:void fixPointers(int):899:923 -> f
-    26:27:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSortedSet keySet():1531:1532 -> f
     1:3:java.lang.Object firstKey():970:970 -> firstKey
-    1:42:void rehash(int):1709:1750 -> g
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSortedSet keySet():1531:1532 -> g
+    3:44: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.Reference2IntLinkedOpenHashMap.shiftKeys(int):410:415 -> h
     4:9:int removeEntry(int):279 -> h
@@ -55321,14 +55804,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.Zy:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$1 -> com.android.tools.r8.internal.Mx:
     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:void clear():1614:1614 -> clear
     1:1:boolean contains(int):1609:1609 -> d
     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.az$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Nx$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>
@@ -55343,14 +55826,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.az$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Nx$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.az$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.Nx$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>
@@ -55370,7 +55853,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.az$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.Nx$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>
@@ -55389,7 +55872,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.az$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Nx$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>
@@ -55411,7 +55894,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.az$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.Nx$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> e
     int index -> d
     int next -> b
@@ -55420,7 +55903,7 @@
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$1):1032:1032 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1057:1057 -> <init>
     3:24:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1038:1059 -> <init>
-    1:14:void ensureIndexKnown():1099:1112 -> f
+    1:14:void ensureIndexKnown():1099:1112 -> e
     1:1:boolean hasNext():1091:1091 -> hasNext
     1:1:boolean hasPrevious():1095:1095 -> hasPrevious
     1:6:int nextEntry():1127:1127 -> k
@@ -55429,7 +55912,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.az$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Nx$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
@@ -55444,11 +55927,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.bz:
-    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.bz$a:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet -> com.android.tools.r8.internal.cz:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap -> com.android.tools.r8.internal.ez:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap -> com.android.tools.r8.internal.Ox:
+    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.Ox$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet -> com.android.tools.r8.internal.Px:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap -> com.android.tools.r8.internal.Rx:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet entries -> i
     java.lang.Object[] key -> b
     int[] value -> c
@@ -55470,7 +55953,7 @@
     3:18:int put(java.lang.Object,int):270 -> a
     19:21:int put(java.lang.Object,int):271:273 -> a
     22:32:int getInt(java.lang.Object):371:381 -> a
-    1:12:int removeInt(java.lang.Object):353:364 -> c
+    1:12:int removeInt(java.lang.Object):353:364 -> b
     1:4:void clear():421:424 -> clear
     1:10:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap.clone():999:1008 -> clone
     1:10:java.lang.Object clone():49 -> clone
@@ -55478,19 +55961,19 @@
     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
-    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:5:int removeNullEntry():227:231 -> f
-    6:12:void rehash(int):961:967 -> f
-    13:13:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap.realSize():205:205 -> f
-    13:13:void rehash(int):968 -> f
-    14:26:void rehash(int):969:981 -> f
+    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
+    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
+    9:21: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.Reference2IntOpenHashMap.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.Reference2IntOpenHashMap.shiftKeys(int):341:346 -> g
     10:15:int removeEntry(int):221 -> g
+    16:20:int removeNullEntry():227:231 -> g
     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
@@ -55508,14 +55991,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.dz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1 -> com.android.tools.r8.internal.Qx:
     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:void clear():866:866 -> clear
     1:1:boolean contains(int):861:861 -> d
     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.ez$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Rx$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>
@@ -55523,11 +56006,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.ez$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Rx$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.ez$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.Rx$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>
@@ -55536,7 +56019,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.ez$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.Rx$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>
@@ -55555,7 +56038,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.ez$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Rx$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>
@@ -55564,7 +56047,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.ez$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapIterator -> com.android.tools.r8.internal.Rx$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
@@ -55572,7 +56055,7 @@
     boolean mustReturnNullKey -> d
     1:24:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):541:564 -> <init>
     25:25:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1):541:541 -> <init>
-    1:19:int nextEntry():576:576 -> f
+    1:19:int nextEntry():576:576 -> e
     1:1:boolean hasNext():572:572 -> hasNext
     1:5:void remove():630:634 -> remove
     6:11:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapIterator.shiftKeys(int):608:613 -> remove
@@ -55582,16 +56065,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.ez$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Rx$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 -> l
     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.fz:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$Entry -> com.android.tools.r8.internal.gz:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$FastEntrySet -> com.android.tools.r8.internal.hz:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap -> com.android.tools.r8.internal.jz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.Sx:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$Entry -> com.android.tools.r8.internal.Tx:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$FastEntrySet -> com.android.tools.r8.internal.Ux:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap -> com.android.tools.r8.internal.Wx:
     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
@@ -55611,25 +56094,25 @@
     3:18:long put(java.lang.Object,long):270 -> a
     19:20:long put(java.lang.Object,long):272:273 -> a
     21:25:boolean containsValue(long):404:408 -> a
+    1:12:long removeLong(java.lang.Object):353:364 -> c
     1:4:void clear():421:424 -> clear
     1:10:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.clone():999:1008 -> clone
     1:10:java.lang.Object clone():49 -> clone
     11:11:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.clone():1001:1001 -> clone
     11:11:java.lang.Object clone():49 -> clone
     1:10:boolean containsKey(java.lang.Object):388:397 -> containsKey
-    1:12:long removeLong(java.lang.Object):353:364 -> d
-    13:19:void rehash(int):961:967 -> d
-    20:20:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.realSize():205:205 -> d
-    20:20:void rehash(int):968 -> d
-    21:33:void rehash(int):969:981 -> d
+    1:11:long getLong(java.lang.Object):371:381 -> d
+    12:18:void rehash(int):961:967 -> d
+    19:19:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.realSize():205:205 -> d
+    19:19:void rehash(int):968 -> d
+    20:32:void rehash(int):969:981 -> d
     1:2:long removeEntry(int):219:220 -> e
     3:8:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.shiftKeys(int):333:338 -> e
     3:8:long removeEntry(int):221 -> e
     9:9:long removeEntry(int):222:222 -> e
     10:15:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.shiftKeys(int):341:346 -> e
     10:15:long removeEntry(int):221 -> e
-    16:26:long getLong(java.lang.Object):371:381 -> e
-    1:5:long removeNullEntry():227:231 -> f
+    1:5:long removeNullEntry():227:231 -> g
     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
@@ -55648,14 +56131,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.iz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$1 -> com.android.tools.r8.internal.Vx:
     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.jz$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Wx$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>
@@ -55663,11 +56146,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.jz$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Wx$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.jz$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$KeySet -> com.android.tools.r8.internal.Wx$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>
@@ -55676,7 +56159,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.jz$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntry -> com.android.tools.r8.internal.Wx$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>
@@ -55694,7 +56177,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.jz$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Wx$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>
@@ -55703,7 +56186,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.jz$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapIterator -> com.android.tools.r8.internal.Wx$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> e
     int last -> b
     int pos -> a
@@ -55711,7 +56194,7 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> f
     1:24:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):541:564 -> <init>
     25:25:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$1):541:541 -> <init>
-    1:19:int nextEntry():576:576 -> f
+    1:19:int nextEntry():576:576 -> e
     1:1:boolean hasNext():572:572 -> hasNext
     1:5:void remove():630:634 -> remove
     6:11:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapIterator.shiftKeys(int):608:613 -> remove
@@ -55721,13 +56204,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.jz$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Wx$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.lz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList -> com.android.tools.r8.internal.Yx:
     int size -> b
     1:3:void <init>(int):96:98 -> <init>
     4:4:void <init>(int):97:97 -> <init>
@@ -55750,9 +56233,10 @@
     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.kz:
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList this$0 -> c
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList$1 -> com.android.tools.r8.internal.Xx:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList this$0 -> d
     int last -> b
+    int val$index -> c
     int pos -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList,int):498:499 -> <init>
     1:2:void add(java.lang.Object):528:529 -> add
@@ -55764,7 +56248,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.nz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet -> com.android.tools.r8.internal.ay:
     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
@@ -55784,17 +56268,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.mz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet$1 -> com.android.tools.r8.internal.Zx:
     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.oz:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections -> com.android.tools.r8.internal.rz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection -> com.android.tools.r8.internal.by:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections -> com.android.tools.r8.internal.ey:
     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.pz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$EmptyCollection -> com.android.tools.r8.internal.cy:
     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
@@ -55802,7 +56286,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.qz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$UnmodifiableCollection -> com.android.tools.r8.internal.dy:
     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
@@ -55824,9 +56308,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.sz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceList -> com.android.tools.r8.internal.fy:
     void removeElements(int,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet -> com.android.tools.r8.internal.uz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet -> com.android.tools.r8.internal.hy:
     java.lang.Object[] key -> a
     float f -> g
     int size -> f
@@ -55873,8 +56357,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.tz:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$SetIterator -> com.android.tools.r8.internal.uz$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$1 -> com.android.tools.r8.internal.gy:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$SetIterator -> com.android.tools.r8.internal.hy$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
@@ -55892,35 +56376,17 @@
     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.vz:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets -> com.android.tools.r8.internal.yz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet -> com.android.tools.r8.internal.iy:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets -> com.android.tools.r8.internal.ky:
     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.wz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets$EmptySet -> com.android.tools.r8.internal.jy:
     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.ReferenceSets$Singleton -> com.android.tools.r8.internal.xz:
-    java.lang.Object element -> a
-    1:2:void <init>(java.lang.Object):96:97 -> <init>
-    1:1:boolean addAll(java.util.Collection):122:122 -> addAll
-    1:1:boolean contains(java.lang.Object):102:102 -> contains
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets$Singleton.iterator():112:112 -> iterator
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():92 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators.singleton(java.lang.Object):176:176 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets$Singleton.iterator():112 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():92 -> iterator
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets$Singleton.iterator():112:112 -> iterator
-    3:3:java.util.Iterator iterator():92 -> iterator
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators.singleton(java.lang.Object):176:176 -> iterator
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets$Singleton.iterator():112 -> iterator
-    4:4:java.util.Iterator iterator():92 -> iterator
-    1:1:boolean remove(java.lang.Object):107:107 -> remove
-    1:1:boolean removeAll(java.util.Collection):127:127 -> removeAll
-    1:1:boolean retainAll(java.util.Collection):132:132 -> retainAll
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSortedSet -> com.android.tools.r8.internal.zz:
-com.android.tools.r8.jar.CfApplicationWriter -> com.android.tools.r8.internal.G3:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSortedSet -> com.android.tools.r8.internal.ly:
+com.android.tools.r8.jar.CfApplicationWriter -> com.android.tools.r8.internal.t3:
     com.android.tools.r8.graph.GraphLens graphLens -> e
     com.android.tools.r8.graph.AppView appView -> d
     com.android.tools.r8.cf.CfVersion MIN_VERSION_FOR_COMPILER_GENERATED_CODE -> a
@@ -55934,105 +56400,105 @@
     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():84:84 -> a
-    1:1:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):421 -> a
-    2:2:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):420:420 -> a
+    1:1:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):420 -> a
+    2:2:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):419:419 -> a
     3:3:int com.android.tools.r8.graph.ParameterAnnotationsList.getAnnotableParameterCount():84:84 -> a
-    3:3:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):423 -> a
-    4:11:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):422:429 -> a
-    12:12:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):427:427 -> a
+    3:3:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):422 -> a
+    4:11:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):421:428 -> a
+    12:12:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):426:426 -> 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):162:162 -> 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):162 -> 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):163:167 -> a
-    25:31:java.lang.String com.android.tools.r8.jar.CfApplicationWriter.getSourceDebugExtension(com.android.tools.r8.graph.DexAnnotationSet):297:303 -> 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):167 -> 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):168:168 -> a
-    33:40:com.android.tools.r8.cf.CfVersion com.android.tools.r8.jar.CfApplicationWriter.getClassFileVersion(com.android.tools.r8.graph.DexProgramClass):273:280 -> 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):169 -> a
-    41:71:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional):170:200 -> a
-    72:82:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.jar.CfApplicationWriter.getAnnotationDefaults(com.android.tools.r8.graph.DexAnnotationSet):307:317 -> a
-    72:82:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional):200 -> a
-    83:108:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional):202:227 -> a
-    109:109:java.util.TreeSet com.android.tools.r8.com.google.common.collect.Sets.newTreeSet(java.util.Comparator):452:452 -> a
-    109:109:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional):228 -> a
-    110:110:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    110:110:java.util.TreeSet com.android.tools.r8.com.google.common.collect.Sets.newTreeSet(java.util.Comparator):452 -> a
-    110:110:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional):228 -> a
-    111:111:java.util.TreeSet com.android.tools.r8.com.google.common.collect.Sets.newTreeSet(java.util.Comparator):452:452 -> a
-    111:111:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional):228 -> a
-    112:131:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional):229:248 -> a
-    132:136:void com.android.tools.r8.utils.ExceptionUtils.withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):51:55 -> a
-    132:136:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional):248 -> a
-    137:137:int lambda$writeClass$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):228:228 -> a
-    138:138: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):231:231 -> a
-    139:139:void lambda$writeClass$3(com.android.tools.r8.ClassFileConsumer,byte[],java.lang.String,com.android.tools.r8.DiagnosticsHandler):249:249 -> a
-    140:143:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):253:256 -> a
-    144:144:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():408:408 -> a
-    144:144:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):257 -> a
-    145:145:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):257:257 -> a
-    146:151:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):256:261 -> a
-    152:160:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):260:268 -> a
-    161:168:com.android.tools.r8.graph.DexValue getSystemAnnotationValue(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexType):286:293 -> a
-    169:175:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):342:348 -> a
-    176:179:java.lang.Object com.android.tools.r8.jar.CfApplicationWriter.getStaticValue(com.android.tools.r8.graph.DexEncodedField):335:338 -> a
-    176:179:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):349 -> a
-    180:181:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):350:351 -> a
-    182:190: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:369 -> a
-    191:191:boolean com.android.tools.r8.graph.DexEncodedMethod.isDeprecated():337:337 -> a
-    191:191: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 -> a
-    192:196: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):373:377 -> a
-    197:205:java.lang.String[] com.android.tools.r8.jar.CfApplicationWriter.getExceptions(com.android.tools.r8.graph.DexAnnotationSet):321:329 -> a
-    197: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):377 -> a
-    206:214: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:386 -> a
-    215:228:void com.android.tools.r8.jar.CfApplicationWriter.writeMethodParametersAnnotation(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.DexAnnotation[]):396:409 -> a
-    215:228: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):386 -> a
-    229:231: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):387:389 -> a
-    232:233:void com.android.tools.r8.jar.CfApplicationWriter.writeCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):530:531 -> a
-    232:233: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):390 -> a
-    234:234:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor lambda$writeParameterAnnotations$4(com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,boolean):428:428 -> a
-    235:244:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):438:447 -> a
-    245:250:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):446:451 -> a
-    251:252:void writeAnnotation(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,com.android.tools.r8.graph.DexEncodedAnnotation):457:458 -> a
-    253:309:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):463:519 -> a
-    310:313:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):513:513 -> a
-    314:314:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):509:509 -> a
-    315:315:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):506:506 -> a
-    316:316:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):503:503 -> a
-    317:317:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):500:500 -> a
-    318:318:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):497:497 -> a
-    319:321:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):491:493 -> a
-    322:322:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):492:492 -> a
-    323:329:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):479:485 -> a
-    330:333:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):466:469 -> a
-    334:338:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):468:472 -> a
+    41:70:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional):170:199 -> a
+    71:81: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
+    71:81: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
+    82:107:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional):201:226 -> a
+    108:108:java.util.TreeSet com.android.tools.r8.com.google.common.collect.Sets.newTreeSet(java.util.Comparator):452:452 -> a
+    108:108:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional):227 -> a
+    109:109:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    109:109:java.util.TreeSet com.android.tools.r8.com.google.common.collect.Sets.newTreeSet(java.util.Comparator):452 -> a
+    109:109:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional):227 -> a
+    110:110:java.util.TreeSet com.android.tools.r8.com.google.common.collect.Sets.newTreeSet(java.util.Comparator):452:452 -> a
+    110:110:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional):227 -> a
+    111:130:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional):228:247 -> a
+    131:135:void com.android.tools.r8.utils.ExceptionUtils.withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):40:44 -> a
+    131:135:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional):247 -> a
+    136:136:int lambda$writeClass$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):227:227 -> a
+    137:137: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):230:230 -> a
+    138:138:void lambda$writeClass$3(com.android.tools.r8.ClassFileConsumer,byte[],java.lang.String,com.android.tools.r8.DiagnosticsHandler):248:248 -> a
+    139:142:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):252:255 -> a
+    143:143:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():415:415 -> a
+    143:143:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):256 -> a
+    144:144:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):256:256 -> a
+    145:150:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):255:260 -> a
+    151:159:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):259:267 -> a
+    160:167:com.android.tools.r8.graph.DexValue getSystemAnnotationValue(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexType):285:292 -> a
+    168:174:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):341:347 -> a
+    175:178:java.lang.Object com.android.tools.r8.jar.CfApplicationWriter.getStaticValue(com.android.tools.r8.graph.DexEncodedField):334:337 -> a
+    175:178:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):348 -> a
+    179:180:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):349:350 -> 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):360:368 -> a
+    190:190:boolean com.android.tools.r8.graph.DexEncodedMethod.isDeprecated():338:338 -> a
+    190:190: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
+    191:195: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):372:376 -> a
+    196:204:java.lang.String[] com.android.tools.r8.jar.CfApplicationWriter.getExceptions(com.android.tools.r8.graph.DexAnnotationSet):320:328 -> a
+    196:204: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):376 -> a
+    205:213: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):377:385 -> a
+    214:227:void com.android.tools.r8.jar.CfApplicationWriter.writeMethodParametersAnnotation(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.DexAnnotation[]):395:408 -> a
+    214:227: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):385 -> a
+    228:230: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):386:388 -> a
+    231:232:void com.android.tools.r8.jar.CfApplicationWriter.writeCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):529:530 -> a
+    231:232: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):389 -> a
+    233:233:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor lambda$writeParameterAnnotations$4(com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,boolean):427:427 -> a
+    234:243:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):437:446 -> a
+    244:249:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):445:450 -> a
+    250:251:void writeAnnotation(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,com.android.tools.r8.graph.DexEncodedAnnotation):456:457 -> a
+    252:308:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):462:518 -> a
+    309:312:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):512:512 -> a
+    313:313:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):508:508 -> a
+    314:314:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):505:505 -> a
+    315:315:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):502:502 -> a
+    316:316:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):499:499 -> a
+    317:317:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):496:496 -> a
+    318:320:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):490:492 -> a
+    321:321:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):491:491 -> a
+    322:328:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):478:484 -> a
+    329:332:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):465:468 -> a
+    333:337:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):467:471 -> a
     1:22:void writeApplication(com.android.tools.r8.ClassFileConsumer):120:141 -> b
-    23:23:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():650:650 -> b
+    23:23:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():632:632 -> b
     23:23:void writeApplication(com.android.tools.r8.ClassFileConsumer):145 -> b
     24:26:void writeApplication(com.android.tools.r8.ClassFileConsumer):147:149 -> b
     27:31:void writeApplication(com.android.tools.r8.ClassFileConsumer):146:150 -> b
     32:32:void writeApplication(com.android.tools.r8.ClassFileConsumer):143:143 -> b
     33:34:void writeApplication(com.android.tools.r8.ClassFileConsumer):131:132 -> b
-    35:35:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():650:650 -> b
+    35:35:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():632:632 -> b
     35:35:void writeApplication(com.android.tools.r8.ClassFileConsumer):136 -> b
     36:37:void writeApplication(com.android.tools.r8.ClassFileConsumer):137:138 -> b
     38:57:void writeApplication(com.android.tools.r8.ClassFileConsumer):134:153 -> b
-    58:58: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):234:234 -> b
-com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer -> com.android.tools.r8.internal.F3:
+    58:58: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):233:233 -> b
+com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer -> com.android.tools.r8.internal.s3:
     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.q9:
+com.android.tools.r8.jetbrains.kotlin.DeprecationLevel -> com.android.tools.r8.internal.O8:
 # {"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.dn:
+com.android.tools.r8.jetbrains.kotlin.KotlinNullPointerException -> com.android.tools.r8.internal.im:
 # {"id":"sourceFile","fileName":"KotlinNullPointerException.kt"}
     1:1:void <init>():9:9 -> <init>
-com.android.tools.r8.jetbrains.kotlin.Lazy -> com.android.tools.r8.internal.co:
+com.android.tools.r8.jetbrains.kotlin.Lazy -> com.android.tools.r8.internal.hn:
 # {"id":"sourceFile","fileName":"Lazy.kt"}
-com.android.tools.r8.jetbrains.kotlin.LazyKt -> com.android.tools.r8.internal.ho:
+com.android.tools.r8.jetbrains.kotlin.LazyKt -> com.android.tools.r8.internal.mn:
     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
@@ -56047,17 +56513,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.io:
+com.android.tools.r8.jetbrains.kotlin.LazyKt__LazyKt -> com.android.tools.r8.internal.nn:
 # {"id":"sourceFile","fileName":"Lazy.kt"}
-com.android.tools.r8.jetbrains.kotlin.LazyThreadSafetyMode -> com.android.tools.r8.internal.jo:
+com.android.tools.r8.jetbrains.kotlin.LazyThreadSafetyMode -> com.android.tools.r8.internal.on:
 # {"id":"sourceFile","fileName":"Lazy.kt"}
-    com.android.tools.r8.jetbrains.kotlin.LazyThreadSafetyMode PUBLICATION -> a
-    com.android.tools.r8.jetbrains.kotlin.LazyThreadSafetyMode[] $VALUES -> b
+    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.Ds:
+com.android.tools.r8.jetbrains.kotlin.NoWhenBranchMatchedException -> com.android.tools.r8.internal.zr:
 # {"id":"sourceFile","fileName":"NoWhenBranchMatchedException.kt"}
     1:1:void <init>():9:9 -> <init>
-com.android.tools.r8.jetbrains.kotlin.Pair -> com.android.tools.r8.internal.Wu:
+com.android.tools.r8.jetbrains.kotlin.Pair -> com.android.tools.r8.internal.Pt:
 # {"id":"sourceFile","fileName":"Tuples.kt"}
     java.lang.Object second -> b
     java.lang.Object first -> a
@@ -56067,7 +56535,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.oB:
+com.android.tools.r8.jetbrains.kotlin.SafePublicationLazyImpl -> com.android.tools.r8.internal.aA:
 # {"id":"sourceFile","fileName":"LazyJVM.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 initializer -> b
     java.util.concurrent.atomic.AtomicReferenceFieldUpdater valueUpdater -> a
@@ -56078,7 +56546,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.qE:
+com.android.tools.r8.jetbrains.kotlin.SynchronizedLazyImpl -> com.android.tools.r8.internal.dD:
 # {"id":"sourceFile","fileName":"LazyJVM.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 initializer -> a
     java.lang.Object _value -> b
@@ -56089,23 +56557,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.xF:
+com.android.tools.r8.jetbrains.kotlin.TypeCastException -> com.android.tools.r8.internal.ME:
 # {"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.KF:
+com.android.tools.r8.jetbrains.kotlin.UNINITIALIZED_VALUE -> com.android.tools.r8.internal.aF:
 # {"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.RF:
+com.android.tools.r8.jetbrains.kotlin.UninitializedPropertyAccessException -> com.android.tools.r8.internal.hF:
 # {"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.UF:
+com.android.tools.r8.jetbrains.kotlin.Unit -> com.android.tools.r8.internal.kF:
 # {"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.cG:
+com.android.tools.r8.jetbrains.kotlin.UnsafeLazyImpl -> com.android.tools.r8.internal.sF:
 # {"id":"sourceFile","fileName":"Lazy.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 initializer -> a
     java.lang.Object _value -> b
@@ -56115,11 +56583,11 @@
     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.uI:
+com.android.tools.r8.jetbrains.kotlin._Assertions -> com.android.tools.r8.internal.KH:
 # {"id":"sourceFile","fileName":"AssertionsJVM.kt"}
     boolean ENABLED -> a
     1:1:void <clinit>():14:14 -> <clinit>
-com.android.tools.r8.jetbrains.kotlin.collections.AbstractCollection -> com.android.tools.r8.internal.m:
+com.android.tools.r8.jetbrains.kotlin.collections.AbstractCollection -> com.android.tools.r8.internal.l:
 # {"id":"sourceFile","fileName":"AbstractCollection.kt"}
     1:1:void <init>():13:13 -> <init>
     int getSize() -> a
@@ -56133,13 +56601,14 @@
     1:1:java.lang.Object[] toArray():31:31 -> toArray
     2:2:java.lang.Object[] toArray(java.lang.Object[]):37:37 -> toArray
     1:1:java.lang.String toString():24:24 -> toString
-com.android.tools.r8.jetbrains.kotlin.collections.AbstractCollection$toString$1 -> com.android.tools.r8.internal.l:
+com.android.tools.r8.jetbrains.kotlin.collections.AbstractCollection$toString$1 -> com.android.tools.r8.internal.k:
 # {"id":"sourceFile","fileName":"AbstractCollection.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.AbstractCollection this$0 -> a
     1:1:java.lang.CharSequence com.android.tools.r8.jetbrains.kotlin.collections.AbstractCollection$toString$1.invoke(java.lang.Object):25:25 -> a
     1:1:java.lang.Object invoke(java.lang.Object):13 -> a
 com.android.tools.r8.jetbrains.kotlin.collections.AbstractList -> com.android.tools.r8.internal.I:
 # {"id":"sourceFile","fileName":"AbstractList.kt"}
+    com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$Companion Companion -> a
     1:1:void <init>():20:20 -> <init>
     1:3:boolean equals(java.lang.Object):60:62 -> equals
     4:144:boolean com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$Companion.orderedEquals$kotlin_stdlib(java.util.Collection,java.util.Collection):0:140 -> equals
@@ -56154,13 +56623,17 @@
     1:1:java.util.ListIterator listIterator():30:30 -> listIterator
     2:2:java.util.ListIterator listIterator(int):32:32 -> listIterator
     1:1:java.util.List subList(int,int):34:34 -> subList
+com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$Companion -> com.android.tools.r8.internal.H:
+# {"id":"sourceFile","fileName":"AbstractList.kt"}
+    1:1:void <init>():104:104 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):104:104 -> <init>
 com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$IteratorImpl -> com.android.tools.r8.internal.I$a:
 # {"id":"sourceFile","fileName":"AbstractList.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.AbstractList this$0 -> b
     int index -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.collections.AbstractList):70:70 -> <init>
     1:1:void setIndex(int):72:72 -> a
-    1:1:int getIndex():72:72 -> f
+    1:1:int getIndex():72:72 -> e
     1:1:boolean hasNext():74:74 -> hasNext
     2:2:int com.android.tools.r8.jetbrains.kotlin.collections.AbstractCollection.size():13:13 -> hasNext
     2:2:boolean hasNext():74 -> hasNext
@@ -56177,9 +56650,9 @@
     1:1:int previousIndex():101:101 -> previousIndex
 com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$SubList -> com.android.tools.r8.internal.J:
 # {"id":"sourceFile","fileName":"AbstractList.kt"}
-    com.android.tools.r8.jetbrains.kotlin.collections.AbstractList list -> b
-    int fromIndex -> c
-    int _size -> a
+    com.android.tools.r8.jetbrains.kotlin.collections.AbstractList list -> c
+    int fromIndex -> d
+    int _size -> b
     1:6:void <init>(com.android.tools.r8.jetbrains.kotlin.collections.AbstractList,int,int):36:41 -> <init>
     7:7:void com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$Companion.checkRangeIndexes$kotlin_stdlib(int,int,int):122:122 -> <init>
     7:7:void <init>(com.android.tools.r8.jetbrains.kotlin.collections.AbstractList,int,int):40 -> <init>
@@ -56189,28 +56662,92 @@
     1:3:java.lang.Object get(int):45:47 -> get
     4:4:void com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$Companion.checkElementIndex$kotlin_stdlib(int,int):107:107 -> get
     4:4:java.lang.Object get(int):45 -> get
-com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt -> com.android.tools.r8.internal.C1:
-    1:163:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt.asList(int[]):0:162 -> a
-    1:163:java.util.List asList(int[]):0 -> a
-    164:164:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt.asList(java.lang.Object[]):0:0 -> a
-    164:164:java.util.List asList(java.lang.Object[]):0 -> a
-    165:165:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.ArraysUtilJVM.asList(java.lang.Object[]):13:13 -> a
-    165:165:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt.asList(java.lang.Object[]):127 -> a
-    165:165:java.util.List asList(java.lang.Object[]):0 -> a
-    166:166:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt.asList(java.lang.Object[]):127:127 -> a
-    166:166:java.util.List asList(java.lang.Object[]):0 -> a
-    1:1:java.lang.Integer com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.getOrNull(int[],int):0:0 -> b
-    1:1:java.lang.Integer getOrNull(int[],int):0 -> b
-    2:6561:int com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.getLastIndex(int[]):0:6559 -> b
-    2:6561:java.lang.Integer com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.getOrNull(int[],int):1231 -> b
-    2:6561:java.lang.Integer getOrNull(int[],int):0 -> b
-    6562:6562:java.lang.Integer com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.getOrNull(int[],int):1231:1231 -> b
-    6562:6562:java.lang.Integer getOrNull(int[],int):0 -> b
-com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt__ArraysKt -> com.android.tools.r8.internal.D1:
+com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt -> com.android.tools.r8.internal.A1:
+    1:150:boolean com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__MutableCollectionsKt.addAll(java.util.Collection,java.lang.Object[]):0:149 -> a
+    1:150:boolean com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.addAll(java.util.Collection,java.lang.Object[]):0 -> a
+    151:313:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt.asList(int[]):0:162 -> a
+    151:313:java.util.List asList(int[]):0 -> a
+    314:314:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt.asList(java.lang.Object[]):0:0 -> a
+    314:314:java.util.List asList(java.lang.Object[]):0 -> a
+    315:315:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.ArraysUtilJVM.asList(java.lang.Object[]):13:13 -> a
+    315:315:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt.asList(java.lang.Object[]):127 -> a
+    315:315:java.util.List asList(java.lang.Object[]):0 -> a
+    316:316:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt.asList(java.lang.Object[]):127:127 -> a
+    316:316:java.util.List asList(java.lang.Object[]):0 -> a
+    317:356:int com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__IterablesKt.collectionSizeOrDefault(java.lang.Iterable,int):0:39 -> a
+    317:356:int com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.collectionSizeOrDefault(java.lang.Iterable,int):0 -> a
+    357:357:java.lang.Integer com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.getOrNull(int[],int):0:0 -> a
+    357:357:java.lang.Integer getOrNull(int[],int):0 -> a
+    358:6917:int com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.getLastIndex(int[]):0:6559 -> a
+    358:6917:java.lang.Integer com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.getOrNull(int[],int):1231 -> a
+    358:6917:java.lang.Integer getOrNull(int[],int):0 -> a
+    6918:6918:java.lang.Integer com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.getOrNull(int[],int):1231:1231 -> a
+    6918:6918:java.lang.Integer getOrNull(int[],int):0 -> a
+    6919:9235:java.lang.String com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.joinToString(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):0:2316 -> a
+    6919:9235:java.lang.String com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.joinToString$default(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):2315 -> a
+    6919:9235:java.lang.String com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.joinToString$default(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):0 -> a
+    9236:11539:java.lang.Appendable com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.joinTo(java.lang.Iterable,java.lang.Appendable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):0:2303 -> a
+    9236:11539:java.lang.String com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.joinToString(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):2316 -> a
+    9236:11539:java.lang.String com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.joinToString$default(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):2315 -> a
+    9236:11539:java.lang.String com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.joinToString$default(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):0 -> a
+    11540:11540:java.lang.String com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.joinToString(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):2316:2316 -> a
+    11540:11540:java.lang.String com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.joinToString$default(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):2315 -> a
+    11540:11540:java.lang.String com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.joinToString$default(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):0 -> a
+    11541:12712:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toList(java.lang.Iterable):0:1171 -> a
+    11541:12712:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.toList(java.lang.Iterable):0 -> a
+    12713:13906:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toMutableList(java.util.Collection):0:1193 -> a
+    12713:13906:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toList(java.lang.Iterable):1174 -> a
+    12713:13906:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.toList(java.lang.Iterable):0 -> a
+    13907:13907:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toList(java.lang.Iterable):1173:1173 -> a
+    13907:13907:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.toList(java.lang.Iterable):0 -> a
+    13908:13913:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toList(java.lang.Iterable):1172:1177 -> a
+    13908:13913:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.toList(java.lang.Iterable):0 -> a
+    13914:14136:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt.optimizeReadOnlyList(java.util.List):0:222 -> a
+    13914:14136:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toList(java.lang.Iterable):1177 -> a
+    13914:14136:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.toList(java.lang.Iterable):0 -> a
+    14137:14137:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt.optimizeReadOnlyList(java.util.List):221:221 -> a
+    14137:14137:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toList(java.lang.Iterable):1177 -> a
+    14137:14137:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.toList(java.lang.Iterable):0 -> a
+    14138:14502:void com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt.putAll(java.util.Map,java.lang.Iterable):0:364 -> a
+    14138:14502:java.util.Map com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt.toMap(java.lang.Iterable,java.util.Map):508 -> a
+    14503:14503:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsJVMKt.listOf(java.lang.Object):19:19 -> a
+    14504:14504:int com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt.mapCapacity(int):134:134 -> a
+    14504:14504:int com.android.tools.r8.jetbrains.kotlin.collections.MapsKt.mapCapacity(int):0 -> a
+    14505:14505:void com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt.throwIndexOverflow():388:388 -> a
+    14505:14505:void com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.throwIndexOverflow():0 -> a
+    14506:14507:java.util.Collection com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toCollection(java.lang.Iterable,java.util.Collection):1153:1154 -> a
+    1:76:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt.listOf(java.lang.Object[]):0:75 -> b
+    1:76:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.listOf(java.lang.Object[]):0 -> b
+    77:575:java.util.Map com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt.toMap(java.lang.Iterable):0:498 -> b
+    77:575:java.util.Map com.android.tools.r8.jetbrains.kotlin.collections.MapsKt.toMap(java.lang.Iterable):0 -> b
+    576:576:java.util.Map com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt.toMap(java.lang.Iterable):497:497 -> b
+    576:576:java.util.Map com.android.tools.r8.jetbrains.kotlin.collections.MapsKt.toMap(java.lang.Iterable):0 -> b
+    577:604:java.util.Map com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsJVMKt.mapOf(com.android.tools.r8.jetbrains.kotlin.Pair):0:27 -> b
+    577:604:java.util.Map com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt.toMap(java.lang.Iterable):497 -> b
+    577:604:java.util.Map com.android.tools.r8.jetbrains.kotlin.collections.MapsKt.toMap(java.lang.Iterable):0 -> b
+    605:605:java.util.Map com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt.toMap(java.lang.Iterable):496:496 -> b
+    605:605:java.util.Map com.android.tools.r8.jetbrains.kotlin.collections.MapsKt.toMap(java.lang.Iterable):0 -> b
+    606:607:int com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.indexOf(int[],int):1317:1318 -> b
+    1:2:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toMutableList(java.lang.Iterable):1184:1185 -> c
+    3:1196:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toMutableList(java.util.Collection):0:1193 -> c
+    3:1196:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toMutableList(java.lang.Iterable):1185 -> c
+    1197:1197:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toMutableList(java.lang.Iterable):1186:1186 -> c
+    1:1207:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toSet(java.lang.Iterable):0:1206 -> d
+    1:1207:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.toSet(java.lang.Iterable):0 -> d
+    1208:1208:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toSet(java.lang.Iterable):1205:1205 -> d
+    1208:1208:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.toSet(java.lang.Iterable):0 -> d
+    1209:1209:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.SetsKt__SetsJVMKt.setOf(java.lang.Object):16:16 -> d
+    1209:1209:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toSet(java.lang.Iterable):1205 -> d
+    1209:1209:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.toSet(java.lang.Iterable):0 -> d
+    1210:1210:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toSet(java.lang.Iterable):1204:1204 -> d
+    1210:1210:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.toSet(java.lang.Iterable):0 -> d
+    1:1388:java.lang.Iterable com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.withIndex(java.lang.Iterable):0:1387 -> e
+    1:1388:java.lang.Iterable com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.withIndex(java.lang.Iterable):0 -> e
+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.ArraysKt___ArraysJvmKt$asList$3 -> com.android.tools.r8.internal.E1:
+com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt$asList$3 -> com.android.tools.r8.internal.C1:
 # {"id":"sourceFile","fileName":"_ArraysJvm.kt"}
-    int[] $this_asList -> a
+    int[] $this_asList -> b
     1:1:void <init>(int[]):162:162 -> <init>
     1:1:int getSize():163:163 -> a
     1:1:boolean contains(java.lang.Object):162:162 -> contains
@@ -56254,87 +56791,14 @@
     13831:13832:int com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.lastIndexOf(int[],int):1847:1848 -> lastIndexOf
     13831:13832:int com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt$asList$3.lastIndexOf(int):168 -> lastIndexOf
     13831:13832:int lastIndexOf(java.lang.Object):162 -> lastIndexOf
-com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt -> com.android.tools.r8.internal.F1:
+com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt -> com.android.tools.r8.internal.D1:
 # {"id":"sourceFile","fileName":"_Arrays.kt"}
-    1:2:int indexOf(int[],int):1317:1318 -> a
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt -> com.android.tools.r8.internal.M7:
-    1:150:boolean com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__MutableCollectionsKt.addAll(java.util.Collection,java.lang.Object[]):0:149 -> a
-    1:150:boolean addAll(java.util.Collection,java.lang.Object[]):0 -> a
-    151:190:int com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__IterablesKt.collectionSizeOrDefault(java.lang.Iterable,int):0:39 -> a
-    151:190:int collectionSizeOrDefault(java.lang.Iterable,int):0 -> a
-    191:2507:java.lang.String com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.joinToString(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):0:2316 -> a
-    191:2507:java.lang.String com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.joinToString$default(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):2315 -> a
-    191:2507:java.lang.String joinToString$default(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):0 -> a
-    2508:4811:java.lang.Appendable com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.joinTo(java.lang.Iterable,java.lang.Appendable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):0:2303 -> a
-    2508:4811:java.lang.String com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.joinToString(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):2316 -> a
-    2508:4811:java.lang.String com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.joinToString$default(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):2315 -> a
-    2508:4811:java.lang.String joinToString$default(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):0 -> a
-    4812:4812:java.lang.String com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.joinToString(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):2316:2316 -> a
-    4812:4812:java.lang.String com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.joinToString$default(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):2315 -> a
-    4812:4812:java.lang.String joinToString$default(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):0 -> a
-    4813:4888:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt.listOf(java.lang.Object[]):0:75 -> a
-    4813:4888:java.util.List listOf(java.lang.Object[]):0 -> a
-    4889:6963:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.plus(java.util.Collection,java.lang.Iterable):0:2074 -> a
-    4889:6963:java.util.List plus(java.util.Collection,java.lang.Iterable):0 -> a
-    6964:9491:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.sortedWith(java.lang.Iterable,java.util.Comparator):0:2527 -> a
-    6964:9491:java.util.List sortedWith(java.lang.Iterable,java.util.Comparator):0 -> a
-    9492:11354:void com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt.sortWith(java.lang.Object[],java.util.Comparator):0:1862 -> a
-    9492:11354:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.sortedWith(java.lang.Iterable,java.util.Comparator):947 -> a
-    9492:11354:java.util.List sortedWith(java.lang.Iterable,java.util.Comparator):0 -> a
-    11355:12935:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.sortedWith(java.lang.Iterable,java.util.Comparator):947:2527 -> a
-    11355:12935:java.util.List sortedWith(java.lang.Iterable,java.util.Comparator):0 -> a
-    12936:12936:void com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt.throwIndexOverflow():388:388 -> a
-    12936:12936:void throwIndexOverflow():0 -> a
-    1:1172:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toList(java.lang.Iterable):0:1171 -> b
-    1:1172:java.util.List toList(java.lang.Iterable):0 -> b
-    1173:2366:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toMutableList(java.util.Collection):0:1193 -> b
-    1173:2366:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toList(java.lang.Iterable):1174 -> b
-    1173:2366:java.util.List toList(java.lang.Iterable):0 -> b
-    2367:2367:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toList(java.lang.Iterable):1173:1173 -> b
-    2367:2367:java.util.List toList(java.lang.Iterable):0 -> b
-    2368:2373:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toList(java.lang.Iterable):1172:1177 -> b
-    2368:2373:java.util.List toList(java.lang.Iterable):0 -> b
-    2374:2596:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt.optimizeReadOnlyList(java.util.List):0:222 -> b
-    2374:2596:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toList(java.lang.Iterable):1177 -> b
-    2374:2596:java.util.List toList(java.lang.Iterable):0 -> b
-    2597:2597:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt.optimizeReadOnlyList(java.util.List):221:221 -> b
-    2597:2597:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toList(java.lang.Iterable):1177 -> b
-    2597:2597:java.util.List toList(java.lang.Iterable):0 -> b
-    2598:2598:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt.listOfNotNull(java.lang.Object):118:118 -> b
-    2598:2598:java.util.List listOfNotNull(java.lang.Object):0 -> b
-    1:1207:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toSet(java.lang.Iterable):0:1206 -> c
-    1:1207:java.util.Set toSet(java.lang.Iterable):0 -> c
-    1208:1208:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toSet(java.lang.Iterable):1205:1205 -> c
-    1208:1208:java.util.Set toSet(java.lang.Iterable):0 -> c
-    1209:1209:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.SetsKt__SetsJVMKt.setOf(java.lang.Object):16:16 -> c
-    1209:1209:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toSet(java.lang.Iterable):1205 -> c
-    1209:1209:java.util.Set toSet(java.lang.Iterable):0 -> c
-    1210:1210:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toSet(java.lang.Iterable):1204:1204 -> c
-    1210:1210:java.util.Set toSet(java.lang.Iterable):0 -> c
-    1:1388:java.lang.Iterable com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.withIndex(java.lang.Iterable):0:1387 -> d
-    1:1388:java.lang.Iterable withIndex(java.lang.Iterable):0 -> d
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt -> com.android.tools.r8.internal.N7:
-# {"id":"sourceFile","fileName":"Collections.kt"}
-    1:1:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsJVMKt.listOf(java.lang.Object):19:19 -> a
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__IteratorsJVMKt -> com.android.tools.r8.internal.O7:
-# {"id":"sourceFile","fileName":"IteratorsJVM.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__MutableCollectionsJVMKt -> com.android.tools.r8.internal.P7:
-# {"id":"sourceFile","fileName":"MutableCollectionsJVM.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__ReversedViewsKt -> com.android.tools.r8.internal.Q7:
-# {"id":"sourceFile","fileName":"ReversedViews.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt -> com.android.tools.r8.internal.S7:
-# {"id":"sourceFile","fileName":"_Collections.kt"}
-    1:2:java.util.Collection toCollection(java.lang.Iterable,java.util.Collection):1153:1154 -> a
-    3:4:java.util.List toMutableList(java.lang.Iterable):1184:1185 -> a
-    5:1198:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toMutableList(java.util.Collection):0:1193 -> a
-    5:1198:java.util.List toMutableList(java.lang.Iterable):1185 -> a
-    1199:1199:java.util.List toMutableList(java.lang.Iterable):1186:1186 -> a
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt$withIndex$1 -> com.android.tools.r8.internal.R7:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt$withIndex$1 -> com.android.tools.r8.internal.t7:
 # {"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.La:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator -> com.android.tools.r8.internal.ga:
 # {"id":"sourceFile","fileName":"Collections.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator INSTANCE -> a
     1:1:void <clinit>():13:13 -> <clinit>
@@ -56343,7 +56807,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.Ma:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptyList -> com.android.tools.r8.internal.ha:
 # {"id":"sourceFile","fileName":"Collections.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.EmptyList INSTANCE -> a
     1:1:void <clinit>():22:22 -> <clinit>
@@ -56366,7 +56830,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.Na:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptyMap -> com.android.tools.r8.internal.ia:
 # {"id":"sourceFile","fileName":"Maps.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.EmptyMap INSTANCE -> a
     1:1:void <clinit>():13:13 -> <clinit>
@@ -56378,7 +56842,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.Pa:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptySet -> com.android.tools.r8.internal.ka:
 # {"id":"sourceFile","fileName":"Sets.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.EmptySet INSTANCE -> a
     1:1:void <clinit>():12:12 -> <clinit>
@@ -56389,19 +56853,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.rf:
+com.android.tools.r8.jetbrains.kotlin.collections.IndexedValue -> com.android.tools.r8.internal.De:
 # {"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.sf:
+com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterable -> com.android.tools.r8.internal.Ee:
 # {"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.tf:
+com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterator -> com.android.tools.r8.internal.Fe:
 # {"id":"sourceFile","fileName":"Iterators.kt"}
     java.util.Iterator iterator -> b
     int index -> a
@@ -56413,25 +56877,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.collections.MapsKt -> com.android.tools.r8.internal.eq:
-    1:499:java.util.Map com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt.toMap(java.lang.Iterable):0:498 -> a
-    1:499:java.util.Map toMap(java.lang.Iterable):0 -> a
-    500:500:java.util.Map com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt.toMap(java.lang.Iterable):497:497 -> a
-    500:500:java.util.Map toMap(java.lang.Iterable):0 -> a
-    501:528:java.util.Map com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsJVMKt.mapOf(com.android.tools.r8.jetbrains.kotlin.Pair):0:27 -> a
-    501:528:java.util.Map com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt.toMap(java.lang.Iterable):497 -> a
-    501:528:java.util.Map toMap(java.lang.Iterable):0 -> a
-    529:529:java.util.Map com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt.toMap(java.lang.Iterable):496:496 -> a
-    529:529:java.util.Map toMap(java.lang.Iterable):0 -> a
-    530:530:int com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt.mapCapacity(int):134:134 -> a
-    530:530:int mapCapacity(int):0 -> a
-com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsJVMKt -> com.android.tools.r8.internal.fq:
-# {"id":"sourceFile","fileName":"MapsJVM.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.MapsKt___MapsKt -> com.android.tools.r8.internal.gq:
-# {"id":"sourceFile","fileName":"_Maps.kt"}
-    1:365:void com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt.putAll(java.util.Map,java.lang.Iterable):0:364 -> a
-    1:365:java.util.Map com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt.toMap(java.lang.Iterable,java.util.Map):508 -> a
-com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt -> com.android.tools.r8.internal.kw:
+com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt -> com.android.tools.r8.internal.dv:
 # {"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
@@ -56439,35 +56885,24 @@
     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.JvmClassMappingKt -> com.android.tools.r8.internal.vj:
-# {"id":"sourceFile","fileName":"JvmClassMapping.kt"}
-    1:8:java.lang.Class getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):58:65 -> a
-    9:16:java.lang.Class getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:61 -> a
-    17:17:java.lang.Class getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):62:62 -> a
-    18:28:java.lang.Class getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:61 -> a
-    35:35:java.lang.Class getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):68:68 -> a
-    36:39:java.lang.Class getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:61 -> a
-    42:42:java.lang.Class getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):64:64 -> a
-    43:49:java.lang.Class getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:61 -> a
-    57:57:java.lang.Class getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):69:69 -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.KotlinReflectionNotSupportedError -> com.android.tools.r8.internal.gn:
+com.android.tools.r8.jetbrains.kotlin.jvm.KotlinReflectionNotSupportedError -> com.android.tools.r8.internal.lm:
 # {"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.ad:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 -> com.android.tools.r8.internal.pc:
 # {"id":"sourceFile","fileName":"Functions.kt"}
     java.lang.Object invoke() -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 -> com.android.tools.r8.internal.bd:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 -> com.android.tools.r8.internal.qc:
 # {"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.cd:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2 -> com.android.tools.r8.internal.rc:
 # {"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.B3:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference$NoReceiver -> com.android.tools.r8.internal.o3:
     com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference$NoReceiver INSTANCE -> a
     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.O6:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassReference -> com.android.tools.r8.internal.z6:
 # {"id":"sourceFile","fileName":"ClassReference.kt"}
     java.lang.Class jClass -> a
     1:1:void <init>(java.lang.Class):10:10 -> <init>
@@ -56478,7 +56913,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.K7:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.CollectionToArray -> com.android.tools.r8.internal.r7:
 # {"id":"sourceFile","fileName":"CollectionToArray.kt"}
     java.lang.Object[] EMPTY -> a
     1:1:void <clinit>():130:130 -> <clinit>
@@ -56490,8 +56925,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.b9:
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics -> com.android.tools.r8.internal.ii:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker -> com.android.tools.r8.internal.A8:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics -> com.android.tools.r8.internal.uh:
     int compare(int,int) -> a
     1:1:void throwNpe():37:37 -> a
     2:2:void throwUninitializedPropertyAccessException(java.lang.String):49:49 -> a
@@ -56504,11 +56939,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.wn:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.Lambda -> com.android.tools.r8.internal.Bm:
 # {"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.yw:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference -> com.android.tools.r8.internal.rv:
     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
@@ -56536,7 +56971,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.xw:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1Impl -> com.android.tools.r8.internal.qv:
     com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer owner -> d
     java.lang.String signature -> f
     java.lang.String name -> e
@@ -56587,7 +57022,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.Bz:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.Reflection -> com.android.tools.r8.internal.ny:
     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
@@ -56598,13 +57033,14 @@
     4:5:java.lang.String com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory.renderLambdaToString(com.android.tools.r8.jetbrains.kotlin.jvm.internal.Lambda):36 -> a
     4:5:java.lang.String renderLambdaToString(com.android.tools.r8.jetbrains.kotlin.jvm.internal.Lambda):69 -> a
     6:6:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1 property1(com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1):94:94 -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory -> com.android.tools.r8.internal.Cz:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory -> com.android.tools.r8.internal.oy:
     1:1:void <init>():11:11 -> <init>
-com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression -> com.android.tools.r8.internal.Ih:
+com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression -> com.android.tools.r8.internal.Vg:
 # {"id":"sourceFile","fileName":"Progressions.kt"}
-    int last -> b
-    int step -> c
-    int first -> a
+    int step -> d
+    int first -> b
+    int last -> c
+    com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression$Companion Companion -> a
     1:25:void <init>(int,int,int):73:97 -> <init>
     26:26:void <init>(int,int,int):81:81 -> <init>
     27:27:void <init>(int,int,int):80:80 -> <init>
@@ -56617,7 +57053,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.IntProgressionIterator -> com.android.tools.r8.internal.Jh:
+com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression$Companion -> com.android.tools.r8.internal.Ug:
+# {"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.Wg:
 # {"id":"sourceFile","fileName":"ProgressionIterators.kt"}
     int step -> d
     boolean hasNext -> b
@@ -56643,10 +57083,10 @@
     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.Lh:
+com.android.tools.r8.jetbrains.kotlin.ranges.IntRange -> com.android.tools.r8.internal.Yg:
 # {"id":"sourceFile","fileName":"Ranges.kt"}
-    com.android.tools.r8.jetbrains.kotlin.ranges.IntRange EMPTY -> d
-    com.android.tools.r8.jetbrains.kotlin.ranges.IntRange$Companion Companion -> e
+    com.android.tools.r8.jetbrains.kotlin.ranges.IntRange EMPTY -> e
+    com.android.tools.r8.jetbrains.kotlin.ranges.IntRange$Companion Companion -> f
     1:1:void <clinit>():58:58 -> <clinit>
     1:1:void <init>(int,int):39:39 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange access$getEMPTY$cp():39:39 -> d
@@ -56654,29 +57094,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.Kh:
+com.android.tools.r8.jetbrains.kotlin.ranges.IntRange$Companion -> com.android.tools.r8.internal.Xg:
 # {"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.vy:
+com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt -> com.android.tools.r8.internal.nx:
     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.wy:
+com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt__RangesKt -> com.android.tools.r8.internal.ox:
 # {"id":"sourceFile","fileName":"Ranges.kt"}
-com.android.tools.r8.jetbrains.kotlin.reflect.KCallable -> com.android.tools.r8.internal.zk:
+com.android.tools.r8.jetbrains.kotlin.reflect.KCallable -> com.android.tools.r8.internal.Ej:
 # {"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.Ak:
+com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer -> com.android.tools.r8.internal.Fj:
 # {"id":"sourceFile","fileName":"KDeclarationContainer.kt"}
-com.android.tools.r8.jetbrains.kotlin.reflect.KProperty -> com.android.tools.r8.internal.Dk:
+com.android.tools.r8.jetbrains.kotlin.reflect.KProperty -> com.android.tools.r8.internal.Ij:
 # {"id":"sourceFile","fileName":"KProperty.kt"}
-com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1 -> com.android.tools.r8.internal.Ck:
+com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1 -> com.android.tools.r8.internal.Hj:
 # {"id":"sourceFile","fileName":"KProperty.kt"}
-com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter -> com.android.tools.r8.internal.Bk:
+com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter -> com.android.tools.r8.internal.Gj:
 # {"id":"sourceFile","fileName":"KProperty.kt"}
-com.android.tools.r8.jetbrains.kotlin.sequences.Sequence -> com.android.tools.r8.internal.wB:
+com.android.tools.r8.jetbrains.kotlin.sequences.Sequence -> com.android.tools.r8.internal.iA:
 # {"id":"sourceFile","fileName":"Sequence.kt"}
-com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence -> com.android.tools.r8.internal.cF:
+com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence -> com.android.tools.r8.internal.VD:
 # {"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
@@ -56684,14 +57124,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.bF:
+com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence$iterator$1 -> com.android.tools.r8.internal.UD:
 # {"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.p9:
+com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence -> com.android.tools.r8.internal.N8:
 # {"id":"sourceFile","fileName":"Strings.kt"}
     java.lang.CharSequence input -> a
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2 getNextMatch -> d
@@ -56703,7 +57143,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.o9:
+com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence$iterator$1 -> com.android.tools.r8.internal.M8:
 # {"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
@@ -56712,18 +57152,18 @@
     int nextSearchIndex -> c
     int nextState -> a
     1:4:void <init>(com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence):1079:1082 -> <init>
-    1:15:void calcNext():1087:1101 -> f
-    16:16:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.until(int,int):705:705 -> f
-    16:16:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt.until(int,int):0 -> f
-    16:16:void calcNext():1101 -> f
-    17:17:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.ranges.IntRange$Companion.getEMPTY():58:58 -> f
-    17:17:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.until(int,int):705 -> f
-    17:17:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt.until(int,int):0 -> f
-    17:17:void calcNext():1101 -> f
-    18:18:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.until(int,int):706:706 -> f
-    18:18:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt.until(int,int):0 -> f
-    18:18:void calcNext():1101 -> f
-    19:24:void calcNext():1101:1106 -> f
+    1:15:void calcNext():1087:1101 -> e
+    16:16:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.until(int,int):705:705 -> e
+    16:16:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt.until(int,int):0 -> e
+    16:16:void calcNext():1101 -> e
+    17:17:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.ranges.IntRange$Companion.getEMPTY():58:58 -> e
+    17:17:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.until(int,int):705 -> e
+    17:17:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt.until(int,int):0 -> e
+    17:17:void calcNext():1101 -> e
+    18:18:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.until(int,int):706:706 -> e
+    18:18:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt.until(int,int):0 -> e
+    18:18:void calcNext():1101 -> e
+    19:24:void calcNext():1101:1106 -> e
     1:3:boolean hasNext():1123:1125 -> hasNext
     1:8:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence$iterator$1.next():1111:1118 -> next
     1:8:java.lang.Object next():1079 -> next
@@ -56731,73 +57171,95 @@
     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.ND:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt -> com.android.tools.r8.internal.AC:
     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
-    boolean contains$default(java.lang.CharSequence,char,boolean,int,java.lang.Object) -> a
-    63:127:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace(java.lang.String,char,char,boolean):0:64 -> a
-    63:127:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):60 -> a
-    63:127:java.lang.String replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):0 -> a
-    128:128:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.splitToSequence(java.lang.CharSequence,char[],boolean,int):0:0 -> a
-    128:128:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.splitToSequence$default(java.lang.CharSequence,char[],boolean,int,int,java.lang.Object):1217 -> a
-    128:128:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace(java.lang.String,char,char,boolean):64 -> a
-    128:128:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):60 -> a
-    128:128:java.lang.String replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):0 -> a
-    129:129:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.rangesDelimitedBy$StringsKt__StringsKt(java.lang.CharSequence,char[],int,boolean,int):1143:1143 -> a
-    129:129:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.rangesDelimitedBy$StringsKt__StringsKt$default(java.lang.CharSequence,char[],int,boolean,int,int,java.lang.Object):1140 -> a
-    129:129:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.splitToSequence(java.lang.CharSequence,char[],boolean,int):1218 -> a
-    129:129:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.splitToSequence$default(java.lang.CharSequence,char[],boolean,int,int,java.lang.Object):1217 -> a
-    129:129:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace(java.lang.String,char,char,boolean):64 -> a
-    129:129:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):60 -> a
-    129:129:java.lang.String replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):0 -> a
-    130:130:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.splitToSequence(java.lang.CharSequence,char[],boolean,int):1218:1218 -> a
-    130:130:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.splitToSequence$default(java.lang.CharSequence,char[],boolean,int,int,java.lang.Object):1217 -> a
-    130:130:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace(java.lang.String,char,char,boolean):64 -> a
-    130:130:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):60 -> a
-    130:130:java.lang.String replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):0 -> a
-    131:990:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.map(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):0:859 -> a
-    131:990:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt.map(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):0 -> a
-    131:990:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.splitToSequence(java.lang.CharSequence,char[],boolean,int):1218 -> a
-    131:990:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.splitToSequence$default(java.lang.CharSequence,char[],boolean,int,int,java.lang.Object):1217 -> a
-    131:990:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace(java.lang.String,char,char,boolean):64 -> a
-    131:990:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):60 -> a
-    131:990:java.lang.String replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):0 -> a
-    991:991:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace(java.lang.String,char,char,boolean):64:64 -> a
-    991:991:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):60 -> a
-    991:991:java.lang.String replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):0 -> a
-    992:2730:java.lang.String com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.joinToString(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):0:1738 -> a
-    992:2730:java.lang.String com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.joinToString$default(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):1737 -> a
-    992:2730:java.lang.String com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt.joinToString$default(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):0 -> a
-    992:2730:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace(java.lang.String,char,char,boolean):64 -> a
-    992:2730:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):60 -> a
-    992:2730:java.lang.String replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):0 -> a
-    2731:4454:java.lang.Appendable com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.joinTo(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.Appendable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):0:1723 -> a
-    2731:4454:java.lang.String com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.joinToString(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1738 -> a
-    2731:4454:java.lang.String com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.joinToString$default(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):1737 -> a
-    2731:4454:java.lang.String com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt.joinToString$default(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):0 -> a
-    2731:4454:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace(java.lang.String,char,char,boolean):64 -> a
-    2731:4454:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):60 -> a
-    2731:4454:java.lang.String replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):0 -> a
-    4455:4455:java.lang.String com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.joinToString(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1738:1738 -> a
-    4455:4455:java.lang.String com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.joinToString$default(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):1737 -> a
-    4455:4455:java.lang.String com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt.joinToString$default(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):0 -> a
-    4455:4455:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace(java.lang.String,char,char,boolean):64 -> a
-    4455:4455:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):60 -> a
-    4455:4455:java.lang.String replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):0 -> a
-    4456:4456:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.startsWith$default(java.lang.String,java.lang.String,boolean,int,java.lang.Object):195:195 -> a
-    4456:4456:boolean startsWith$default(java.lang.String,java.lang.String,boolean,int,java.lang.Object):0 -> a
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__RegexExtensionsJVMKt -> com.android.tools.r8.internal.OD:
+    63:63:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.contains(java.lang.CharSequence,char,boolean):0:0 -> a
+    63:63:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.contains$default(java.lang.CharSequence,char,boolean,int,java.lang.Object):1059 -> a
+    64:1056:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.indexOf(java.lang.CharSequence,char,int,boolean):0:992 -> a
+    64:1056:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.indexOf$default(java.lang.CharSequence,char,int,boolean,int,java.lang.Object):988 -> a
+    64:1056:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.contains(java.lang.CharSequence,char,boolean):1060 -> a
+    64:1056:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.contains$default(java.lang.CharSequence,char,boolean,int,java.lang.Object):1059 -> a
+    1057:1057:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.indexOf(java.lang.CharSequence,char,int,boolean):990:990 -> a
+    1057:1057:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.indexOf$default(java.lang.CharSequence,char,int,boolean,int,java.lang.Object):988 -> a
+    1057:1057:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.contains(java.lang.CharSequence,char,boolean):1060 -> a
+    1057:1057:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.contains$default(java.lang.CharSequence,char,boolean,int,java.lang.Object):1059 -> a
+    1058:1122:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace(java.lang.String,char,char,boolean):0:64 -> a
+    1058:1122:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):60 -> a
+    1058:1122:java.lang.String replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):0 -> a
+    1123:1123:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.splitToSequence(java.lang.CharSequence,char[],boolean,int):0:0 -> a
+    1123:1123:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.splitToSequence$default(java.lang.CharSequence,char[],boolean,int,int,java.lang.Object):1217 -> a
+    1123:1123:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace(java.lang.String,char,char,boolean):64 -> a
+    1123:1123:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):60 -> a
+    1123:1123:java.lang.String replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):0 -> a
+    1124:1124:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.rangesDelimitedBy$StringsKt__StringsKt(java.lang.CharSequence,char[],int,boolean,int):1143:1143 -> a
+    1124:1124:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.rangesDelimitedBy$StringsKt__StringsKt$default(java.lang.CharSequence,char[],int,boolean,int,int,java.lang.Object):1140 -> a
+    1124:1124:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.splitToSequence(java.lang.CharSequence,char[],boolean,int):1218 -> a
+    1124:1124:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.splitToSequence$default(java.lang.CharSequence,char[],boolean,int,int,java.lang.Object):1217 -> a
+    1124:1124:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace(java.lang.String,char,char,boolean):64 -> a
+    1124:1124:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):60 -> a
+    1124:1124:java.lang.String replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):0 -> a
+    1125:1125:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.splitToSequence(java.lang.CharSequence,char[],boolean,int):1218:1218 -> a
+    1125:1125:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.splitToSequence$default(java.lang.CharSequence,char[],boolean,int,int,java.lang.Object):1217 -> a
+    1125:1125:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace(java.lang.String,char,char,boolean):64 -> a
+    1125:1125:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):60 -> a
+    1125:1125:java.lang.String replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):0 -> a
+    1126:1985:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.map(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):0:859 -> a
+    1126:1985:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt.map(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):0 -> a
+    1126:1985:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.splitToSequence(java.lang.CharSequence,char[],boolean,int):1218 -> a
+    1126:1985:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.splitToSequence$default(java.lang.CharSequence,char[],boolean,int,int,java.lang.Object):1217 -> a
+    1126:1985:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace(java.lang.String,char,char,boolean):64 -> a
+    1126:1985:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):60 -> a
+    1126:1985:java.lang.String replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):0 -> a
+    1986:1986:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace(java.lang.String,char,char,boolean):64:64 -> a
+    1986:1986:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):60 -> a
+    1986:1986:java.lang.String replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):0 -> a
+    1987:3725:java.lang.String com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.joinToString(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):0:1738 -> a
+    1987:3725:java.lang.String com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.joinToString$default(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):1737 -> a
+    1987:3725:java.lang.String com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt.joinToString$default(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):0 -> a
+    1987:3725:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace(java.lang.String,char,char,boolean):64 -> a
+    1987:3725:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):60 -> a
+    1987:3725:java.lang.String replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):0 -> a
+    3726:5449:java.lang.Appendable com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.joinTo(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.Appendable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):0:1723 -> a
+    3726:5449:java.lang.String com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.joinToString(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1738 -> a
+    3726:5449:java.lang.String com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.joinToString$default(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):1737 -> a
+    3726:5449:java.lang.String com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt.joinToString$default(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):0 -> a
+    3726:5449:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace(java.lang.String,char,char,boolean):64 -> a
+    3726:5449:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):60 -> a
+    3726:5449:java.lang.String replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):0 -> a
+    5450:5450:java.lang.String com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.joinToString(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1738:1738 -> a
+    5450:5450:java.lang.String com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.joinToString$default(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):1737 -> a
+    5450:5450:java.lang.String com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt.joinToString$default(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):0 -> a
+    5450:5450:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace(java.lang.String,char,char,boolean):64 -> a
+    5450:5450:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):60 -> a
+    5450:5450:java.lang.String replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):0 -> a
+    5451:5453:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.startsWith(java.lang.String,java.lang.String,boolean):197:199 -> a
+    5454:5846:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.regionMatches(java.lang.String,int,java.lang.String,int,int,boolean):0:392 -> a
+    5454:5846:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.startsWith(java.lang.String,java.lang.String,boolean):199 -> a
+    5847:5847:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.getLastIndex(java.lang.CharSequence):317:317 -> a
+    5848:5848:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.indexOfAny(java.lang.CharSequence,char[],int,boolean):835:835 -> a
+    5849:8227:char com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.single(char[]):0:2378 -> a
+    5849:8227:char com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt.single(char[]):0 -> a
+    5849:8227:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.indexOfAny(java.lang.CharSequence,char[],int,boolean):836 -> a
+    8228:8228:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.indexOfAny(java.lang.CharSequence,char[],int,boolean):837:837 -> a
+    8229:8229:char com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.single(char[]):2379:2379 -> a
+    8229:8229:char com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt.single(char[]):0 -> a
+    8229:8229:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.indexOfAny(java.lang.CharSequence,char[],int,boolean):836 -> a
+    8230:8230:char com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.single(char[]):2377:2377 -> a
+    8230:8230:char com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt.single(char[]):0 -> a
+    8230:8230:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.indexOfAny(java.lang.CharSequence,char[],int,boolean):836 -> a
+    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.BC:
 # {"id":"sourceFile","fileName":"RegexExtensionsJVM.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringBuilderJVMKt -> com.android.tools.r8.internal.PD:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringBuilderJVMKt -> com.android.tools.r8.internal.CC:
 # {"id":"sourceFile","fileName":"StringBuilderJVM.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringNumberConversionsJVMKt -> com.android.tools.r8.internal.QD:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringNumberConversionsJVMKt -> com.android.tools.r8.internal.DC:
 # {"id":"sourceFile","fileName":"StringNumberConversionsJVM.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt -> com.android.tools.r8.internal.RD:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt -> com.android.tools.r8.internal.EC:
 # {"id":"sourceFile","fileName":"StringsJVM.kt"}
-    1:3:boolean startsWith(java.lang.String,java.lang.String,boolean):197:199 -> a
-    4:396:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.regionMatches(java.lang.String,int,java.lang.String,int,int,boolean):0:392 -> a
-    4:396:boolean startsWith(java.lang.String,java.lang.String,boolean):199 -> a
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$rangesDelimitedBy$2 -> com.android.tools.r8.internal.SD:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$rangesDelimitedBy$2 -> com.android.tools.r8.internal.FC:
 # {"id":"sourceFile","fileName":"Strings.kt"}
     char[] $delimiters -> a
     boolean $ignoreCase -> b
@@ -56806,7 +57268,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.TD:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$splitToSequence$2 -> com.android.tools.r8.internal.GC:
 # {"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
@@ -56828,34 +57290,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.UD:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt___StringsJvmKt -> com.android.tools.r8.internal.HC:
 # {"id":"sourceFile","fileName":"_StringsJvm.kt"}
-    1:1:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.contains(java.lang.CharSequence,char,boolean):0:0 -> a
-    1:1:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.contains$default(java.lang.CharSequence,char,boolean,int,java.lang.Object):1059 -> a
-    2:994:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.indexOf(java.lang.CharSequence,char,int,boolean):0:992 -> a
-    2:994:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.indexOf$default(java.lang.CharSequence,char,int,boolean,int,java.lang.Object):988 -> a
-    2:994:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.contains(java.lang.CharSequence,char,boolean):1060 -> a
-    2:994:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.contains$default(java.lang.CharSequence,char,boolean,int,java.lang.Object):1059 -> a
-    995:995:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.indexOf(java.lang.CharSequence,char,int,boolean):990:990 -> a
-    995:995:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.indexOf$default(java.lang.CharSequence,char,int,boolean,int,java.lang.Object):988 -> a
-    995:995:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.contains(java.lang.CharSequence,char,boolean):1060 -> a
-    995:995:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.contains$default(java.lang.CharSequence,char,boolean,int,java.lang.Object):1059 -> a
-    996:996:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.getLastIndex(java.lang.CharSequence):317:317 -> a
-    997:997:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.indexOfAny(java.lang.CharSequence,char[],int,boolean):835:835 -> a
-    998:3376:char com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.single(char[]):0:2378 -> a
-    998:3376:char com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt.single(char[]):0 -> a
-    998:3376:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.indexOfAny(java.lang.CharSequence,char[],int,boolean):836 -> a
-    3377:3377:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.indexOfAny(java.lang.CharSequence,char[],int,boolean):837:837 -> a
-    3378:3378:char com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.single(char[]):2379:2379 -> a
-    3378:3378:char com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt.single(char[]):0 -> a
-    3378:3378:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.indexOfAny(java.lang.CharSequence,char[],int,boolean):836 -> a
-    3379:3379:char com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.single(char[]):2377:2377 -> a
-    3379:3379:char com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt.single(char[]):0 -> a
-    3379:3379:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.indexOfAny(java.lang.CharSequence,char[],int,boolean):836 -> a
-    3380:3961:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.indexOfAny(java.lang.CharSequence,char[],int,boolean):840:1421 -> a
-    3962:3963:boolean com.android.tools.r8.jetbrains.kotlin.text.CharsKt__CharKt.equals(char,char,boolean):35:36 -> a
-    3962:3963:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.indexOfAny(java.lang.CharSequence,char[],int,boolean):842 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.Flag -> com.android.tools.r8.internal.Bc:
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag -> com.android.tools.r8.internal.Ub:
 # {"id":"sourceFile","fileName":"Flag.kt"}
     int bitWidth -> b
     int value -> c
@@ -56866,38 +57303,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.Bc$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$Type -> com.android.tools.r8.internal.Ub$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.Bc$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$TypeParameter -> com.android.tools.r8.internal.Ub$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.Bc$c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$ValueParameter -> com.android.tools.r8.internal.Ub$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.FlagsKt -> com.android.tools.r8.internal.Jc:
-# {"id":"sourceFile","fileName":"Flags.kt"}
-    1:1:int flagsOf(com.android.tools.r8.jetbrains.kotlinx.metadata.Flag[]):27:27 -> a
-    2:2:int flagsOf(com.android.tools.r8.jetbrains.kotlinx.metadata.Flag[]):24:24 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException -> com.android.tools.r8.internal.pf:
+com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException -> com.android.tools.r8.internal.Be:
 # {"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.Ek:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation -> com.android.tools.r8.internal.Jj:
 # {"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.Fk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument -> com.android.tools.r8.internal.Kj:
 # {"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.Fk$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$AnnotationValue -> com.android.tools.r8.internal.Kj$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>
@@ -56911,12 +57344,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.Fk$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ArrayValue -> com.android.tools.r8.internal.Kj$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.Fk$c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$BooleanValue -> com.android.tools.r8.internal.Kj$c:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     boolean value -> a
     1:1:void <init>(boolean):38:38 -> <init>
@@ -56933,7 +57366,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.Fk$d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ByteValue -> com.android.tools.r8.internal.Kj$d:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     byte value -> a
     1:1:void <init>(byte):31:31 -> <init>
@@ -56950,7 +57383,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.Fk$e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$CharValue -> com.android.tools.r8.internal.Kj$e:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     char value -> a
     1:1:void <init>(char):32:32 -> <init>
@@ -56967,7 +57400,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.Fk$f:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$DoubleValue -> com.android.tools.r8.internal.Kj$f:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     double value -> a
     1:1:void <init>(double):37:37 -> <init>
@@ -56984,14 +57417,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.Fk$g:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$EnumValue -> com.android.tools.r8.internal.Kj$g:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     java.lang.String enumClassName -> a
     java.lang.String enumEntryName -> b
     1:1:void <init>(java.lang.String,java.lang.String):47:47 -> <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.Fk$h:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$FloatValue -> com.android.tools.r8.internal.Kj$h:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     float value -> a
     1:1:void <init>(float):36:36 -> <init>
@@ -57008,7 +57441,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.Fk$i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$IntValue -> com.android.tools.r8.internal.Kj$i:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     int value -> a
     1:1:void <init>(int):34:34 -> <init>
@@ -57025,7 +57458,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.Fk$j:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$KClassValue -> com.android.tools.r8.internal.Kj$j:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     java.lang.String value -> a
     1:1:void <init>(java.lang.String):46:46 -> <init>
@@ -57039,7 +57472,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.Fk$k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$LongValue -> com.android.tools.r8.internal.Kj$k:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     long value -> a
     1:1:void <init>(long):35:35 -> <init>
@@ -57056,7 +57489,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.Fk$l:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ShortValue -> com.android.tools.r8.internal.Kj$l:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     short value -> a
     1:1:void <init>(short):33:33 -> <init>
@@ -57073,7 +57506,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.Fk$m:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$StringValue -> com.android.tools.r8.internal.Kj$m:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     java.lang.String value -> a
     1:1:void <init>(java.lang.String):45:45 -> <init>
@@ -57087,7 +57520,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.Fk$n:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UByteValue -> com.android.tools.r8.internal.Kj$n:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     byte value -> a
     1:1:void <init>(byte):40:40 -> <init>
@@ -57104,7 +57537,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.Fk$o:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UIntValue -> com.android.tools.r8.internal.Kj$o:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     int value -> a
     1:1:void <init>(int):42:42 -> <init>
@@ -57121,7 +57554,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.Fk$p:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ULongValue -> com.android.tools.r8.internal.Kj$p:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     long value -> a
     1:1:void <init>(long):43:43 -> <init>
@@ -57138,7 +57571,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.Fk$q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UShortValue -> com.android.tools.r8.internal.Kj$q:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     short value -> a
     1:1:void <init>(short):41:41 -> <init>
@@ -57155,7 +57588,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.Gk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass -> com.android.tools.r8.internal.Lj:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List extensions -> o
     java.lang.String companionObject -> j
@@ -57234,9 +57667,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.Ik:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor -> com.android.tools.r8.internal.Nj:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor -> com.android.tools.r8.internal.Jk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor -> com.android.tools.r8.internal.Oj:
 # {"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>
@@ -57253,31 +57686,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.Kk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier -> com.android.tools.r8.internal.Pj:
 # {"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.Kk$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$Class -> com.android.tools.r8.internal.Pj$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.Kk$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$TypeAlias -> com.android.tools.r8.internal.Pj$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.Kk$c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$TypeParameter -> com.android.tools.r8.internal.Pj$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.Lk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstantValue -> com.android.tools.r8.internal.Qj:
 # {"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.Mk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor -> com.android.tools.r8.internal.Rj:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List valueParameters -> b
     java.util.List extensions -> d
@@ -57297,9 +57730,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.Ok:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorExtensionVisitor -> com.android.tools.r8.internal.Tj:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor -> com.android.tools.r8.internal.Pk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor -> com.android.tools.r8.internal.Uj:
 # {"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>
@@ -57308,7 +57741,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.Qk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract -> com.android.tools.r8.internal.Vj:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List effects -> b
     1:5:void <init>():758:762 -> <init>
@@ -57316,19 +57749,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.Rk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor -> com.android.tools.r8.internal.Wj:
 # {"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.Sk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer -> com.android.tools.r8.internal.Xj:
 # {"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.Tk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor -> com.android.tools.r8.internal.Yj:
 # {"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>
@@ -57336,7 +57769,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.Uk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect -> com.android.tools.r8.internal.Zj:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List constructorArguments -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression conclusion -> c
@@ -57351,7 +57784,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.Vk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression -> com.android.tools.r8.internal.ak:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.lang.Integer parameterIndex -> c
     java.util.List andArguments -> f
@@ -57374,7 +57807,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.Wk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor -> com.android.tools.r8.internal.bk:
 # {"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>
@@ -57385,21 +57818,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.Xk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind -> com.android.tools.r8.internal.ck:
 # {"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.Yk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType -> com.android.tools.r8.internal.dk:
 # {"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.Zk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor -> com.android.tools.r8.internal.ek:
 # {"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>
@@ -57407,7 +57840,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.bl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType -> com.android.tools.r8.internal.gk:
 # {"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>
@@ -57421,16 +57854,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.cl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor -> com.android.tools.r8.internal.hk:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound -> com.android.tools.r8.internal.dl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound -> com.android.tools.r8.internal.ik:
 # {"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.el:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction -> com.android.tools.r8.internal.jk:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List typeParameters -> b
     java.util.List versionRequirements -> f
@@ -57467,9 +57900,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.gl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionExtensionVisitor -> com.android.tools.r8.internal.lk:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor -> com.android.tools.r8.internal.hl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor -> com.android.tools.r8.internal.mk:
 # {"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>
@@ -57482,19 +57915,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.il:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda -> com.android.tools.r8.internal.nk:
 # {"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.jl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor -> com.android.tools.r8.internal.ok:
 # {"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.kl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage -> com.android.tools.r8.internal.pk:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List functions -> b
     java.util.List extensions -> e
@@ -57534,9 +57967,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.ml:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor -> com.android.tools.r8.internal.rk:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor -> com.android.tools.r8.internal.nl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor -> com.android.tools.r8.internal.sk:
 # {"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>
@@ -57544,7 +57977,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.ol:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty -> com.android.tools.r8.internal.tk:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List typeParameters -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter setterParameter -> d
@@ -57581,9 +58014,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.ql:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor -> com.android.tools.r8.internal.vk:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor -> com.android.tools.r8.internal.rl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor -> com.android.tools.r8.internal.wk:
 # {"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>
@@ -57595,7 +58028,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.sl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmType -> com.android.tools.r8.internal.xk:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound flexibleTypeUpperBound -> f
     int flags -> h
@@ -57633,7 +58066,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.tl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias -> com.android.tools.r8.internal.yk:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List typeParameters -> b
     java.lang.String name -> h
@@ -57659,7 +58092,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.ul:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor -> com.android.tools.r8.internal.zk:
 # {"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>
@@ -57670,9 +58103,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.wl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor -> com.android.tools.r8.internal.Bk:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter -> com.android.tools.r8.internal.xl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter -> com.android.tools.r8.internal.Ck:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List upperBounds -> b
     java.util.List extensions -> c
@@ -57694,9 +58127,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.zl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor -> com.android.tools.r8.internal.Ek:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor -> com.android.tools.r8.internal.Al:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor -> com.android.tools.r8.internal.Fk:
 # {"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>
@@ -57704,7 +58137,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.Bl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection -> com.android.tools.r8.internal.Gk:
 # {"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
@@ -57715,7 +58148,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.Cl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor -> com.android.tools.r8.internal.Hk:
 # {"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>
@@ -57730,7 +58163,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.Dl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter -> com.android.tools.r8.internal.Ik:
 # {"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
@@ -57744,7 +58177,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.El:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor -> com.android.tools.r8.internal.Jk:
 # {"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>
@@ -57752,13 +58185,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.Fl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance -> com.android.tools.r8.internal.Kk:
 # {"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.Gl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersion -> com.android.tools.r8.internal.Lk:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     int minor -> b
     int patch -> c
@@ -57768,7 +58201,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.Hl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement -> com.android.tools.r8.internal.Mk:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.lang.Integer errorCode -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel level -> c
@@ -57783,21 +58216,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.Il:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel -> com.android.tools.r8.internal.Nk:
 # {"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.Jl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind -> com.android.tools.r8.internal.Ok:
 # {"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.Kl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor -> com.android.tools.r8.internal.Pk:
 # {"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>
@@ -57805,10 +58238,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.NodesKt -> com.android.tools.r8.internal.Es:
-# {"id":"sourceFile","fileName":"nodes.kt"}
-    1:1:java.lang.Object addTo(java.lang.Object,java.util.Collection):971:971 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter -> com.android.tools.r8.internal.i7:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter -> com.android.tools.r8.internal.T6:
 # {"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>
@@ -57846,63 +58276,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.a7:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitConstructor$1 -> com.android.tools.r8.internal.L6:
 # {"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.b7:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitExtensions$1 -> com.android.tools.r8.internal.M6:
 # {"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.c7:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitFunction$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: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.d7:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitProperty$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: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.e7:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitSupertype$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: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.f7:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeAlias$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: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.g7:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeParameter$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: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.h7:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitVersionRequirement$1 -> com.android.tools.r8.internal.S6:
 # {"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.Zn:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter -> com.android.tools.r8.internal.en:
 # {"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>
@@ -57913,14 +58343,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.Yn:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter$visitFunction$1 -> com.android.tools.r8.internal.dn:
 # {"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.Uu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter -> com.android.tools.r8.internal.Nt:
 # {"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>
@@ -57937,35 +58367,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.Qu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitExtensions$1 -> com.android.tools.r8.internal.Jt:
 # {"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.Ru:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitFunction$1 -> com.android.tools.r8.internal.Kt:
 # {"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.Su:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitProperty$1 -> com.android.tools.r8.internal.Lt:
 # {"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.Tu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitTypeAlias$1 -> com.android.tools.r8.internal.Mt:
 # {"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.Ay:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext -> com.android.tools.r8.internal.sx:
 # {"id":"sourceFile","fileName":"readers.kt"}
     java.util.List extensions -> a
     java.util.Map typeParameterNameToId -> b
@@ -57982,300 +58412,310 @@
     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.By:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadUtilsKt -> com.android.tools.r8.internal.tx:
 # {"id":"sourceFile","fileName":"readUtils.kt"}
-    1:52:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):18:69 -> a
-    53:53:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):68:68 -> a
-    54:55:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):20:21 -> a
-    56:56:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.TuplesKt.to(java.lang.Object,java.lang.Object):43:43 -> a
-    56:56:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):21 -> a
-    57:57:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):68:68 -> a
-    58:58:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):23:23 -> a
-    59:59:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):17:17 -> a
-    60:65:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):27:32 -> a
-    66:66:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):31:31 -> a
-    67:67:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):30:30 -> a
-    68:90:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):29:51 -> a
-    91:122:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):50:81 -> a
-    123:123:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):80:80 -> a
-    124:155:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):50:50 -> a
-    156:156:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):49:49 -> a
-    157:157:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):48:48 -> a
-    158:158:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):47:47 -> a
-    159:159:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):46:46 -> a
-    160:160:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):45:45 -> a
-    161:161:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):44:44 -> a
-    162:162:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):43:43 -> a
-    163:163:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):42:42 -> a
-    164:164:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):41:41 -> a
-    165:165:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):40:40 -> a
-    166:166:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):39:39 -> a
-    167:167:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):38:38 -> a
-    168:168:java.lang.String getClassName(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,int):56:56 -> a
-    169:169:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver.getQualifiedClassName(int):72:72 -> a
-    169:169:java.lang.String getClassName(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,int):56 -> a
-    170:170:java.lang.String getClassName(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,int):57:57 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt -> com.android.tools.r8.internal.Cy:
-# {"id":"sourceFile","fileName":"readers.kt"}
-    1:1:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):41:41 -> a
-    2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext.<init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):18:18 -> a
-    2:2:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):41 -> a
-    3:398:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):42:437 -> a
-    399:399:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):436:436 -> a
-    400:400:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):435:435 -> a
-    401:401:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeParameterFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter):423:423 -> a
-    401:401:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.access$getTypeParameterFlags$p(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter):1 -> a
-    401:401:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):440 -> a
-    402:402:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):440:440 -> a
-    403:796:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):47:440 -> a
-    797:797:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):434:434 -> a
-    798:798:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):50:50 -> a
-    799:912:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.supertypes(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:113 -> a
-    799:912:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):50 -> a
-    913:913:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.supertypes(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):24:24 -> a
-    913:913:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):50 -> a
-    914:919:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):50:55 -> a
-    920:929:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):132:141 -> a
-    920:929:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):55 -> a
-    930:1017:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readConstructorExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):0:87 -> a
-    930:1017:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):141 -> a
-    930:1017:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):55 -> a
-    1018:1074:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignatureKt.wrapAsPublic(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method):0:56 -> a
-    1018:1074:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readConstructorExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):87 -> a
-    1018:1074:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):141 -> a
-    1018:1074:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):55 -> a
-    1075:1075:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readConstructorExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):87:87 -> a
-    1075:1075:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):141 -> a
-    1075:1075:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):55 -> a
-    1076:1076:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):144:144 -> a
-    1076:1076:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):55 -> a
-    1077:1091:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):58:72 -> a
-    1092:1092:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):70:70 -> a
-    1093:1093:void com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException.<init>(java.lang.String,java.lang.Throwable,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):8:8 -> a
-    1093:1093:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):70 -> a
-    1094:1108:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):70:84 -> a
-    1109:1137:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readClassExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):0:28 -> a
-    1109:1137:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):84 -> a
-    1138:1145:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readClassExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):27:34 -> a
-    1138:1145:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):84 -> a
-    1146:1146:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):87:87 -> a
-    1147:1147:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):91:91 -> a
-    1148:1148:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext.<init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):18:18 -> a
-    1148:1148:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):91 -> a
-    1149:1152:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):93:96 -> a
-    1153:1195:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readPackageExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):0:42 -> a
-    1153:1195:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):96 -> a
-    1196:1203:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readPackageExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):41:48 -> a
-    1196:1203:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):96 -> a
-    1204:1204:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):99:99 -> a
-    1205:1211:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):108:114 -> a
-    1212:1218:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):113:119 -> a
-    1219:1467:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):213:461 -> a
-    1219:1467:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):119 -> a
-    1468:1468:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):460:460 -> a
-    1468:1468:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):119 -> a
-    1469:1469:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):459:459 -> a
-    1469:1469:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):119 -> a
-    1470:1470:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeParameterFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter):423:423 -> a
-    1470:1470:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.access$getTypeParameterFlags$p(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter):1 -> a
-    1470:1470:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):464 -> a
-    1470:1470:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):119 -> a
-    1471:1471:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):464:464 -> a
-    1471:1471:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):119 -> a
-    1472:1720:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):216:464 -> a
-    1472:1720:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):119 -> a
-    1721:1721:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):458:458 -> a
-    1721:1721:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):119 -> a
-    1722:1722:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):219:219 -> a
-    1722:1722:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):119 -> a
-    1723:1818:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.underlyingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:95 -> a
-    1723:1818:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):219 -> a
-    1723:1818:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):119 -> a
-    1819:1822:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):220:223 -> a
-    1819:1822:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):119 -> a
-    1823:1924:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.expandedType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:101 -> a
-    1823:1924:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):223 -> a
-    1823:1924:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):119 -> a
-    1925:1936:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):224:235 -> a
-    1925:1936:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):119 -> a
-    1937:1937:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.expandedType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):102:102 -> a
-    1937:1937:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):223 -> a
-    1937:1937:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):119 -> a
-    1938:1938:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.underlyingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):96:96 -> a
-    1938:1938:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):219 -> a
-    1938:1938:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):119 -> a
-    1939:1939:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):124:124 -> a
-    1940:1940: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
-    1940:1940:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):124 -> a
-    1941:1941:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext.<init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):18:18 -> a
-    1941:1941:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):124 -> a
-    1942:1944:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):126:128 -> a
-    1945:2242:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):148:445 -> a
-    2243:2243:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):444:444 -> a
-    2244:2244:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):443:443 -> a
-    2245:2245:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeParameterFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter):423:423 -> a
-    2245:2245:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.access$getTypeParameterFlags$p(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter):1 -> a
-    2245:2245:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):448 -> a
-    2246:2246:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):448:448 -> a
-    2247:2544:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):151:448 -> a
-    2545:2545:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):442:442 -> a
-    2546:2546:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):154:154 -> a
-    2547:2548:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):419:420 -> a
-    2547:2548:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):155 -> a
-    2549:2561:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):155:167 -> a
-    2562:2568:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):354:360 -> a
-    2562:2568:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):167 -> a
-    2569:2569:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):359:359 -> a
-    2569:2569:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):167 -> a
-    2570:2578:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):358:366 -> a
-    2570:2578:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):167 -> a
-    2579:2579:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):365:365 -> a
-    2579:2579:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):167 -> a
-    2580:2585:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):364:369 -> a
-    2580:2585:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):167 -> a
-    2586:2594:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):376:384 -> a
-    2586:2594:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):369 -> a
-    2586:2594:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):167 -> a
-    2595:2595:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):363:363 -> a
-    2595:2595:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):167 -> a
-    2596:2611:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):357:372 -> a
-    2596:2611:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):167 -> a
-    2612:2617:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):170:175 -> a
-    2618:2671:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readFunctionExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):0:53 -> a
-    2618:2671:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):175 -> a
-    2672:2728:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignatureKt.wrapAsPublic(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method):0:56 -> a
-    2672:2728:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readFunctionExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):53 -> a
-    2672:2728:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):175 -> a
-    2729:2736:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readFunctionExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):53:60 -> a
-    2729:2736:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):175 -> a
-    2737:2737:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):178:178 -> a
-    2738:3009:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):182:453 -> a
-    3010:3010:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):452:452 -> a
-    3011:3011:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):451:451 -> a
-    3012:3012:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeParameterFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter):423:423 -> a
-    3012:3012:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.access$getTypeParameterFlags$p(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter):1 -> a
-    3012:3012:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):456 -> a
-    3013:3013:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):456:456 -> a
-    3014:3285:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):185:456 -> a
-    3286:3286:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):450:450 -> a
-    3287:3287:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):188:188 -> a
-    3288:3353:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.receiverType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:65 -> a
-    3288:3353:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):188 -> a
-    3354:3355:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):419:420 -> a
-    3354:3355:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):189 -> a
-    3356:3373:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):189:206 -> a
-    3374:3446:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readPropertyExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):0:72 -> a
-    3374:3446:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):206 -> a
-    3447:3504:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignatureKt.wrapAsPublic(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field):0:57 -> a
-    3447:3504:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readPropertyExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):73 -> a
-    3447:3504:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):206 -> a
-    3505:3506:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readPropertyExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):74:75 -> a
-    3505:3506:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):206 -> a
-    3507:3518:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readPropertyExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):71:82 -> a
-    3507:3518:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):206 -> a
-    3519:3519:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):209:209 -> a
-    3520:3524:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):239:243 -> a
-    3525:3602:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.varargElementType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:77 -> a
-    3525:3602:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):243 -> a
-    3603:3604:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):419:420 -> a
-    3603:3604:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):244 -> a
-    3605:3608:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):244:247 -> a
-    3609:3609:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):264:264 -> a
-    3609:3609:void access$accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):1 -> a
-    3610:3727:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.upperBounds(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:117 -> a
-    3610:3727:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):264 -> a
-    3610:3727:void access$accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):1 -> a
-    3728:3728:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.upperBounds(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):39:39 -> a
-    3728:3728:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):264 -> a
-    3728:3728:void access$accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):1 -> a
-    3729:3734:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):264:269 -> a
-    3729:3734:void access$accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):1 -> a
-    3735:3830:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):0:95 -> a
-    3735:3830:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):269 -> a
-    3735:3830:void access$accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):1 -> a
-    3831:3831:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):272:272 -> a
-    3831:3831:void access$accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):1 -> a
-    3832:3850:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):277:295 -> a
-    3851:3851:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):294:294 -> a
-    3852:3852:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):293:293 -> a
-    3853:3860:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):292:299 -> a
-    3861:3889:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.type(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:28 -> a
-    3861:3889:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):299 -> a
-    3890:3891:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):419:420 -> a
-    3890:3891:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):301 -> a
-    3892:3892:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):301:301 -> a
-    3893:3893:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):300:300 -> a
-    3894:3894:void com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException.<init>(java.lang.String,java.lang.Throwable,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):8:8 -> a
-    3894:3894:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):300 -> a
-    3895:3898:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):300:303 -> a
-    3899:3915:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):291:307 -> a
-    3916:4005:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.abbreviatedType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:89 -> a
-    3916:4005:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):307 -> a
-    4006:4007:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):419:420 -> a
-    4006:4007:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):308 -> a
-    4008:4011:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):308:311 -> a
-    4012:4095:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.outerType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:83 -> a
-    4012:4095:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):311 -> a
-    4096:4097:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):419:420 -> a
-    4096:4097:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):312 -> a
-    4098:4101:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):312:315 -> a
-    4102:4136:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.flexibleUpperBound(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:34 -> a
-    4102:4136:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):315 -> a
-    4137:4138:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):419:420 -> a
-    4137:4138:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):317 -> a
-    4139:4139:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):318:318 -> a
-    4140:4147:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):316:323 -> a
-    4148:4252:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readTypeExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):0:104 -> a
-    4148:4252:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):323 -> a
-    4253:4253:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):326:326 -> a
-    4254:4258:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):282:286 -> a
-    4259:4259:void com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException.<init>(java.lang.String,java.lang.Throwable,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):8:8 -> a
-    4259:4259:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):286 -> a
-    4260:4260:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):286:286 -> a
-    4261:4261:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):330:330 -> a
-    4262:4364:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable):0:102 -> a
-    4262:4364:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):330 -> a
-    4365:4369:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version$Companion.decode(java.lang.Integer,java.lang.Integer):65:65 -> a
-    4365:4369:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable):100 -> a
-    4365:4369:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):330 -> a
-    4374:4378:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version$Companion.decode(java.lang.Integer,java.lang.Integer):70:70 -> a
-    4374:4378:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable):100 -> a
-    4374:4378:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):330 -> a
-    4383:4383:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version$Companion.decode(java.lang.Integer,java.lang.Integer):75:75 -> a
-    4383:4383:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable):100 -> a
-    4383:4383:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):330 -> a
-    4384:4387:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable):105:108 -> a
-    4384:4387:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):330 -> a
-    4388:4388:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable):107:107 -> a
-    4388:4388:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):330 -> a
-    4389:4398:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable):106:115 -> a
-    4389:4398:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):330 -> a
-    4399:4399:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable):105:105 -> a
-    4399:4399:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):330 -> a
-    4400:4403:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):333:336 -> a
-    4404:4404:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):335:335 -> a
-    4405:4413:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):334:342 -> a
-    4414:4414:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):341:341 -> a
-    4415:4425:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):340:350 -> a
-    4426:4426:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):331:331 -> a
-    4427:4427:void com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException.<init>(java.lang.String,java.lang.Throwable,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):8:8 -> a
-    4427:4427:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):331 -> a
-    4428:4428:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):331:331 -> a
-    4429:4430:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):389:390 -> a
-    4431:4441:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):388:398 -> a
-    4442:4442:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):397:397 -> a
-    4443:4443:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):396:396 -> a
-    4444:4453:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):394:403 -> a
-    4454:4561:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.isInstanceType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:107 -> a
-    4454:4561:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):403 -> a
-    4562:4563:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):419:420 -> a
-    4562:4563:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):404 -> a
-    4564:4575:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):404:415 -> a
-    4576:4577:int getTypeFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):419:420 -> a
-    4578:4578:int getPropertyGetterFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):426:426 -> a
-    4579:4579:int getDefaultPropertyAccessorFlags(int):432:432 -> a
-    1:1:int 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.uH:
+    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
+    2:2:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.startsWith$default(java.lang.String,java.lang.String,boolean,int,java.lang.Object):195:195 -> a
+    2:2:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt.startsWith$default(java.lang.String,java.lang.String,boolean,int,java.lang.Object):0 -> a
+    2:2:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.ClassNameKt.isLocal(java.lang.String):22 -> a
+    2:2: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
+    3:5: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):110:112 -> a
+    6:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteUtilsKt.writeAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):17:22 -> a
+    12:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteUtilsKt.writeAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):20:20 -> a
+    13:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteUtilsKt.writeAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):17:17 -> a
+    14:65:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):18:69 -> a
+    66:66:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):68:68 -> a
+    67:68:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):20:21 -> a
+    69:69:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.TuplesKt.to(java.lang.Object,java.lang.Object):43:43 -> a
+    69:69:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):21 -> a
+    70:70:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):68:68 -> a
+    71:71:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):23:23 -> a
+    72:72:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):17:17 -> a
+    73:78:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):27:32 -> a
+    79:79:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):31:31 -> a
+    80:80:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):30:30 -> a
+    81:103:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):29:51 -> a
+    104:135:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):50:81 -> a
+    136:136:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):80:80 -> a
+    137:168:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):50:50 -> a
+    169:169:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):49:49 -> a
+    170:170:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):48:48 -> a
+    171:171:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):47:47 -> a
+    172:172:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):46:46 -> a
+    173:173:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):45:45 -> a
+    174:174:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):44:44 -> a
+    175:175:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):43:43 -> a
+    176:176:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):42:42 -> a
+    177:177:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):41:41 -> a
+    178:178:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):40:40 -> a
+    179:179:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):39:39 -> a
+    180:180:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):38:38 -> a
+    181:256:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteUtilsKt.writeAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):28:28 -> a
+    257:257:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):41:41 -> a
+    258:258:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext.<init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):18:18 -> a
+    258:258:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):41 -> a
+    259:654:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):42:437 -> a
+    655:655:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):436:436 -> a
+    656:656:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):435:435 -> a
+    657:657:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeParameterFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter):423:423 -> a
+    657:657:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.access$getTypeParameterFlags$p(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter):1 -> a
+    657:657:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):440 -> a
+    658:658:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):440:440 -> a
+    659:1052:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):47:440 -> a
+    1053:1053:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):434:434 -> a
+    1054:1054:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):50:50 -> a
+    1055:1168:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.supertypes(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:113 -> a
+    1055:1168:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):50 -> a
+    1169:1169:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.supertypes(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):24:24 -> a
+    1169:1169:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):50 -> a
+    1170:1175:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):50:55 -> a
+    1176:1185:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):132:141 -> a
+    1176:1185:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):55 -> a
+    1186:1273:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readConstructorExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):0:87 -> a
+    1186:1273:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):141 -> a
+    1186:1273:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):55 -> a
+    1274:1330:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignatureKt.wrapAsPublic(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method):0:56 -> a
+    1274:1330:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readConstructorExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):87 -> a
+    1274:1330:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):141 -> a
+    1274:1330:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):55 -> a
+    1331:1331:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readConstructorExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):87:87 -> a
+    1331:1331:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):141 -> a
+    1331:1331:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):55 -> a
+    1332:1332:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):144:144 -> a
+    1332:1332:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):55 -> a
+    1333:1347:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):58:72 -> a
+    1348:1348:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):70:70 -> a
+    1349:1349:void com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException.<init>(java.lang.String,java.lang.Throwable,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):8:8 -> a
+    1349:1349:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):70 -> a
+    1350:1364:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):70:84 -> a
+    1365:1393:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readClassExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):0:28 -> a
+    1365:1393:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):84 -> a
+    1394:1401:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readClassExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):27:34 -> a
+    1394:1401:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):84 -> a
+    1402:1402:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):87:87 -> a
+    1403:1403:java.lang.String getClassName(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,int):56:56 -> a
+    1404:1404:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver.getQualifiedClassName(int):72:72 -> a
+    1404:1404:java.lang.String getClassName(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,int):56 -> a
+    1405:1405:java.lang.String getClassName(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,int):57:57 -> a
+    1406:1406:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):91:91 -> a
+    1407:1407:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext.<init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):18:18 -> a
+    1407:1407:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):91 -> a
+    1408:1411:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):93:96 -> a
+    1412:1454:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readPackageExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):0:42 -> a
+    1412:1454:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):96 -> a
+    1455:1462:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readPackageExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):41:48 -> a
+    1455:1462:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):96 -> a
+    1463:1463:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):99:99 -> a
+    1464:1470:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):108:114 -> a
+    1471:1477:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):113:119 -> a
+    1478:1726:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):213:461 -> a
+    1478:1726:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):119 -> a
+    1727:1727:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):460:460 -> a
+    1727:1727:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):119 -> a
+    1728:1728:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):459:459 -> a
+    1728:1728:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):119 -> a
+    1729:1729:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeParameterFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter):423:423 -> a
+    1729:1729:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.access$getTypeParameterFlags$p(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter):1 -> a
+    1729:1729:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):464 -> a
+    1729:1729:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):119 -> a
+    1730:1730:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):464:464 -> a
+    1730:1730:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):119 -> a
+    1731:1979:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):216:464 -> a
+    1731:1979:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):119 -> a
+    1980:1980:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):458:458 -> a
+    1980:1980:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):119 -> a
+    1981:1981:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):219:219 -> a
+    1981:1981:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):119 -> a
+    1982:2077:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.underlyingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:95 -> a
+    1982:2077:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):219 -> a
+    1982:2077:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):119 -> a
+    2078:2081:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):220:223 -> a
+    2078:2081:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):119 -> a
+    2082:2183:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.expandedType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:101 -> a
+    2082:2183:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):223 -> a
+    2082:2183:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):119 -> a
+    2184:2195:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):224:235 -> a
+    2184:2195:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):119 -> a
+    2196:2196:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.expandedType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):102:102 -> a
+    2196:2196:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):223 -> a
+    2196:2196:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):119 -> a
+    2197:2197:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.underlyingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):96:96 -> a
+    2197:2197:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):219 -> a
+    2197:2197:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):119 -> a
+    2198:2198:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):124:124 -> a
+    2199:2199: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
+    2199:2199:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):124 -> a
+    2200:2200:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext.<init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):18:18 -> a
+    2200:2200:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):124 -> a
+    2201:2203:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):126:128 -> a
+    2204:2501:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):148:445 -> a
+    2502:2502:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):444:444 -> a
+    2503:2503:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):443:443 -> a
+    2504:2504:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeParameterFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter):423:423 -> a
+    2504:2504:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.access$getTypeParameterFlags$p(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter):1 -> a
+    2504:2504:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):448 -> a
+    2505:2505:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):448:448 -> a
+    2506:2803:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):151:448 -> a
+    2804:2804:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):442:442 -> a
+    2805:2805:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):154:154 -> a
+    2806:2807:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):419:420 -> a
+    2806:2807:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):155 -> a
+    2808:2820:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):155:167 -> a
+    2821:2827:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):354:360 -> a
+    2821:2827:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):167 -> a
+    2828:2828:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):359:359 -> a
+    2828:2828:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):167 -> a
+    2829:2837:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):358:366 -> a
+    2829:2837:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):167 -> a
+    2838:2838:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):365:365 -> a
+    2838:2838:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):167 -> a
+    2839:2844:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):364:369 -> a
+    2839:2844:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):167 -> a
+    2845:2853:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):376:384 -> a
+    2845:2853:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):369 -> a
+    2845:2853:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):167 -> a
+    2854:2854:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):363:363 -> a
+    2854:2854:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):167 -> a
+    2855:2870:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):357:372 -> a
+    2855:2870:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):167 -> a
+    2871:2876:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):170:175 -> a
+    2877:2930:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readFunctionExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):0:53 -> a
+    2877:2930:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):175 -> a
+    2931:2987:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignatureKt.wrapAsPublic(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method):0:56 -> a
+    2931:2987:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readFunctionExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):53 -> a
+    2931:2987:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):175 -> a
+    2988:2995:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readFunctionExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):53:60 -> a
+    2988:2995:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):175 -> a
+    2996:2996:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):178:178 -> a
+    2997:3268:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):182:453 -> a
+    3269:3269:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):452:452 -> a
+    3270:3270:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):451:451 -> a
+    3271:3271:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeParameterFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter):423:423 -> a
+    3271:3271:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.access$getTypeParameterFlags$p(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter):1 -> a
+    3271:3271:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):456 -> a
+    3272:3272:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):456:456 -> a
+    3273:3544:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):185:456 -> a
+    3545:3545:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):450:450 -> a
+    3546:3546:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):188:188 -> a
+    3547:3612:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.receiverType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:65 -> a
+    3547:3612:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):188 -> a
+    3613:3614:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):419:420 -> a
+    3613:3614:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):189 -> a
+    3615:3632:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):189:206 -> a
+    3633:3705:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readPropertyExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):0:72 -> a
+    3633:3705:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):206 -> a
+    3706:3763:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignatureKt.wrapAsPublic(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field):0:57 -> a
+    3706:3763:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readPropertyExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):73 -> a
+    3706:3763:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):206 -> a
+    3764:3765:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readPropertyExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):74:75 -> a
+    3764:3765:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):206 -> a
+    3766:3777:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readPropertyExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):71:82 -> a
+    3766:3777:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):206 -> a
+    3778:3778:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):209:209 -> a
+    3779:3779:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeProperty(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,int,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):182:182 -> a
+    3780:3784:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):239:243 -> a
+    3785:3862:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.varargElementType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:77 -> a
+    3785:3862:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):243 -> a
+    3863:3864:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):419:420 -> a
+    3863:3864:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):244 -> a
+    3865:3868:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):244:247 -> a
+    3869:3869:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):264:264 -> a
+    3869:3869:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.access$accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):1 -> a
+    3870:3987:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.upperBounds(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:117 -> a
+    3870:3987:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):264 -> a
+    3870:3987:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.access$accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):1 -> a
+    3988:3988:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.upperBounds(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):39:39 -> a
+    3988:3988:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):264 -> a
+    3988:3988:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.access$accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):1 -> a
+    3989:3994:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):264:269 -> a
+    3989:3994:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.access$accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):1 -> a
+    3995:4090:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):0:95 -> a
+    3995:4090:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):269 -> a
+    3995:4090:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.access$accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):1 -> a
+    4091:4091:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):272:272 -> a
+    4091:4091:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.access$accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):1 -> a
+    4092:4110:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):277:295 -> a
+    4111:4111:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):294:294 -> a
+    4112:4112:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):293:293 -> a
+    4113:4120:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):292:299 -> a
+    4121:4149:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.type(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:28 -> a
+    4121:4149:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):299 -> a
+    4150:4151:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):419:420 -> a
+    4150:4151:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):301 -> a
+    4152:4152:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):301:301 -> a
+    4153:4153:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):300:300 -> a
+    4154:4154:void com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException.<init>(java.lang.String,java.lang.Throwable,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):8:8 -> a
+    4154:4154:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):300 -> a
+    4155:4158:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):300:303 -> a
+    4159:4175:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):291:307 -> a
+    4176:4265:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.abbreviatedType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:89 -> a
+    4176:4265:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):307 -> a
+    4266:4267:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):419:420 -> a
+    4266:4267:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):308 -> a
+    4268:4271:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):308:311 -> a
+    4272:4355:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.outerType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:83 -> a
+    4272:4355:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):311 -> a
+    4356:4357:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):419:420 -> a
+    4356:4357:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):312 -> a
+    4358:4361:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):312:315 -> a
+    4362:4396:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.flexibleUpperBound(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:34 -> a
+    4362:4396:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):315 -> a
+    4397:4398:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):419:420 -> a
+    4397:4398:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):317 -> a
+    4399:4399:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):318:318 -> a
+    4400:4407:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):316:323 -> a
+    4408:4512:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readTypeExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):0:104 -> a
+    4408:4512:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):323 -> a
+    4513:4513:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):326:326 -> a
+    4514:4518:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):282:286 -> a
+    4519:4519:void com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException.<init>(java.lang.String,java.lang.Throwable,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):8:8 -> a
+    4519:4519:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):286 -> a
+    4520:4520:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):286:286 -> a
+    4521:4521:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):330:330 -> a
+    4522:4624:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable):0:102 -> a
+    4522:4624:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):330 -> a
+    4625:4629:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version$Companion.decode(java.lang.Integer,java.lang.Integer):65:65 -> a
+    4625:4629:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable):100 -> a
+    4625:4629:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):330 -> a
+    4634:4638:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version$Companion.decode(java.lang.Integer,java.lang.Integer):70:70 -> a
+    4634:4638:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable):100 -> a
+    4634:4638:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):330 -> a
+    4643:4643:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version$Companion.decode(java.lang.Integer,java.lang.Integer):75:75 -> a
+    4643:4643:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable):100 -> a
+    4643:4643:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):330 -> a
+    4644:4647:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable):105:108 -> a
+    4644:4647:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):330 -> a
+    4648:4648:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable):107:107 -> a
+    4648:4648:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):330 -> a
+    4649:4658:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable):106:115 -> a
+    4649:4658:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):330 -> a
+    4659:4659:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable):105:105 -> a
+    4659:4659:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):330 -> a
+    4660:4663:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):333:336 -> a
+    4664:4664:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):335:335 -> a
+    4665:4673:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):334:342 -> a
+    4674:4674:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):341:341 -> a
+    4675:4685:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):340:350 -> a
+    4686:4686:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):331:331 -> a
+    4687:4687:void com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException.<init>(java.lang.String,java.lang.Throwable,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):8:8 -> a
+    4687:4687:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):331 -> a
+    4688:4688:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):331:331 -> a
+    4689:4690:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):389:390 -> a
+    4691:4701:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):388:398 -> a
+    4702:4702:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):397:397 -> a
+    4703:4703:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):396:396 -> a
+    4704:4713:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):394:403 -> a
+    4714:4821:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.isInstanceType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:107 -> a
+    4714:4821:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):403 -> a
+    4822:4823:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):419:420 -> a
+    4822:4823:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):404 -> a
+    4824:4835:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):404:415 -> a
+    4836:4837:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):419:420 -> a
+    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.MG:
 # {"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
@@ -58284,19 +58724,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.WriteUtilsKt -> com.android.tools.r8.internal.vH:
-# {"id":"sourceFile","fileName":"writeUtils.kt"}
-    1:23:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.ClassNameKt.isLocal(java.lang.String):0:22 -> a
-    1:23:int getClassNameIndex(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable,java.lang.String):109 -> a
-    24:26:int getClassNameIndex(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable,java.lang.String):110:112 -> a
-    27:32:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder writeAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):17:22 -> a
-    33:33:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder writeAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):20:20 -> a
-    34:34:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder writeAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):17:17 -> a
-    35:110:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder writeAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):28:28 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt -> com.android.tools.r8.internal.sI:
-# {"id":"sourceFile","fileName":"writers.kt"}
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor writeProperty(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,int,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):182:182 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1 -> com.android.tools.r8.internal.zH:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1 -> com.android.tools.r8.internal.QG:
 # {"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
@@ -58314,28 +58742,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.wH:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitExtensions$1 -> com.android.tools.r8.internal.NG:
 # {"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.xH:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitValueParameter$1 -> com.android.tools.r8.internal.OG:
 # {"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.yH:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.PG:
 # {"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.BH:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1 -> com.android.tools.r8.internal.SG:
 # {"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
@@ -58347,14 +58775,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.AH:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1$visitEffect$1 -> com.android.tools.r8.internal.RG:
 # {"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.EH:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1 -> com.android.tools.r8.internal.VG:
 # {"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
@@ -58376,21 +58804,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.CH:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConclusionOfConditionalEffect$1 -> com.android.tools.r8.internal.TG:
 # {"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.DH:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConstructorArgument$1 -> com.android.tools.r8.internal.UG:
 # {"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.IH:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 -> com.android.tools.r8.internal.ZG:
 # {"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
@@ -58412,28 +58840,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.FH:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitAndArgument$1 -> com.android.tools.r8.internal.WG:
 # {"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.GH:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitIsInstanceType$1 -> com.android.tools.r8.internal.XG:
 # {"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.HH:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitOrArgument$1 -> com.android.tools.r8.internal.YG:
 # {"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.QH:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 -> com.android.tools.r8.internal.hH:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder t -> b
     int $flags -> e
@@ -58468,7 +58896,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.JH:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitContract$1 -> com.android.tools.r8.internal.aH:
 # {"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
@@ -58487,49 +58915,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.KH:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitExtensions$1 -> com.android.tools.r8.internal.bH:
 # {"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.LH:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReceiverParameterType$1 -> com.android.tools.r8.internal.cH:
 # {"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.MH:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReturnType$1 -> com.android.tools.r8.internal.dH:
 # {"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.NH:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitTypeParameter$1 -> com.android.tools.r8.internal.eH:
 # {"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.OH:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitValueParameter$1 -> com.android.tools.r8.internal.fH:
 # {"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.PH:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.gH:
 # {"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.XH:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 -> com.android.tools.r8.internal.oH:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder t -> b
     int $getterFlags -> f
@@ -58562,49 +58990,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.RH:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitExtensions$1 -> com.android.tools.r8.internal.iH:
 # {"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.SH:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReceiverParameterType$1 -> com.android.tools.r8.internal.jH:
 # {"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.TH:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReturnType$1 -> com.android.tools.r8.internal.kH:
 # {"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.UH:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitSetterParameter$1 -> com.android.tools.r8.internal.lH:
 # {"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.VH:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitTypeParameter$1 -> com.android.tools.r8.internal.mH:
 # {"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.WH:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.nH:
 # {"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.dI:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 -> com.android.tools.r8.internal.uH:
 # {"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
@@ -58634,14 +59062,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.YH:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitAbbreviatedType$1 -> com.android.tools.r8.internal.pH:
 # {"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.ZH:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitArgument$1 -> com.android.tools.r8.internal.qH:
 # {"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
@@ -58651,14 +59079,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.aI:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitExtensions$1 -> com.android.tools.r8.internal.rH:
 # {"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.bI:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitFlexibleTypeUpperBound$1 -> com.android.tools.r8.internal.sH:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 this$0 -> a
     java.lang.String $typeFlexibilityId -> b
@@ -58666,14 +59094,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.cI:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitOuterType$1 -> com.android.tools.r8.internal.tH:
 # {"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.iI:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 -> com.android.tools.r8.internal.zH:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder t -> b
     int $flags -> d
@@ -58700,35 +59128,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.eI:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitExpandedType$1 -> com.android.tools.r8.internal.vH:
 # {"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.fI:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitTypeParameter$1 -> com.android.tools.r8.internal.wH:
 # {"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.gI:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitUnderlyingType$1 -> com.android.tools.r8.internal.xH:
 # {"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.hI:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.yH:
 # {"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.lI:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1 -> com.android.tools.r8.internal.CH:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder t -> b
     int $flags -> f
@@ -58745,21 +59173,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.jI:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitExtensions$1 -> com.android.tools.r8.internal.AH:
 # {"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.kI:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitUpperBound$1 -> com.android.tools.r8.internal.BH:
 # {"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.oI:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1 -> com.android.tools.r8.internal.FH:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder t -> b
     int $flags -> d
@@ -58777,21 +59205,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.mI:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitType$1 -> com.android.tools.r8.internal.DH:
 # {"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.nI:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitVarargElementType$1 -> com.android.tools.r8.internal.EH:
 # {"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.rI:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1 -> com.android.tools.r8.internal.IH:
 # {"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
@@ -58815,7 +59243,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.pI:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$1 -> com.android.tools.r8.internal.GH:
 # {"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
@@ -58824,7 +59252,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.qI:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$2 -> com.android.tools.r8.internal.HH:
 # {"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
@@ -58833,30 +59261,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.ExtensionUtilsKt -> com.android.tools.r8.internal.Lb:
-# {"id":"sourceFile","fileName":"extensionUtils.kt"}
-    1:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor applySingleExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):13:16 -> a
-    5:13:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmExtension singleOfType(java.util.Collection,com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):25:33 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmClassExtension -> com.android.tools.r8.internal.Hk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmClassExtension -> com.android.tools.r8.internal.Mj:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmConstructorExtension -> com.android.tools.r8.internal.Nk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmConstructorExtension -> com.android.tools.r8.internal.Sj:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmExtension -> com.android.tools.r8.internal.al:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmExtension -> com.android.tools.r8.internal.fk:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmFunctionExtension -> com.android.tools.r8.internal.fl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmFunctionExtension -> com.android.tools.r8.internal.kk:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPackageExtension -> com.android.tools.r8.internal.ll:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPackageExtension -> com.android.tools.r8.internal.qk:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPropertyExtension -> com.android.tools.r8.internal.pl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPropertyExtension -> com.android.tools.r8.internal.uk:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeExtension -> com.android.tools.r8.internal.vl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeExtension -> com.android.tools.r8.internal.Ak:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeParameterExtension -> com.android.tools.r8.internal.yl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeParameterExtension -> com.android.tools.r8.internal.Dk:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions -> com.android.tools.r8.internal.Hq:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions -> com.android.tools.r8.internal.Gp:
 # {"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.Gq:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion -> com.android.tools.r8.internal.Fp:
 # {"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
@@ -58864,13 +59288,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.Fq:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion$INSTANCES$2 -> com.android.tools.r8.internal.Ep:
 # {"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.zw:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation -> com.android.tools.r8.internal.Jw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1 -> com.android.tools.r8.internal.sv:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation -> com.android.tools.r8.internal.Cv:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation defaultInstance -> a
     java.util.List argument_ -> f
     int memoizedSerializedSize -> h
@@ -58929,11 +59353,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.Aw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$1 -> com.android.tools.r8.internal.tv:
     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.Hw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument -> com.android.tools.r8.internal.Av:
     int memoizedSerializedSize -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> b
     int bitField0_ -> d
@@ -58985,11 +59409,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.Bw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$1 -> com.android.tools.r8.internal.uv:
     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.Cw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder -> com.android.tools.r8.internal.vv:
     int bitField0_ -> b
     int nameId_ -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value value_ -> d
@@ -59032,7 +59456,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.Gw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value -> com.android.tools.r8.internal.zv:
     int arrayDimensionCount_ -> n
     int flags_ -> o
     long intValue_ -> f
@@ -59148,11 +59572,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.Dw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$1 -> com.android.tools.r8.internal.wv:
     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.Ew:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder -> com.android.tools.r8.internal.xv:
     int arrayDimensionCount_ -> l
     int flags_ -> m
     int classId_ -> h
@@ -59223,7 +59647,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.Fw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type -> com.android.tools.r8.internal.yv:
     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
@@ -59256,7 +59680,7 @@
     11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2532:2532 -> d
     12:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2531:2531 -> d
     13:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2530:2530 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder -> com.android.tools.r8.internal.Iw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder -> com.android.tools.r8.internal.Bv:
     java.util.List argument_ -> d
     int bitField0_ -> b
     int id_ -> c
@@ -59294,7 +59718,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.Nw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class -> com.android.tools.r8.internal.Gv:
     int nestedClassNameMemoizedSerializedSize -> n
     java.util.List typeAlias_ -> r
     byte memoizedIsInitialized -> y
@@ -59481,11 +59905,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.Kw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$1 -> com.android.tools.r8.internal.Dv:
     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.Lw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder -> com.android.tools.r8.internal.Ev:
     java.util.List sealedSubclassFqName_ -> q
     java.util.List enumEntry_ -> p
     java.util.List typeAlias_ -> o
@@ -59603,7 +60027,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.Mw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind -> com.android.tools.r8.internal.Fv:
     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
@@ -59618,7 +60042,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.Qw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor -> com.android.tools.r8.internal.Jv:
     byte memoizedIsInitialized -> i
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> c
     int memoizedSerializedSize -> j
@@ -59680,11 +60104,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.Ow:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$1 -> com.android.tools.r8.internal.Hv:
     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.Pw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder -> com.android.tools.r8.internal.Iv:
     java.util.List valueParameter_ -> f
     int bitField0_ -> d
     int flags_ -> e
@@ -59721,7 +60145,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.Tw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract -> com.android.tools.r8.internal.Mv:
     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
@@ -59770,11 +60194,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.Rw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$1 -> com.android.tools.r8.internal.Kv:
     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.Sw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder -> com.android.tools.r8.internal.Lv:
     java.util.List effect_ -> c
     int bitField0_ -> b
     1:91:void <init>():23558:23648 -> <init>
@@ -59809,7 +60233,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.Yw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect -> com.android.tools.r8.internal.Rv:
     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
@@ -59873,11 +60297,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.Uw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$1 -> com.android.tools.r8.internal.Nv:
     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.Vw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder -> com.android.tools.r8.internal.Ov:
     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
@@ -59922,7 +60346,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.Ww:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType -> com.android.tools.r8.internal.Pv:
     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
@@ -59935,7 +60359,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType valueOf(int):24043:24043 -> d
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType valueOf(int):24042:24042 -> d
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType valueOf(int):24041:24041 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind -> com.android.tools.r8.internal.Xw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind -> com.android.tools.r8.internal.Qv:
     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
@@ -59948,7 +60372,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind valueOf(int):24108:24108 -> d
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind valueOf(int):24107:24107 -> d
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind valueOf(int):24106:24106 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry -> com.android.tools.r8.internal.bx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry -> com.android.tools.r8.internal.Uv:
     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
@@ -59991,11 +60415,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.Zw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$1 -> com.android.tools.r8.internal.Sv:
     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.ax:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder -> com.android.tools.r8.internal.Tv:
     int bitField0_ -> d
     int name_ -> e
     1:1:void <init>():20681:20681 -> <init>
@@ -60026,7 +60450,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.fx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression -> com.android.tools.r8.internal.Yv:
     int memoizedSerializedSize -> m
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> b
     int isInstanceTypeId_ -> i
@@ -60113,11 +60537,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.cx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$1 -> com.android.tools.r8.internal.Vv:
     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.dx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder -> com.android.tools.r8.internal.Wv:
     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
@@ -60175,7 +60599,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.ex:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue -> com.android.tools.r8.internal.Xv:
     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
@@ -60188,7 +60612,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue valueOf(int):25128:25128 -> d
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue valueOf(int):25127:25127 -> d
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue valueOf(int):25126:25126 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function -> com.android.tools.r8.internal.ix:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function -> com.android.tools.r8.internal.bw:
     java.util.List versionRequirement_ -> p
     int receiverTypeId_ -> m
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> c
@@ -60315,11 +60739,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.gx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$1 -> com.android.tools.r8.internal.Zv:
     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.hx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder -> com.android.tools.r8.internal.aw:
     int receiverTypeId_ -> l
     java.util.List versionRequirement_ -> o
     int returnTypeId_ -> i
@@ -60429,7 +60853,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.jx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind -> com.android.tools.r8.internal.cw:
     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
@@ -60441,7 +60865,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.kx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality -> com.android.tools.r8.internal.dw:
     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
@@ -60453,7 +60877,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.nx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package -> com.android.tools.r8.internal.gw:
     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
@@ -60534,11 +60958,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.lx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$1 -> com.android.tools.r8.internal.ew:
     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.mx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder -> com.android.tools.r8.internal.fw:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable versionRequirementTable_ -> i
     java.util.List property_ -> f
     java.util.List function_ -> e
@@ -60598,7 +61022,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.qx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property -> com.android.tools.r8.internal.jw:
     int getterFlags_ -> o
     java.util.List versionRequirement_ -> q
     int receiverTypeId_ -> m
@@ -60715,11 +61139,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.ox:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$1 -> com.android.tools.r8.internal.hw:
     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.px:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder -> com.android.tools.r8.internal.iw:
     int getterFlags_ -> n
     int setterFlags_ -> o
     int receiverTypeId_ -> l
@@ -60823,7 +61247,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.xx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type -> com.android.tools.r8.internal.qw:
     int typeAliasName_ -> n
     int typeParameter_ -> l
     int typeParameterName_ -> m
@@ -60954,11 +61378,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.rx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$1 -> com.android.tools.r8.internal.kw:
     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.vx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument -> com.android.tools.r8.internal.ow:
     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
@@ -61012,11 +61436,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.sx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$1 -> com.android.tools.r8.internal.lw:
     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.tx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder -> com.android.tools.r8.internal.mw:
     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
@@ -61060,7 +61484,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.ux:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection -> com.android.tools.r8.internal.nw:
     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
@@ -61075,7 +61499,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5185:5185 -> d
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5184:5184 -> d
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5183:5183 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder -> com.android.tools.r8.internal.wx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder -> com.android.tools.r8.internal.pw:
     int outerTypeId_ -> o
     int typeParameterName_ -> l
     int typeAliasName_ -> m
@@ -61195,7 +61619,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.Ax:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias -> com.android.tools.r8.internal.tw:
     int expandedTypeId_ -> l
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> c
     int underlyingTypeId_ -> j
@@ -61299,11 +61723,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.yx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$1 -> com.android.tools.r8.internal.rw:
     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.zx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder -> com.android.tools.r8.internal.sw:
     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
@@ -61382,7 +61806,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.Ex:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter -> com.android.tools.r8.internal.xw:
     int memoizedSerializedSize -> n
     int upperBoundIdMemoizedSerializedSize -> l
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> c
@@ -61467,11 +61891,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.Bx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$1 -> com.android.tools.r8.internal.uw:
     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.Cx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder -> com.android.tools.r8.internal.vw:
     int name_ -> f
     java.util.List upperBoundId_ -> j
     java.util.List upperBound_ -> i
@@ -61519,7 +61943,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.Dx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance -> com.android.tools.r8.internal.ww:
     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
@@ -61532,7 +61956,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance valueOf(int):7432:7432 -> d
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance valueOf(int):7431:7431 -> d
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance valueOf(int):7430:7430 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable -> com.android.tools.r8.internal.Hx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable -> com.android.tools.r8.internal.Aw:
     java.util.List type_ -> e
     int memoizedSerializedSize -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> b
@@ -61587,11 +62011,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.Fx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$1 -> com.android.tools.r8.internal.yw:
     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.Gx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder -> com.android.tools.r8.internal.zw:
     java.util.List type_ -> c
     int firstNullable_ -> d
     int bitField0_ -> b
@@ -61623,7 +62047,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.Kx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter -> com.android.tools.r8.internal.Dw:
     byte memoizedIsInitialized -> l
     int memoizedSerializedSize -> m
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> c
@@ -61703,11 +62127,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.Ix:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$1 -> com.android.tools.r8.internal.Bw:
     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.Jx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder -> com.android.tools.r8.internal.Cw:
     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
@@ -61777,7 +62201,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.Px:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement -> com.android.tools.r8.internal.Iw:
     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
@@ -61841,11 +62265,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.Lx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$1 -> com.android.tools.r8.internal.Ew:
     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.Mx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder -> com.android.tools.r8.internal.Fw:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level level_ -> e
     int errorCode_ -> f
     int message_ -> g
@@ -61899,7 +62323,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.Nx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level -> com.android.tools.r8.internal.Gw:
     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
@@ -61912,7 +62336,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level valueOf(int):21087:21087 -> d
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level valueOf(int):21086:21086 -> d
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level valueOf(int):21085:21085 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind -> com.android.tools.r8.internal.Ox:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind -> com.android.tools.r8.internal.Hw:
     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
@@ -61925,7 +62349,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind valueOf(int):21152:21152 -> d
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind valueOf(int):21151:21151 -> d
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind valueOf(int):21150:21150 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable -> com.android.tools.r8.internal.Sx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable -> com.android.tools.r8.internal.Lw:
     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
@@ -61970,11 +62394,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.Qx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$1 -> com.android.tools.r8.internal.Jw:
     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.Rx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder -> com.android.tools.r8.internal.Kw:
     java.util.List requirement_ -> c
     int bitField0_ -> b
     1:85:void <init>():22184:22268 -> <init>
@@ -62009,7 +62433,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.Tx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility -> com.android.tools.r8.internal.Mw:
     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
@@ -62023,7 +62447,7 @@
     1:2:void <init>(java.lang.String,int,int,int):186:187 -> <init>
     1:1:int getNumber():158:158 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility[] values():96:96 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.BinaryVersion -> com.android.tools.r8.internal.A2:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.BinaryVersion -> com.android.tools.r8.internal.v2:
 # {"id":"sourceFile","fileName":"BinaryVersion.kt"}
     java.util.List rest -> d
     int[] numbers -> e
@@ -62041,54 +62465,40 @@
     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.Ic:
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField SUSPEND_TYPE -> a
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField HAS_ANNOTATIONS -> b
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_INLINE -> e
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_CROSSINLINE -> g
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField DECLARES_DEFAULT_VALUE -> f
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_NOT_DEFAULT -> i
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField VISIBILITY -> c
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_NOINLINE -> h
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags -> com.android.tools.r8.internal.ac:
+    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
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_CONST -> t
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField HAS_CONSTANT -> v
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_EXTERNAL_CLASS -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField MODALITY -> d
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_INLINE_ACCESSOR -> k
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_EXTERNAL_ACCESSOR -> j
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_UNSIGNED -> l
-    1:6:void <clinit>():17:22 -> <clinit>
-    7:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField 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 -> <clinit>
-    7:8:void <clinit>():22 -> <clinit>
-    9:10:void <clinit>():22:23 -> <clinit>
-    11:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField 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 -> <clinit>
-    11:12:void <clinit>():23 -> <clinit>
-    13:17:void <clinit>():23:27 -> <clinit>
-    18:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField 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 -> <clinit>
-    18:19:void <clinit>():27 -> <clinit>
-    20:20:void <clinit>():40:40 -> <clinit>
-    21:22:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField 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 -> <clinit>
-    21:22:void <clinit>():40 -> <clinit>
-    23:23:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField.booleanAfter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField):239:239 -> <clinit>
-    23:23:void <clinit>():44 -> <clinit>
-    24:24:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField.booleanAfter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField):240:240 -> <clinit>
-    24:24:void <clinit>():46 -> <clinit>
-    25:25:void <clinit>():46:46 -> <clinit>
-    26:27:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField.booleanAfter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField):239:240 -> <clinit>
-    26:27:void <clinit>():66 -> <clinit>
-    28:28:void <clinit>():66:66 -> <clinit>
-    29:29:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField.booleanAfter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField):240:240 -> <clinit>
-    29:29:void <clinit>():67 -> <clinit>
-    30:30:void <clinit>():67:67 -> <clinit>
-    31:31:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField.booleanAfter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField):240:240 -> <clinit>
-    31:31:void <clinit>():68 -> <clinit>
-    32:32:void <clinit>():68:68 -> <clinit>
-    33:34:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField.booleanAfter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField):239:240 -> <clinit>
-    33:34:void <clinit>():72 -> <clinit>
-    35:35:void <clinit>():72:72 -> <clinit>
-    36:36:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField.booleanAfter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField):240:240 -> <clinit>
-    36:36:void <clinit>():73 -> <clinit>
-    37:37:void <clinit>():73:73 -> <clinit>
-    38:38:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField.booleanAfter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField):240:240 -> <clinit>
-    38:38:void <clinit>():74 -> <clinit>
-    39:46:void <clinit>():74:81 -> <clinit>
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_INFIX -> l
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_TAILREC -> n
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_NOINLINE -> A
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_EXTERNAL_ACCESSOR -> C
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField HAS_ANNOTATIONS -> b
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_NEGATED -> E
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_INNER -> f
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField DECLARES_DEFAULT_VALUE -> y
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_VAR -> q
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField HAS_SETTER -> s
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_LATEINIT -> u
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_EXTERNAL_PROPERTY -> w
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_EXPECT_CLASS -> i
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField VISIBILITY -> c
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_OPERATOR -> k
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField CLASS_KIND -> e
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_INLINE -> m
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_EXTERNAL_FUNCTION -> o
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField SUSPEND_TYPE -> a
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_NOT_DEFAULT -> B
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_INLINE_ACCESSOR -> D
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_DATA -> g
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_UNSIGNED -> F
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_DELEGATED -> x
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_CROSSINLINE -> z
+    1:65:void <clinit>():17:81 -> <clinit>
     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 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField.toFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite):309:309 -> a
@@ -62100,15 +62510,15 @@
     4:4: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 -> a
     5:5: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
     6:6: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.Ec:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField -> com.android.tools.r8.internal.Fc:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$1 -> com.android.tools.r8.internal.Wb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField -> com.android.tools.r8.internal.Xb:
     1:1:void <init>(int):259:259 -> <init>
     1:1:java.lang.Object get(int):256:256 -> a
     2:2:int toFlags(java.lang.Boolean):270:270 -> a
     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.Gc:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField -> com.android.tools.r8.internal.Yb:
     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:6:int bitWidth(java.lang.Object[]):285:290 -> a
@@ -62116,25 +62526,18 @@
     7:7:int bitWidth(java.lang.Object[]):0 -> a
     8:12: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
     8:12:java.lang.Object get(int):276 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField -> com.android.tools.r8.internal.Hc:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField -> com.android.tools.r8.internal.Zb:
     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>
     2:4:void <init>(int,int):246:248 -> <init>
     java.lang.Object get(int) -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField booleanFirst():235:235 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver -> com.android.tools.r8.internal.as:
+    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.Uq:
 # {"id":"sourceFile","fileName":"NameResolver.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoBufUtilKt -> com.android.tools.r8.internal.Ux:
-# {"id":"sourceFile","fileName":"ProtoBufUtil.kt"}
-    1:1:java.lang.Object 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
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt -> com.android.tools.r8.internal.ny:
-# {"id":"sourceFile","fileName":"protoTypeTableUtil.kt"}
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type receiverType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):50:51 -> a
-    3:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type returnType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):56:58 -> a
-    6:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type type(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):70:72 -> a
-    1:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type 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.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable -> com.android.tools.r8.internal.DF:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable -> com.android.tools.r8.internal.TE:
 # {"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>
@@ -62142,13 +62545,14 @@
     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.FG:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement -> com.android.tools.r8.internal.XF:
 # {"id":"sourceFile","fileName":"VersionRequirement.kt"}
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version version -> a
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind kind -> b
-    java.lang.Integer errorCode -> d
-    com.android.tools.r8.jetbrains.kotlin.DeprecationLevel level -> c
-    java.lang.String message -> e
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind kind -> c
+    java.lang.String message -> f
+    com.android.tools.r8.jetbrains.kotlin.DeprecationLevel level -> d
+    java.lang.Integer errorCode -> e
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version version -> b
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion Companion -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind,com.android.tools.r8.jetbrains.kotlin.DeprecationLevel,java.lang.Integer,java.lang.String):24:24 -> <init>
     1:1:java.lang.Integer getErrorCode():28:28 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind getKind():26:26 -> b
@@ -62156,12 +62560,17 @@
     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$Version -> com.android.tools.r8.internal.EG:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion -> com.android.tools.r8.internal.UF:
+# {"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.WF:
 # {"id":"sourceFile","fileName":"VersionRequirement.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version INFINITY -> a
-    int patch -> d
-    int major -> b
-    int minor -> c
+    int minor -> d
+    int patch -> e
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version$Companion Companion -> b
+    int major -> c
     1:1:void <clinit>():54:54 -> <clinit>
     1:1:void <init>(int,int,int):31:31 -> <init>
     int component1() -> a
@@ -62171,7 +62580,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.VersionRequirementTable -> com.android.tools.r8.internal.HG:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version$Companion -> com.android.tools.r8.internal.VF:
+# {"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.ZF:
 # {"id":"sourceFile","fileName":"VersionRequirement.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion Companion -> b
     java.util.List infos -> c
@@ -62192,7 +62605,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.GG:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion -> com.android.tools.r8.internal.YF:
 # {"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>
@@ -62200,7 +62613,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.rk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf -> com.android.tools.r8.internal.xj:
     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
@@ -62215,8 +62628,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.ak:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature -> com.android.tools.r8.internal.dk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1 -> com.android.tools.r8.internal.gj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature -> com.android.tools.r8.internal.jj:
     int memoizedSerializedSize -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> b
     int desc_ -> f
@@ -62267,11 +62680,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.bk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$1 -> com.android.tools.r8.internal.hj:
     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.ck:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder -> com.android.tools.r8.internal.ij:
     int desc_ -> d
     int bitField0_ -> b
     int name_ -> c
@@ -62305,7 +62718,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.gk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature -> com.android.tools.r8.internal.mj:
     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
@@ -62356,11 +62769,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.ek:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$1 -> com.android.tools.r8.internal.kj:
     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.fk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder -> com.android.tools.r8.internal.lj:
     int desc_ -> d
     int bitField0_ -> b
     int name_ -> c
@@ -62394,7 +62807,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.jk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature -> com.android.tools.r8.internal.pj:
     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
@@ -62450,11 +62863,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.hk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$1 -> com.android.tools.r8.internal.nj:
     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.ik:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder -> com.android.tools.r8.internal.oj:
     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
@@ -62534,7 +62947,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.qk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes -> com.android.tools.r8.internal.wj:
     java.util.List localName_ -> e
     java.util.List record_ -> d
     int memoizedSerializedSize -> h
@@ -62586,11 +62999,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.kk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$1 -> com.android.tools.r8.internal.qj:
     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.lk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder -> com.android.tools.r8.internal.rj:
     java.util.List localName_ -> d
     java.util.List record_ -> c
     int bitField0_ -> b
@@ -62620,7 +63033,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.pk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record -> com.android.tools.r8.internal.vj:
     int memoizedSerializedSize -> n
     int replaceCharMemoizedSerializedSize -> l
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record defaultInstance -> a
@@ -62724,11 +63137,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.mk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$1 -> com.android.tools.r8.internal.sj:
     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.nk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder -> com.android.tools.r8.internal.tj:
     java.lang.Object string_ -> e
     int predefinedIndex_ -> d
     java.util.List replaceChar_ -> h
@@ -62781,7 +63194,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.ok:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation -> com.android.tools.r8.internal.uj:
     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
@@ -62794,7 +63207,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation valueOf(int):543:543 -> d
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation valueOf(int):542:542 -> d
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation valueOf(int):541:541 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.BitEncoding -> com.android.tools.r8.internal.F2:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.BitEncoding -> com.android.tools.r8.internal.A2:
     boolean FORCE_8TO7_ENCODING -> a
     boolean $assertionsDisabled -> b
     1:13:void <clinit>():15:27 -> <clinit>
@@ -62823,7 +63236,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.s6:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.ClassMapperLite -> com.android.tools.r8.internal.d6:
 # {"id":"sourceFile","fileName":"ClassMapperLite.kt"}
     java.util.Map map -> a
     1:10:void <clinit>():20:29 -> <clinit>
@@ -62848,23 +63261,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.r6:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.ClassMapperLite$map$1$1 -> com.android.tools.r8.internal.c6:
 # {"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.sj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmBytecodeBinaryVersion -> com.android.tools.r8.internal.Ai:
 # {"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.Hj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature -> com.android.tools.r8.internal.Ni:
 # {"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.Fj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field -> com.android.tools.r8.internal.Li:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     java.lang.String name -> a
     java.lang.String desc -> b
@@ -62890,7 +63303,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.Gj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method -> com.android.tools.r8.internal.Mi:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     java.lang.String name -> a
     java.lang.String desc -> b
@@ -62916,7 +63329,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.Sj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion -> com.android.tools.r8.internal.Yi:
 # {"id":"sourceFile","fileName":"JvmMetadataVersion.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion INSTANCE -> f
     boolean isStrictSemantics -> g
@@ -62928,7 +63341,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.Vj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver -> com.android.tools.r8.internal.bj:
 # {"id":"sourceFile","fileName":"JvmNameResolver.kt"}
     java.util.List PREDEFINED_STRINGS -> a
     java.util.Map PREDEFINED_STRINGS_MAP -> b
@@ -62949,11 +63362,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.Uj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver$Companion -> com.android.tools.r8.internal.aj:
 # {"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.sk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil -> com.android.tools.r8.internal.yj:
 # {"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
@@ -62976,15 +63389,22 @@
     160:160:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes.parseDelimitedFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):1737:1737 -> a
     160:160:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver readNameResolver(java.io.InputStream,java.lang.String[]):52 -> a
     161:161:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver readNameResolver(java.io.InputStream,java.lang.String[]):52:52 -> a
-    162:228:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):70:136 -> a
-    229:294:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):75:140 -> a
-    295:300:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):77:82 -> a
-    301:355:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method getJvmConstructorSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):90:144 -> a
-    356:359:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method getJvmConstructorSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):100:103 -> a
-    360:360:java.lang.String mapTypeDefault(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):126:126 -> a
-    361:361:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver.getQualifiedClassName(int):72:72 -> a
-    361:361:java.lang.String mapTypeDefault(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):126 -> a
-    362:362:java.lang.String mapTypeDefault(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):126:126 -> a
+    162:167:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):70:75 -> a
+    168:168:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt.listOfNotNull(java.lang.Object):118:118 -> a
+    168:168:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.listOfNotNull(java.lang.Object):0 -> a
+    168:168:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):75 -> a
+    169:231:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):75:75 -> a
+    232:2306:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.plus(java.util.Collection,java.lang.Iterable):0:2074 -> a
+    232:2306:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.plus(java.util.Collection,java.lang.Iterable):0 -> a
+    232:2306:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):75 -> a
+    2307:2309:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):138:140 -> a
+    2310:2315:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):77:82 -> a
+    2316:2370:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method getJvmConstructorSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):90:144 -> a
+    2371:2374:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method getJvmConstructorSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):100:103 -> a
+    2375:2375:java.lang.String mapTypeDefault(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):126:126 -> a
+    2376:2376:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver.getQualifiedClassName(int):72:72 -> a
+    2376:2376:java.lang.String mapTypeDefault(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):126 -> a
+    2377:2377:java.lang.String mapTypeDefault(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):126:126 -> a
     1:2:com.android.tools.r8.jetbrains.kotlin.Pair readFunctionDataFrom(java.lang.String[],java.lang.String[]):47:48 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function.parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):15000:15000 -> b
     3:3:com.android.tools.r8.jetbrains.kotlin.Pair readFunctionDataFrom(java.lang.String[],java.lang.String[]):48 -> b
@@ -62997,7 +63417,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.tk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.serialization.JvmStringTable -> com.android.tools.r8.internal.zj:
 # {"id":"sourceFile","fileName":"JvmStringTable.kt"}
     java.util.LinkedHashSet localNames -> d
     java.util.ArrayList records -> b
@@ -63017,47 +63437,60 @@
     520:520:int getStringIndex(java.lang.String):38 -> a
     521:588:int getStringIndex(java.lang.String):39:106 -> a
     589:589:int getStringIndex(java.lang.String):104:104 -> a
-    590:609:int getQualifiedClassNameIndex(java.lang.String,boolean):57:76 -> a
-    610:723:java.lang.Integer com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver$Companion.getPredefinedStringIndex(java.lang.String):0:113 -> a
-    610:723:int getQualifiedClassNameIndex(java.lang.String,boolean):76 -> a
-    724:729:int getQualifiedClassNameIndex(java.lang.String,boolean):78:83 -> a
-    730:745:int getQualifiedClassNameIndex(java.lang.String,boolean):74:89 -> a
-    746:763:void serializeTo(java.io.OutputStream):95:112 -> a
-    764:765: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$Builder.build():990:991 -> a
-    764:765:void serializeTo(java.io.OutputStream):96 -> a
-    766:766:void serializeTo(java.io.OutputStream):96:96 -> a
-    767:767:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
-    767:767: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$Builder.build():992 -> a
-    767:767:void serializeTo(java.io.OutputStream):96 -> a
-    768:768: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$Builder.build():992:992 -> a
-    768:768:void serializeTo(java.io.OutputStream):96 -> a
-    769:770:void serializeTo(java.io.OutputStream):96:97 -> a
-    771:772: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():1796:1797 -> a
-    771:772:void serializeTo(java.io.OutputStream):98 -> a
-    773:780:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite.writeDelimitedTo(java.io.OutputStream):86:93 -> a
-    773:780:void serializeTo(java.io.OutputStream):98 -> a
-    781:781:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
-    781:781: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 -> a
-    781:781:void serializeTo(java.io.OutputStream):98 -> a
-    782:782: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
-    782:782:void serializeTo(java.io.OutputStream):98 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner -> com.android.tools.r8.internal.gi:
+    590:603:int getQualifiedClassNameIndex(java.lang.String,boolean):57:70 -> a
+    604:604:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt.contains$default(java.lang.CharSequence,char,boolean,int,java.lang.Object):0:0 -> a
+    604:604:int getQualifiedClassNameIndex(java.lang.String,boolean):73 -> a
+    605:605:int getQualifiedClassNameIndex(java.lang.String,boolean):76:76 -> a
+    606:719:java.lang.Integer com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver$Companion.getPredefinedStringIndex(java.lang.String):0:113 -> a
+    606:719:int getQualifiedClassNameIndex(java.lang.String,boolean):76 -> a
+    720:725:int getQualifiedClassNameIndex(java.lang.String,boolean):78:83 -> a
+    726:741:int getQualifiedClassNameIndex(java.lang.String,boolean):74:89 -> a
+    742:759:void serializeTo(java.io.OutputStream):95:112 -> a
+    760:761: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$Builder.build():990:991 -> a
+    760:761:void serializeTo(java.io.OutputStream):96 -> a
+    762:762:void serializeTo(java.io.OutputStream):96:96 -> a
+    763:763:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
+    763:763: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$Builder.build():992 -> a
+    763:763:void serializeTo(java.io.OutputStream):96 -> a
+    764:764: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$Builder.build():992:992 -> a
+    764:764:void serializeTo(java.io.OutputStream):96 -> a
+    765:766:void serializeTo(java.io.OutputStream):96:97 -> a
+    767:768: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():1796:1797 -> a
+    767:768:void serializeTo(java.io.OutputStream):98 -> a
+    769:776:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite.writeDelimitedTo(java.io.OutputStream):86:93 -> a
+    769:776:void serializeTo(java.io.OutputStream):98 -> a
+    777:777:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
+    777:777: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 -> a
+    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.sh:
 # {"id":"sourceFile","fileName":"Interner.kt"}
     java.util.HashMap interned -> b
     int firstIndex -> a
     1:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner):8:10 -> <init>
     1:19:java.util.List getAllInternedObjects():13:31 -> a
-    20:23:java.lang.Integer find(java.lang.Object):19:22 -> a
+    20:2547:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.sortedWith(java.lang.Iterable,java.util.Comparator):0:2527 -> a
+    20:2547:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.sortedWith(java.lang.Iterable,java.util.Comparator):0 -> a
+    20:2547:java.util.List getAllInternedObjects():31 -> a
+    2548:4410:void com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt.sortWith(java.lang.Object[],java.util.Comparator):0:1862 -> a
+    2548:4410:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.sortedWith(java.lang.Iterable,java.util.Comparator):947 -> a
+    2548:4410:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.sortedWith(java.lang.Iterable,java.util.Comparator):0 -> a
+    2548:4410:java.util.List getAllInternedObjects():31 -> a
+    4411:5991:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.sortedWith(java.lang.Iterable,java.util.Comparator):947:2527 -> a
+    4411:5991:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.sortedWith(java.lang.Iterable,java.util.Comparator):0 -> a
+    4411:5991:java.util.List getAllInternedObjects():31 -> a
+    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.fi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner$allInternedObjects$$inlined$sortedBy$1 -> com.android.tools.r8.internal.rh:
 # {"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.Yr:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableVersionRequirementTable -> com.android.tools.r8.internal.Sq:
 # {"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>
@@ -63086,7 +63519,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.BE:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.TableElementWrapper -> com.android.tools.r8.internal.uD:
 # {"id":"sourceFile","fileName":"MutableTable.kt"}
     byte[] bytes -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder builder -> c
@@ -63117,7 +63550,7 @@
     1:6:int read():256:261 -> read
     7:13:int read(byte[],int,int):269:275 -> read
     1:3:long skip(long):282:284 -> skip
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractParser -> com.android.tools.r8.internal.z0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractParser -> com.android.tools.r8.internal.A0:
     1:1:void <clinit>():78:78 -> <clinit>
     1:1:void <init>():49:49 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite checkMessageInitialized(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):70:70 -> a
@@ -63171,7 +63604,7 @@
     6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractParser.parsePartialFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):196:196 -> b
     6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractParser.parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):209 -> b
     6:6:java.lang.Object parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):49 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString -> com.android.tools.r8.internal.u3:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString -> com.android.tools.r8.internal.h3:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString EMPTY -> a
     boolean $assertionsDisabled -> b
     1:22:void <clinit>():60:81 -> <clinit>
@@ -63198,9 +63631,9 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$Output newOutput():751:751 -> d
     int peekCachedHashCode() -> e
     1:1:java.lang.String toString():1019:1019 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$ByteIterator -> com.android.tools.r8.internal.s3:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$ByteIterator -> com.android.tools.r8.internal.f3:
     byte nextByte() -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$Output -> com.android.tools.r8.internal.t3:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$Output -> com.android.tools.r8.internal.g3:
     byte[] EMPTY_BYTE_ARRAY -> a
     int bufferPos -> f
     int flushedBuffersTotalBytes -> d
@@ -63225,7 +63658,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.x7:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream -> com.android.tools.r8.internal.i7:
     byte[] buffer -> a
     int currentLimit -> h
     int recursionDepth -> i
@@ -63333,7 +63766,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.z7:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream -> com.android.tools.r8.internal.k7:
     byte[] buffer -> a
     java.io.OutputStream output -> e
     int totalBytesWritten -> d
@@ -63430,9 +63863,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.y7:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream$OutOfSpaceException -> com.android.tools.r8.internal.j7:
     1:1:void <init>():1016:1016 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite -> com.android.tools.r8.internal.Kb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite -> com.android.tools.r8.internal.eb:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite EMPTY -> a
     java.util.Map extensionsByNumber -> c
     int $r8$clinit -> b
@@ -63450,13 +63883,13 @@
     6:6:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.getNumber():830 -> a
     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
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite$ObjectIntPair -> com.android.tools.r8.internal.Jb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite$ObjectIntPair -> com.android.tools.r8.internal.db:
     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.oc:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet -> com.android.tools.r8.internal.Hb:
     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
@@ -63709,8 +64142,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.nc:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite -> com.android.tools.r8.internal.nd:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite -> com.android.tools.r8.internal.Gb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite -> com.android.tools.r8.internal.Bc:
     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
@@ -63802,15 +64235,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.hd:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder -> com.android.tools.r8.internal.id:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$1 -> com.android.tools.r8.internal.vc:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder -> com.android.tools.r8.internal.wc:
     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.jd:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder -> com.android.tools.r8.internal.xc:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet extensions -> b
     boolean extensionsIsMutable -> c
     1:3:void <init>():332:334 -> <init>
@@ -63843,7 +64276,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.kd:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage -> com.android.tools.r8.internal.yc:
     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>
@@ -63879,9 +64312,10 @@
     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.kd$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage$ExtensionWriter -> com.android.tools.r8.internal.yc$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
     boolean messageSetWireFormat -> c
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage,boolean,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$1):270:270 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage,boolean):279:279 -> <init>
@@ -63915,7 +64349,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.ld:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor -> com.android.tools.r8.internal.zc:
     boolean isPacked -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap enumTypeMap -> a
     int number -> b
@@ -63926,7 +64360,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.md:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension -> com.android.tools.r8.internal.Ac:
     java.lang.Object defaultValue -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor descriptor -> d
     java.lang.reflect.Method enumValueOf -> e
@@ -63948,14 +64382,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.bi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal -> com.android.tools.r8.internal.nh:
     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.Zh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite -> com.android.tools.r8.internal.lh:
     int getNumber() -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap -> com.android.tools.r8.internal.ai:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap -> com.android.tools.r8.internal.mh:
     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.mi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException -> com.android.tools.r8.internal.xh:
     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>
@@ -63964,14 +64398,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.go:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LazyField$LazyIterator -> com.android.tools.r8.internal.ln:
     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.Zo:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString -> com.android.tools.r8.internal.co:
     int hash -> d
     byte[] bytes -> c
     1:180:void <init>(byte[]):62:241 -> <init>
@@ -63998,13 +64432,13 @@
     3:3:boolean isValidUtf8():164 -> c
     1:1:int peekCachedHashCode():266:266 -> e
     1:17:boolean equals(java.lang.Object):181:197 -> equals
-    int getOffsetIntoBytes() -> f
+    int getOffsetIntoBytes() -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$ByteIterator iterator():307:307 -> h
     1:9:int hashCode():251:259 -> hashCode
     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.Xo:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$LiteralByteIterator -> com.android.tools.r8.internal.Yo:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$1 -> com.android.tools.r8.internal.ao:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$LiteralByteIterator -> com.android.tools.r8.internal.bo:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString this$0 -> c
     int limit -> b
     int position -> a
@@ -64015,12 +64449,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.Eq:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLiteOrBuilder -> com.android.tools.r8.internal.Dp:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType() -> a
     boolean isInitialized() -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser -> com.android.tools.r8.internal.av:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser -> com.android.tools.r8.internal.Tt:
     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.lB:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString -> com.android.tools.r8.internal.Xz:
     int[] minLengthByDepth -> c
     int treeDepth -> h
     int hash -> i
@@ -64065,13 +64499,13 @@
     28:28:boolean equals(java.lang.Object):480 -> equals
     29:55:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString.equalsFragments(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):505:531 -> equals
     29:55:boolean equals(java.lang.Object):480 -> equals
-    1:1:int[] access$600():70:70 -> f
+    1:1:int[] access$600():70:70 -> g
     1:9:int hashCode():547:555 -> hashCode
     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.hB:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$Balancer -> com.android.tools.r8.internal.iB:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$1 -> com.android.tools.r8.internal.Tz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$Balancer -> com.android.tools.r8.internal.Uz:
     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>
@@ -64093,28 +64527,28 @@
     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.jB:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator -> com.android.tools.r8.internal.Vz:
     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>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):722:722 -> <init>
     3:8:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):718:723 -> <init>
     1:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString getLeafByLeft(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):728:733 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next():761:761 -> f
-    2:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator.getNextNonEmptyLeaf():740:743 -> f
-    2:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next():765 -> f
-    6:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator.getLeafByLeft(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):728:733 -> f
-    6:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator.getNextNonEmptyLeaf():743 -> f
-    6:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next():765 -> f
-    12:12:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString.isEmpty():135:135 -> f
-    12:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator.getNextNonEmptyLeaf():744 -> f
-    12:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next():765 -> f
-    13:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next():765:765 -> f
-    14:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next():762:762 -> f
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next():761:761 -> e
+    2:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator.getNextNonEmptyLeaf():740:743 -> e
+    2:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next():765 -> e
+    6:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator.getLeafByLeft(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):728:733 -> e
+    6:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator.getNextNonEmptyLeaf():743 -> e
+    6:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next():765 -> e
+    12:12:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString.isEmpty():135:135 -> e
+    12:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator.getNextNonEmptyLeaf():744 -> e
+    12:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next():765 -> e
+    13:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next():765:765 -> e
+    14:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next():762:762 -> e
     1:1:boolean hasNext():752:752 -> hasNext
     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.kB:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$RopeByteIterator -> com.android.tools.r8.internal.Wz:
     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
@@ -64125,7 +64559,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.tC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap -> com.android.tools.r8.internal.fB:
     java.util.List entryList -> b
     java.util.Map overflowEntries -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntrySet lazyEntrySet -> e
@@ -64141,8 +64575,8 @@
     9:11:java.lang.Object put(java.lang.Comparable,java.lang.Object):243 -> a
     12:23:java.lang.Object put(java.lang.Comparable,java.lang.Object):245:256 -> a
     24:40:int binarySearchInArray(java.lang.Comparable):316:332 -> a
-    41:42:void checkMutable():364:365 -> a
     1:1:java.util.List access$400(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap):87:87 -> b
+    2:3:void checkMutable():364:365 -> b
     1:1:java.util.Map access$600(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap):87:87 -> c
     1:6:void clear():262:267 -> clear
     1:2:boolean containsKey(java.lang.Object):214:215 -> containsKey
@@ -64152,7 +64586,7 @@
     9:9:java.lang.Object removeArrayEntryAt(int):303 -> e
     10:11:java.lang.Object removeArrayEntryAt(int):303:304 -> e
     1:4:java.util.Set entrySet():353:356 -> entrySet
-    1:1:int getNumArrayEntries():180:180 -> f
+    1:1:int getNumArrayEntries():180:180 -> g
     1:6:java.lang.Object get(java.lang.Object):227:232 -> get
     1:1:java.lang.Iterable getOverflowEntries():195:195 -> j
     1:5:java.util.SortedMap getOverflowEntriesMutable():377:381 -> k
@@ -64160,7 +64594,7 @@
     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.pC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$1 -> com.android.tools.r8.internal.bB:
     1:1:void <init>(int):100:100 -> <init>
     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
@@ -64170,20 +64604,20 @@
     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.sC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet -> com.android.tools.r8.internal.eB:
     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.qC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet$1 -> com.android.tools.r8.internal.cB:
     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.rC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet$2 -> com.android.tools.r8.internal.dB:
     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.tC$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$Entry -> com.android.tools.r8.internal.fB$a:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap this$0 -> c
     java.lang.Object value -> b
     java.lang.Comparable key -> a
@@ -64207,20 +64641,20 @@
     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.tC$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntryIterator -> com.android.tools.r8.internal.fB$b:
     java.util.Iterator lazyOverflowIterator -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap this$0 -> d
     boolean nextCalledBeforeRemove -> b
     int pos -> a
     1:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap):532:534 -> <init>
     4:4:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$1):532:532 -> <init>
-    1:4:java.util.Iterator getOverflowIterator():577:580 -> f
+    1:4:java.util.Iterator getOverflowIterator():577:580 -> e
     1:1:boolean hasNext():540:540 -> hasNext
     1:7:java.util.Map$Entry com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntryIterator.next():546:552 -> next
     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.tC$c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntrySet -> com.android.tools.r8.internal.fB$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>
@@ -64232,9 +64666,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.QF:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException -> com.android.tools.r8.internal.gF:
     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.oG:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Utf8 -> com.android.tools.r8.internal.EF:
     int incompleteStateFor(int,int) -> a
     int incompleteStateFor(int,int,int) -> a
     1:66:int partialIsValidUtf8(int,byte[],int,int):163:228 -> a
@@ -64243,10 +64677,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.sH:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat -> com.android.tools.r8.internal.KG:
     int makeTag(int,int) -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$1 -> com.android.tools.r8.internal.lH:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType -> com.android.tools.r8.internal.qH:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$1 -> com.android.tools.r8.internal.DG:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType -> com.android.tools.r8.internal.IG:
     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
@@ -64275,18 +64709,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.mH:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$1 -> com.android.tools.r8.internal.EG:
     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.nH:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$2 -> com.android.tools.r8.internal.FG:
     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.oH:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$3 -> com.android.tools.r8.internal.GG:
     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.pH:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$4 -> com.android.tools.r8.internal.HG:
     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.rH:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType -> com.android.tools.r8.internal.JG:
     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
@@ -64301,7 +64735,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.uj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmClassExtensionVisitor -> 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>():78:78 -> <clinit>
@@ -64314,7 +64748,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.xj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmConstructorExtensionVisitor -> com.android.tools.r8.internal.Ei:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> a
     1:1:void <clinit>():260:260 -> <clinit>
@@ -64322,14 +64756,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.yj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmDeclarationContainerExtensionVisitor -> com.android.tools.r8.internal.Fi:
 # {"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.Aj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt -> com.android.tools.r8.internal.Gi:
 # {"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
@@ -64346,7 +64780,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.Bj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature -> com.android.tools.r8.internal.Hi:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     java.lang.String name -> a
     java.lang.String desc -> b
@@ -64363,7 +64797,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.Dj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFunctionExtensionVisitor -> com.android.tools.r8.internal.Ji:
 # {"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
@@ -64374,7 +64808,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.Ej:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature -> com.android.tools.r8.internal.Ki:
 # {"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>
@@ -64382,7 +64816,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.Tj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature -> com.android.tools.r8.internal.Zi:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     java.lang.String name -> a
     java.lang.String desc -> b
@@ -64399,7 +64833,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.Xj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPackageExtensionVisitor -> com.android.tools.r8.internal.dj:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
     1:1:void <clinit>():108:108 -> <clinit>
@@ -64411,7 +64845,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.Zj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPropertyExtensionVisitor -> com.android.tools.r8.internal.fj:
 # {"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
@@ -64425,7 +64859,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.vk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeExtensionVisitor -> com.android.tools.r8.internal.Bj:
 # {"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
@@ -64436,7 +64870,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.xk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeParameterExtensionVisitor -> com.android.tools.r8.internal.Dj:
 # {"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
@@ -64446,7 +64880,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.jm:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader -> com.android.tools.r8.internal.ol:
 # {"id":"sourceFile","fileName":"KotlinClassHeader.kt"}
     java.lang.String packageName -> i
     java.lang.String extraString -> h
@@ -64468,16 +64902,17 @@
     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.mm:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata -> com.android.tools.r8.internal.rl:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
-    com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader header -> a
+    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.mm$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class -> com.android.tools.r8.internal.rl$a:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
-    com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> b
-    com.android.tools.r8.jetbrains.kotlin.Lazy classData$delegate -> c
+    com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> c
+    com.android.tools.r8.jetbrains.kotlin.Lazy classData$delegate -> d
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):29:30 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass toKmClass():40:40 -> b
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):0:0 -> b
@@ -64487,7 +64922,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.mm$a$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer -> com.android.tools.r8.internal.rl$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
@@ -64514,7 +64949,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.mm$a$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$classData$2 -> com.android.tools.r8.internal.rl$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
@@ -64526,10 +64961,14 @@
     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$FileFacade -> com.android.tools.r8.internal.mm$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion -> com.android.tools.r8.internal.rl$b:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
-    com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> b
-    com.android.tools.r8.jetbrains.kotlin.Lazy packageData$delegate -> c
+    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.rl$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
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):84:85 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage toKmPackage():95:95 -> b
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):0:0 -> b
@@ -64539,7 +64978,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.mm$b$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer -> com.android.tools.r8.internal.rl$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
@@ -64550,7 +64989,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.mm$b$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$packageData$2 -> com.android.tools.r8.internal.rl$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
@@ -64562,15 +65001,15 @@
     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.mm$c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade -> com.android.tools.r8.internal.rl$d:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
-    java.util.List partClassNames -> b
+    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.mm$d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart -> com.android.tools.r8.internal.rl$e:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
-    com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> b
-    com.android.tools.r8.jetbrains.kotlin.Lazy packageData$delegate -> c
+    com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> c
+    com.android.tools.r8.jetbrains.kotlin.Lazy packageData$delegate -> d
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):260:261 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage toKmPackage():277:277 -> b
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):0:0 -> b
@@ -64580,7 +65019,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.mm$d$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer -> com.android.tools.r8.internal.rl$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
@@ -64591,7 +65030,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.mm$d$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$packageData$2 -> com.android.tools.r8.internal.rl$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
@@ -64603,10 +65042,10 @@
     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.mm$e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass -> com.android.tools.r8.internal.rl$f:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
-    com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> b
-    com.android.tools.r8.jetbrains.kotlin.Lazy functionData$delegate -> c
+    com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> c
+    com.android.tools.r8.jetbrains.kotlin.Lazy functionData$delegate -> d
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):140:141 -> <init>
     1:1:boolean isLambda():159:159 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda toKmLambda():153:153 -> c
@@ -64619,7 +65058,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.nm:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer -> com.android.tools.r8.internal.sl:
 # {"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
@@ -64636,15 +65075,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.om:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$functionData$2 -> com.android.tools.r8.internal.tl:
 # {"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.mm$f:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Unknown -> com.android.tools.r8.internal.rl$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.tj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension -> com.android.tools.r8.internal.Bi:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     java.util.List localDelegatedProperties -> c
     java.lang.String anonymousObjectOriginName -> e
@@ -64663,7 +65102,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.wj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmConstructorExtension -> com.android.tools.r8.internal.Di:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature signature -> b
     1:1:void <init>():133:133 -> <init>
@@ -64675,11 +65114,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.JvmExtensionNodesKt -> com.android.tools.r8.internal.zj:
-# {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):13:13 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPropertyExtension getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):22:22 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmFunctionExtension -> com.android.tools.r8.internal.Cj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmFunctionExtension -> com.android.tools.r8.internal.Ii:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature signature -> c
     java.lang.String lambdaClassOriginName -> d
@@ -64693,7 +65128,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.Rj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions -> com.android.tools.r8.internal.Xi:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     1:1:void <init>():17:17 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature access$toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):17:17 -> a
@@ -64725,7 +65160,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.Jj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1 -> com.android.tools.r8.internal.Pi:
 # {"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
@@ -64733,21 +65168,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.Ij:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1$visitLocalDelegatedProperty$1 -> com.android.tools.r8.internal.Oi:
 # {"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.Kj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeConstructorExtensions$1 -> com.android.tools.r8.internal.Qi:
 # {"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.Lj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeFunctionExtensions$1 -> com.android.tools.r8.internal.Ri:
 # {"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
@@ -64755,21 +65190,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.Nj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1 -> com.android.tools.r8.internal.Ti:
 # {"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.Mj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1$visitLocalDelegatedProperty$1 -> com.android.tools.r8.internal.Si:
 # {"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.Oj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePropertyExtensions$1 -> com.android.tools.r8.internal.Ui:
 # {"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
@@ -64798,20 +65233,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.Pj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeTypeExtensions$1 -> com.android.tools.r8.internal.Vi:
 # {"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.Qj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeTypeParameterExtensions$1 -> com.android.tools.r8.internal.Wi:
 # {"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.Wj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPackageExtension -> com.android.tools.r8.internal.cj:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     java.util.List localDelegatedProperties -> c
     java.lang.String moduleName -> d
@@ -64827,7 +65262,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.Yj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPropertyExtension -> com.android.tools.r8.internal.ej:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature syntheticMethodForAnnotations -> g
     int jvmFlags -> c
@@ -64847,7 +65282,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.uk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeExtension -> com.android.tools.r8.internal.Aj:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     java.util.List annotations -> d
     boolean isRaw -> c
@@ -64863,7 +65298,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.wk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeParameterExtension -> com.android.tools.r8.internal.Cj:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     java.util.List annotations -> c
     1:2:void <init>():146:147 -> <init>
@@ -64876,55 +65311,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.jetbrains.kotlinx.metadata.jvm.impl.JvmWriteUtilsKt -> com.android.tools.r8.internal.yk:
-# {"id":"sourceFile","fileName":"jvmWriteUtils.kt"}
-    1:3:com.android.tools.r8.jetbrains.kotlin.Pair writeProtoBufData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):14:16 -> a
-    4:64: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
-    4:64:com.android.tools.r8.jetbrains.kotlin.Pair writeProtoBufData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):16 -> a
-    65:70:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite.writeTo(java.io.OutputStream):77:82 -> a
-    65:70: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):61 -> a
-    65:70:com.android.tools.r8.jetbrains.kotlin.Pair writeProtoBufData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):16 -> a
-    71:71: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):62:62 -> a
-    71:71:com.android.tools.r8.jetbrains.kotlin.Pair writeProtoBufData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):16 -> a
-    72:72: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):59:59 -> a
-    72:72:com.android.tools.r8.jetbrains.kotlin.Pair writeProtoBufData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):16 -> a
-    73:78:com.android.tools.r8.jetbrains.kotlin.Pair writeProtoBufData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):17:22 -> a
-    79:86:com.android.tools.r8.jetbrains.kotlin.Pair writeProtoBufData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):15:22 -> a
-    87:87:com.android.tools.r8.jetbrains.kotlin.Pair writeProtoBufData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):21:21 -> a
-    88:88:com.android.tools.r8.jetbrains.kotlin.Pair writeProtoBufData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):14:14 -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmAnnotationVisitorProvider -> com.android.tools.r8.internal.Ll:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmAnnotationVisitorProvider -> com.android.tools.r8.internal.Qk:
     void get(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmContractVisitorProvider -> com.android.tools.r8.internal.Ml:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectExpressionVisitorProvider -> com.android.tools.r8.internal.Nl:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectVisitorProvider -> com.android.tools.r8.internal.Ol:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmContractVisitorProvider -> com.android.tools.r8.internal.Rk:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectExpressionVisitorProvider -> com.android.tools.r8.internal.Sk:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectVisitorProvider -> com.android.tools.r8.internal.Tk:
     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.Pl:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmFlexibleUpperBoundVisitorProvider -> com.android.tools.r8.internal.Uk:
     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.Ql:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmFunctionVisitorProvider -> com.android.tools.r8.internal.Vk:
     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.Rl:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider -> com.android.tools.r8.internal.Sl:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmLambdaVisitorProvider -> com.android.tools.r8.internal.Wk:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider -> com.android.tools.r8.internal.Xk:
     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.Tl:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeAliasVisitorProvider -> com.android.tools.r8.internal.Yk:
     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.Ul:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeParameterVisitorProvider -> com.android.tools.r8.internal.Zk:
     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.Vl:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeProjectionVisitorProvider -> com.android.tools.r8.internal.al:
     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.Wl:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeVisitorProvider -> com.android.tools.r8.internal.Xl:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmValueParameterVisitorProvider -> com.android.tools.r8.internal.Yl:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeStarProjectionVisitorProvider -> com.android.tools.r8.internal.bl:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeVisitorProvider -> com.android.tools.r8.internal.cl:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmValueParameterVisitorProvider -> com.android.tools.r8.internal.dl:
     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.Zl:
-com.android.tools.r8.kotlin.Kotlin -> com.android.tools.r8.internal.bm:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmVersionRequirementVisitorProvider -> com.android.tools.r8.internal.el:
+com.android.tools.r8.kotlin.Kotlin -> com.android.tools.r8.internal.gl:
     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.bm$a:
-com.android.tools.r8.kotlin.Kotlin$Functional -> com.android.tools.r8.internal.bm$b:
+com.android.tools.r8.kotlin.Kotlin$1 -> com.android.tools.r8.internal.gl$a:
+com.android.tools.r8.kotlin.Kotlin$Functional -> com.android.tools.r8.internal.gl$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
@@ -64944,29 +65363,34 @@
     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.bm$c:
-    com.android.tools.r8.graph.DexMethod throwNpe -> c
-    com.android.tools.r8.graph.DexMethod checkParameterIsNotNull -> b
-    com.android.tools.r8.graph.DexMethod throwParameterIsNullException -> a
+com.android.tools.r8.kotlin.Kotlin$Intrinsics -> com.android.tools.r8.internal.gl$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
+    com.android.tools.r8.graph.DexMethod throwParameterIsNullException -> b
+    com.android.tools.r8.kotlin.Kotlin this$0 -> e
     1:4:void <init>(com.android.tools.r8.kotlin.Kotlin):111:114 -> <init>
     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.bm$d:
+com.android.tools.r8.kotlin.Kotlin$Metadata -> com.android.tools.r8.internal.gl$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
+    com.android.tools.r8.kotlin.Kotlin this$0 -> i
     com.android.tools.r8.graph.DexString data1 -> d
     com.android.tools.r8.graph.DexString data2 -> e
     com.android.tools.r8.graph.DexString extraString -> f
     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.bm$e:
-    com.android.tools.r8.graph.DexField enabledField -> b
+com.android.tools.r8.kotlin.Kotlin$_Assertions -> com.android.tools.r8.internal.gl$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.hm:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo -> com.android.tools.r8.internal.ml:
     java.util.Map EMPTY_ARGUMENTS -> a
     1:1:void <clinit>():30:30 -> <clinit>
     1:1:void <init>():27:27 -> <init>
@@ -64975,14 +65399,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.cm:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo -> com.android.tools.r8.internal.hl:
     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.dm:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationArrayValueInfo -> com.android.tools.r8.internal.il:
     java.util.List value -> c
     com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationArrayValueInfo EMPTY -> b
     1:2:void <clinit>():145:146 -> <clinit>
@@ -64991,14 +65415,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.em:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationClassValueInfo -> com.android.tools.r8.internal.jl:
     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.fm:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationEnumValueInfo -> com.android.tools.r8.internal.kl:
     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>
@@ -65006,14 +65430,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.gm:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationPrimitiveArgumentInfo -> com.android.tools.r8.internal.ll:
     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.im:
+com.android.tools.r8.kotlin.KotlinAnnotationInfo -> com.android.tools.r8.internal.nl:
     java.util.List EMPTY_ANNOTATIONS -> a
     java.util.Map arguments -> c
     com.android.tools.r8.kotlin.KotlinTypeReference annotationType -> b
@@ -65028,7 +65452,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.km:
+com.android.tools.r8.kotlin.KotlinClassInfo -> com.android.tools.r8.internal.pl:
     com.android.tools.r8.kotlin.KotlinVersionRequirementInfo versionRequirements -> k
     java.lang.String packageName -> m
     com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo localDelegatedProperties -> n
@@ -65054,7 +65478,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():650:650 -> a
+    36:36:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():632:632 -> 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
@@ -65100,14 +65524,14 @@
     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 -> j
     1:1:int[] getMetadataVersion():302:302 -> n
-com.android.tools.r8.kotlin.KotlinClassLevelInfo -> com.android.tools.r8.internal.lm:
+com.android.tools.r8.kotlin.KotlinClassLevelInfo -> com.android.tools.r8.internal.ql:
     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
     com.android.tools.r8.kotlin.KotlinSyntheticClassInfo asSyntheticClass() -> f
     java.lang.String getPackageName() -> j
     boolean isSyntheticClass() -> l
     int[] getMetadataVersion() -> n
-com.android.tools.r8.kotlin.KotlinClassMetadataReader -> com.android.tools.r8.internal.pm:
+com.android.tools.r8.kotlin.KotlinClassMetadataReader -> com.android.tools.r8.internal.ul:
     1:20: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
     21: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):70:76 -> 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):62:62 -> a
@@ -65153,11 +65577,11 @@
     2:2:java.lang.String[] getUnboxedStringArray(com.android.tools.r8.graph.DexValue,java.lang.String):202 -> c
     3:7:java.lang.String[] getUnboxedStringArray(com.android.tools.r8.graph.DexValue,java.lang.String):205:209 -> c
     8:8: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.pm$a:
-com.android.tools.r8.kotlin.KotlinClassMetadataReader$MetadataError -> com.android.tools.r8.internal.pm$b:
+com.android.tools.r8.kotlin.KotlinClassMetadataReader$1 -> com.android.tools.r8.internal.ul$a:
+com.android.tools.r8.kotlin.KotlinClassMetadataReader$MetadataError -> com.android.tools.r8.internal.ul$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.wm:
+com.android.tools.r8.kotlin.KotlinClassifierInfo -> com.android.tools.r8.internal.Bl:
     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
@@ -65165,44 +65589,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.qm:
-com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinClassClassifierInfo -> com.android.tools.r8.internal.rm:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$1 -> com.android.tools.r8.internal.vl:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinClassClassifierInfo -> com.android.tools.r8.internal.wl:
     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.sm:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinTypeAliasClassifierInfo -> com.android.tools.r8.internal.xl:
     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.tm:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinTypeParameterClassifierInfo -> com.android.tools.r8.internal.yl:
     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.um:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinUnknownClassClassifierInfo -> com.android.tools.r8.internal.zl:
     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.vm:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinUnknownClassifierInfo -> com.android.tools.r8.internal.Al:
     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.xm:
+com.android.tools.r8.kotlin.KotlinCompanionInfo -> com.android.tools.r8.internal.Cl:
     1:1:void <init>():14:14 -> <init>
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
     boolean isCompanion() -> d
     com.android.tools.r8.kotlin.KotlinCompanionInfo asCompanion() -> e
-com.android.tools.r8.kotlin.KotlinConstructorInfo -> com.android.tools.r8.internal.ym:
+com.android.tools.r8.kotlin.KotlinConstructorInfo -> com.android.tools.r8.internal.Dl:
     java.util.List valueParameters -> b
     com.android.tools.r8.kotlin.KotlinVersionRequirementInfo versionRequirements -> c
     com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo signature -> d
@@ -65222,7 +65646,7 @@
     43:45:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):80:82 -> a
     boolean isConstructor() -> g
     com.android.tools.r8.kotlin.KotlinConstructorInfo asConstructor() -> h
-com.android.tools.r8.kotlin.KotlinContractInfo -> com.android.tools.r8.internal.zm:
+com.android.tools.r8.kotlin.KotlinContractInfo -> com.android.tools.r8.internal.El:
     com.android.tools.r8.kotlin.KotlinContractInfo NO_EFFECT -> a
     java.util.List effects -> b
     1:1:void <clinit>():23:23 -> <clinit>
@@ -65234,7 +65658,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.Bm:
+com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo -> com.android.tools.r8.internal.Gl:
     java.util.List typeAliases -> b
     java.util.List propertiesWithNoBacking -> d
     java.util.List functionsWithNoBacking -> c
@@ -65263,7 +65687,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.Am:
+com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup -> com.android.tools.r8.internal.Fl:
     com.android.tools.r8.graph.DexEncodedField backingField -> b
     com.android.tools.r8.graph.DexEncodedMethod getter -> d
     com.android.tools.r8.graph.DexEncodedMethod setter -> c
@@ -65276,7 +65700,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.Cm:
+com.android.tools.r8.kotlin.KotlinEffectExpressionInfo -> com.android.tools.r8.internal.Hl:
     java.util.List NO_EXPRESSIONS -> a
     java.lang.Integer parameterIndex -> d
     com.android.tools.r8.kotlin.KotlinEffectExpressionInfo NO_EXPRESSION -> b
@@ -65293,7 +65717,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.Dm:
+com.android.tools.r8.kotlin.KotlinEffectInfo -> com.android.tools.r8.internal.Il:
     com.android.tools.r8.kotlin.KotlinEffectExpressionInfo conclusion -> d
     java.util.List constructorArguments -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind invocationKind -> b
@@ -65302,12 +65726,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.Em:
+com.android.tools.r8.kotlin.KotlinFieldLevelInfo -> com.android.tools.r8.internal.Jl:
     com.android.tools.r8.kotlin.KotlinPropertyInfo asFieldProperty() -> c
     boolean isCompanion() -> d
     com.android.tools.r8.kotlin.KotlinCompanionInfo asCompanion() -> e
     boolean isFieldProperty() -> m
-com.android.tools.r8.kotlin.KotlinFileFacadeInfo -> com.android.tools.r8.internal.Fm:
+com.android.tools.r8.kotlin.KotlinFileFacadeInfo -> com.android.tools.r8.internal.Kl:
     int[] metadataVersion -> c
     com.android.tools.r8.kotlin.KotlinPackageInfo packageInfo -> a
     java.lang.String packageName -> b
@@ -65318,7 +65742,7 @@
     10:10:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):80:80 -> a
     1:1:java.lang.String getPackageName():70:70 -> j
     1:1:int[] getMetadataVersion():75:75 -> n
-com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo -> com.android.tools.r8.internal.Gm:
+com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo -> com.android.tools.r8.internal.Ll:
     java.lang.String typeFlexibilityId -> k
     com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo NO_FLEXIBLE_UPPER_BOUND -> i
     boolean $assertionsDisabled -> j
@@ -65329,7 +65753,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.Hm:
+com.android.tools.r8.kotlin.KotlinFunctionInfo -> com.android.tools.r8.internal.Ml:
     com.android.tools.r8.kotlin.KotlinTypeReference lambdaClassOrigin -> h
     com.android.tools.r8.kotlin.KotlinTypeInfo receiverParameterType -> e
     java.util.List typeParameters -> f
@@ -65367,14 +65791,14 @@
     boolean isFunction() -> i
     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.Im:
+com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo -> com.android.tools.r8.internal.Nl:
     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.Jm:
+com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo -> com.android.tools.r8.internal.Ol:
     java.util.List EMPTY_PARAMETERS_LIST -> a
     java.lang.String invalidDescriptor -> f
     java.util.List parameters -> e
@@ -65389,7 +65813,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.Km:
+com.android.tools.r8.kotlin.KotlinLambdaInfo -> com.android.tools.r8.internal.Pl:
     boolean $assertionsDisabled -> a
     com.android.tools.r8.kotlin.KotlinFunctionInfo function -> b
     boolean hasBacking -> c
@@ -65401,7 +65825,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.Lm:
+com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo -> com.android.tools.r8.internal.Ql:
     java.util.List propertyInfos -> c
     com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo EMPTY_DELEGATED_PROPERTIES -> a
     boolean $assertionsDisabled -> b
@@ -65412,9 +65836,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.KotlinMemberLevelInfo -> com.android.tools.r8.internal.Mm:
+com.android.tools.r8.kotlin.KotlinMemberLevelInfo -> com.android.tools.r8.internal.Rl:
     boolean isNoKotlinInformation() -> a
-com.android.tools.r8.kotlin.KotlinMetadataDiagnostic -> com.android.tools.r8.internal.Nm:
+com.android.tools.r8.kotlin.KotlinMetadataDiagnostic -> com.android.tools.r8.internal.Sl:
     com.android.tools.r8.origin.Origin origin -> a
     com.android.tools.r8.position.Position position -> b
     java.lang.String message -> c
@@ -65422,7 +65846,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.Qm:
+com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension -> com.android.tools.r8.internal.Vl:
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set prunedTypes -> d
     com.android.tools.r8.shaking.Enqueuer$EnqueuerDefinitionSupplier enqueuerDefinitionSupplier -> c
@@ -65448,7 +65872,7 @@
     87:87:com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$KotlinMetadataDefinitionSupplier com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension.definitionsForContext(com.android.tools.r8.graph.ProgramDefinition):42:42 -> a
     87:87:void lambda$done$5(com.android.tools.r8.graph.DexProgramClass):104 -> a
     88:89:void lambda$done$5(com.android.tools.r8.graph.DexProgramClass):104:105 -> a
-    90:91:void com.android.tools.r8.graph.DexProgramClass.forEachProgramMember(java.util.function.Consumer):193:194 -> a
+    90:91:void com.android.tools.r8.graph.DexProgramClass.forEachProgramMember(java.util.function.Consumer):152:153 -> a
     90:91:void lambda$done$5(com.android.tools.r8.graph.DexProgramClass):105 -> a
     92:93:void lambda$done$4(com.android.tools.r8.graph.ProgramMember):108:109 -> a
     94:94:com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$KotlinMetadataDefinitionSupplier com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension.definitionsForContext(com.android.tools.r8.graph.ProgramDefinition):42:42 -> a
@@ -65461,8 +65885,8 @@
     99:100:boolean com.android.tools.r8.kotlin.KotlinClassMetadataReader.hasKotlinClassMetadataAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):93:94 -> a
     99:100:void lambda$verifyKotlinMetadataModeledForAllClasses$6(boolean,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):119 -> a
     101:105:void lambda$verifyKotlinMetadataModeledForAllClasses$6(boolean,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):119:119 -> a
-com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$1 -> com.android.tools.r8.internal.Om:
-com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$KotlinMetadataDefinitionSupplier -> com.android.tools.r8.internal.Pm:
+com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$1 -> com.android.tools.r8.internal.Tl:
+com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$KotlinMetadataDefinitionSupplier -> com.android.tools.r8.internal.Ul:
     java.util.Set prunedTypes -> c
     com.android.tools.r8.shaking.Enqueuer$EnqueuerDefinitionSupplier enqueuerDefinitionSupplier -> b
     com.android.tools.r8.graph.ProgramDefinition context -> a
@@ -65471,7 +65895,7 @@
     2:5:void <init>(com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.Enqueuer$EnqueuerDefinitionSupplier,java.util.Set):136:139 -> <init>
     1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():155:155 -> a
     1:4:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):147:150 -> c
-com.android.tools.r8.kotlin.KotlinMetadataRewriter -> com.android.tools.r8.internal.Tm:
+com.android.tools.r8.kotlin.KotlinMetadataRewriter -> com.android.tools.r8.internal.Yl:
     com.android.tools.r8.kotlin.Kotlin kotlin -> f
     com.android.tools.r8.graph.DexItemFactory factory -> e
     com.android.tools.r8.graph.AppView appView -> c
@@ -65497,7 +65921,7 @@
     53:61:void writeKotlinInfoToAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.KotlinClassLevelInfo,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):159:167 -> a
     62:66:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.unexpectedErrorWhenRewriting(com.android.tools.r8.graph.DexType,java.lang.Throwable):67:71 -> a
     62:66:void writeKotlinInfoToAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.KotlinClassLevelInfo,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):169 -> a
-    67:69:java.lang.String com.android.tools.r8.utils.StringUtils.stacktraceAsString(java.lang.Throwable):344:346 -> a
+    67:69:java.lang.String com.android.tools.r8.utils.StringUtils.stacktraceAsString(java.lang.Throwable):340:342 -> a
     67:69:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.unexpectedErrorWhenRewriting(com.android.tools.r8.graph.DexType,java.lang.Throwable):74 -> a
     67:69:void writeKotlinInfoToAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.KotlinClassLevelInfo,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):169 -> a
     70:70:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.unexpectedErrorWhenRewriting(com.android.tools.r8.graph.DexType,java.lang.Throwable):74:74 -> a
@@ -65517,10 +65941,13 @@
     145:149:com.android.tools.r8.graph.DexValue$DexValueArray createIntArray(int[]):235:239 -> a
     150:154:com.android.tools.r8.graph.DexValue$DexValueArray createStringArray(java.lang.String[]):243:247 -> a
     155:164:int[] getMaxVersion(int[],int[]):252:261 -> a
-    1:14:void runForR8(java.util.concurrent.ExecutorService):88:101 -> b
-    15:15:void runForR8(java.util.concurrent.ExecutorService):100:100 -> b
-com.android.tools.r8.kotlin.KotlinMetadataRewriter$1 -> com.android.tools.r8.internal.Rm:
-com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo -> com.android.tools.r8.internal.Sm:
+    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):273:273 -> 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.Wl:
+com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo -> com.android.tools.r8.internal.Xl:
     boolean writeData2 -> e
     boolean writeExtraString -> f
     boolean writePackageName -> g
@@ -65533,7 +65960,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.Ym:
+com.android.tools.r8.kotlin.KotlinMetadataUtils -> com.android.tools.r8.internal.dm:
     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>
@@ -65547,8 +65974,8 @@
     24:24:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isProguardKeepRule():0:0 -> a
     24:24:boolean canBeKotlinMetadataKeepRule(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexItemFactory):179 -> a
     25:35:boolean canBeKotlinMetadataKeepRule(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexItemFactory):182:192 -> a
-com.android.tools.r8.kotlin.KotlinMetadataUtils$1 -> com.android.tools.r8.internal.Um:
-com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor -> com.android.tools.r8.internal.Xm:
+com.android.tools.r8.kotlin.KotlinMetadataUtils$1 -> com.android.tools.r8.internal.Zl:
+com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor -> com.android.tools.r8.internal.cm:
     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
@@ -65563,17 +65990,17 @@
     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.Wm:
+com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1 -> com.android.tools.r8.internal.bm:
     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.Vm:
+com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1$1 -> com.android.tools.r8.internal.am:
     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.Ym$a:
+com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo -> com.android.tools.r8.internal.dm$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>
@@ -65583,7 +66010,7 @@
     1:1:java.lang.String getPackageName():57:57 -> j
     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.Zm:
+com.android.tools.r8.kotlin.KotlinMetadataWriter -> com.android.tools.r8.internal.em:
     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
@@ -65805,13 +66232,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.an:
+com.android.tools.r8.kotlin.KotlinMethodLevelInfo -> com.android.tools.r8.internal.fm:
     com.android.tools.r8.kotlin.KotlinFunctionInfo asFunction() -> b
     boolean isConstructor() -> g
     com.android.tools.r8.kotlin.KotlinConstructorInfo asConstructor() -> h
     boolean isFunction() -> i
     com.android.tools.r8.kotlin.KotlinPropertyInfo asProperty() -> k
-com.android.tools.r8.kotlin.KotlinMultiFileClassFacadeInfo -> com.android.tools.r8.internal.bn:
+com.android.tools.r8.kotlin.KotlinMultiFileClassFacadeInfo -> com.android.tools.r8.internal.gm:
     java.util.List partClassNames -> a
     int[] metadataVersion -> c
     java.lang.String packageName -> b
@@ -65842,7 +66269,7 @@
     387:387:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):83:83 -> a
     1:1:java.lang.String getPackageName():73:73 -> j
     1:1:int[] getMetadataVersion():78:78 -> n
-com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo -> com.android.tools.r8.internal.cn:
+com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo -> com.android.tools.r8.internal.hm:
     int[] metadataVersion -> d
     java.lang.String facadeClassName -> a
     com.android.tools.r8.kotlin.KotlinPackageInfo packageInfo -> b
@@ -65856,7 +66283,7 @@
     10:10:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):87:87 -> a
     1:1:java.lang.String getPackageName():77:77 -> j
     1:1:int[] getMetadataVersion():82:82 -> n
-com.android.tools.r8.kotlin.KotlinPackageInfo -> com.android.tools.r8.internal.en:
+com.android.tools.r8.kotlin.KotlinPackageInfo -> com.android.tools.r8.internal.jm:
     com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo containerInfo -> b
     java.lang.String moduleName -> a
     com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo localDelegatedProperties -> c
@@ -65883,7 +66310,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.fn:
+com.android.tools.r8.kotlin.KotlinPropertyInfo -> com.android.tools.r8.internal.km:
     com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo syntheticMethodForAnnotations -> n
     com.android.tools.r8.kotlin.KotlinVersionRequirementInfo versionRequirements -> i
     int jvmFlags -> j
@@ -65922,7 +66349,7 @@
     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.hn:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser -> com.android.tools.r8.internal.mm:
     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
@@ -65959,8 +66386,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.hn$a:
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader -> com.android.tools.r8.internal.hn$b:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$1 -> com.android.tools.r8.internal.mm$a:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader -> com.android.tools.r8.internal.mm$b:
     java.io.BufferedReader reader -> b
     boolean $assertionsDisabled -> a
     java.lang.String readLine -> c
@@ -65974,25 +66401,25 @@
     1:1:java.lang.String readNextLine():49:49 -> b
     2:3:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader readUntil(java.lang.String):69:70 -> b
     1:1:void close():108:108 -> close
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$KotlinSourceDebugExtensionParserException -> com.android.tools.r8.internal.hn$c:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$KotlinSourceDebugExtensionParserException -> com.android.tools.r8.internal.mm$c:
     1:1:void <init>(java.lang.String):34:34 -> <init>
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Position -> com.android.tools.r8.internal.hn$d:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Position -> com.android.tools.r8.internal.mm$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.hn$e:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result -> com.android.tools.r8.internal.mm$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.hn$f:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder -> com.android.tools.r8.internal.mm$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.hn$g:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source -> com.android.tools.r8.internal.mm$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>
@@ -66000,7 +66427,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.in:
+com.android.tools.r8.kotlin.KotlinSyntheticClassInfo -> com.android.tools.r8.internal.nm:
     com.android.tools.r8.kotlin.KotlinLambdaInfo lambda -> b
     com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour flavour -> e
     int[] metadataVersion -> d
@@ -66025,13 +66452,13 @@
     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.in$a:
+com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour -> com.android.tools.r8.internal.nm$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.jn:
+com.android.tools.r8.kotlin.KotlinTypeAliasInfo -> com.android.tools.r8.internal.om:
     com.android.tools.r8.kotlin.KotlinTypeInfo expandedType -> e
     java.util.List typeParameters -> f
     com.android.tools.r8.kotlin.KotlinTypeInfo underlyingType -> d
@@ -66047,7 +66474,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.kn:
+com.android.tools.r8.kotlin.KotlinTypeInfo -> com.android.tools.r8.internal.pm:
     java.util.List EMPTY_ARGUMENTS -> a
     com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo flexibleTypeUpperBound -> h
     com.android.tools.r8.kotlin.KotlinTypeInfo outerType -> e
@@ -66065,7 +66492,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.ln:
+com.android.tools.r8.kotlin.KotlinTypeParameterInfo -> com.android.tools.r8.internal.qm:
     java.util.List EMPTY_UPPER_BOUNDS -> b
     java.util.List EMPTY_TYPE_PARAMETERS -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance variance -> f
@@ -66099,7 +66526,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.mn:
+com.android.tools.r8.kotlin.KotlinTypeProjectionInfo -> com.android.tools.r8.internal.rm:
     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>
@@ -66109,7 +66536,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.nn:
+com.android.tools.r8.kotlin.KotlinTypeReference -> com.android.tools.r8.internal.sm:
     com.android.tools.r8.graph.DexType known -> b
     boolean $assertionsDisabled -> a
     java.lang.String unknown -> c
@@ -66131,7 +66558,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.on:
+com.android.tools.r8.kotlin.KotlinValueParameterInfo -> com.android.tools.r8.internal.tm:
     java.util.List EMPTY_VALUE_PARAMETERS -> a
     com.android.tools.r8.kotlin.KotlinTypeInfo varargElementType -> e
     com.android.tools.r8.kotlin.KotlinTypeInfo type -> d
@@ -66143,14 +66570,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.qn:
+com.android.tools.r8.kotlin.KotlinVersionRequirementInfo -> com.android.tools.r8.internal.vm:
     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.pn:
+com.android.tools.r8.kotlin.KotlinVersionRequirementInfo$KotlinVersionRequirementPoint -> com.android.tools.r8.internal.um:
     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
@@ -66161,7 +66588,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.kp:
+com.android.tools.r8.logging.Log -> com.android.tools.r8.internal.no:
     java.util.Set CLASS_FILTER -> b
     boolean ENABLED -> a
     1:1:void <clinit>():12:12 -> <clinit>
@@ -66294,40 +66721,49 @@
     1:1:java.util.function.Predicate access$100(com.android.tools.r8.naming.ClassNameMinifier):36:36 -> a
     2:2:void setUsedTypeName(java.lang.String):88:88 -> a
     2:2:void access$400(com.android.tools.r8.naming.ClassNameMinifier,java.lang.String):36 -> a
-    3:24:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming computeRenaming(com.android.tools.r8.utils.Timing):104:125 -> a
-    25:41:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming computeRenaming(com.android.tools.r8.utils.Timing):121:137 -> a
-    42:50:java.util.Map getPackageRenaming():141:149 -> a
-    42:50:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming computeRenaming(com.android.tools.r8.utils.Timing):137 -> a
-    51:51:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming computeRenaming(com.android.tools.r8.utils.Timing):137:137 -> a
-    52:53:void renameDanglingTypes(com.android.tools.r8.graph.DexClass):153:154 -> a
-    54:54:void renameDanglingTypesInField(com.android.tools.r8.graph.DexEncodedField):158:158 -> a
-    55:58:void renameDanglingTypesInMethod(com.android.tools.r8.graph.DexEncodedMethod):162:165 -> a
-    59:61:void registerClassAsUsed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):181:183 -> a
-    62:67:void registerPackagePrefixesAsUsed(java.lang.String,boolean):204:209 -> a
-    62:67:void registerClassAsUsed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):182 -> a
-    68:68:void registerClassAsUsed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):185:185 -> a
-    69:69:void setUsedTypeName(java.lang.String):88:88 -> a
-    69:69:void registerClassAsUsed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):185 -> a
-    70:77:void registerClassAsUsed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):186:193 -> a
-    78:83:void registerPackagePrefixesAsUsed(java.lang.String,boolean):204:209 -> a
-    84:99:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):232:247 -> a
-    100:116:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForOuterClass(com.android.tools.r8.graph.DexType,java.lang.String):294:310 -> a
-    100:116:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):249 -> a
-    117:119:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):253:255 -> a
-    120:124:java.lang.String getParentPackagePrefix(java.lang.String):398:402 -> a
+    3:27:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming computeRenaming(com.android.tools.r8.utils.Timing,java.util.Map):108:132 -> a
+    28:44:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming computeRenaming(com.android.tools.r8.utils.Timing,java.util.Map):128:144 -> a
+    45:53:java.util.Map getPackageRenaming():148:156 -> a
+    45:53:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming computeRenaming(com.android.tools.r8.utils.Timing,java.util.Map):144 -> a
+    54:54:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming computeRenaming(com.android.tools.r8.utils.Timing,java.util.Map):144:144 -> a
+    55:56:void renameDanglingTypes(com.android.tools.r8.graph.DexClass):160:161 -> a
+    57:57:void renameDanglingTypesInField(com.android.tools.r8.graph.DexEncodedField):165:165 -> a
+    58:61:void renameDanglingTypesInMethod(com.android.tools.r8.graph.DexEncodedMethod):169:172 -> a
+    62:64:void registerClassAsUsed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):188:190 -> a
+    65:70:void registerPackagePrefixesAsUsed(java.lang.String,boolean):211:216 -> a
+    65:70:void registerClassAsUsed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):189 -> a
+    71:71:void registerClassAsUsed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):192:192 -> a
+    72:72:void setUsedTypeName(java.lang.String):88:88 -> a
+    72:72:void registerClassAsUsed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):192 -> a
+    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):273:273 -> 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
+    104:120:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):256 -> a
+    121:123:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):260:262 -> a
+    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:15:com.android.tools.r8.graph.DexType getOutClassForType(com.android.tools.r8.graph.DexType):214:227 -> b
-    16:33:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForPackagePrefix(java.lang.String):271:288 -> 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):273:273 -> 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
     1:1:java.util.Set access$300(com.android.tools.r8.naming.ClassNameMinifier):36:36 -> c
-    2:2:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForClass(com.android.tools.r8.graph.DexType):259:259 -> c
+    2:2:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForClass(com.android.tools.r8.graph.DexType):266:266 -> c
     3:3:java.lang.String com.android.tools.r8.utils.DescriptorUtils.getPackageBinaryNameFromJavaType(java.lang.String):380:380 -> c
-    3:3:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForClass(com.android.tools.r8.graph.DexType):259 -> c
-    4:9:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForClass(com.android.tools.r8.graph.DexType):262:267 -> c
-    10:10:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForClass(com.android.tools.r8.graph.DexType):265:265 -> c
-    11:11:com.android.tools.r8.naming.ClassNameMinifier$Namespace lambda$getStateForClass$1(java.lang.String):265:265 -> c
+    3:3:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForClass(com.android.tools.r8.graph.DexType):266 -> c
+    4:9:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForClass(com.android.tools.r8.graph.DexType):269:274 -> c
+    10:10:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForClass(com.android.tools.r8.graph.DexType):272:272 -> c
+    11:11: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:8:void renameDanglingType(com.android.tools.r8.graph.DexType):170:176 -> d
-    9:9:com.android.tools.r8.naming.ClassNameMinifier$Namespace lambda$getStateForPackagePrefix$2(java.lang.String):278:278 -> 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):273:273 -> 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
     1:1:com.android.tools.r8.naming.ClassNameMinifier$PackageNamingStrategy access$600(com.android.tools.r8.naming.ClassNameMinifier):36:36 -> e
     2:2:boolean lambda$new$0(java.lang.String):80:80 -> e
 com.android.tools.r8.naming.ClassNameMinifier$1 -> com.android.tools.r8.naming.c$a:
@@ -66347,19 +66783,19 @@
     int nameIndex -> e
     boolean $assertionsDisabled -> a
     java.lang.String packageName -> b
-    1:1:void <clinit>():315:315 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.naming.ClassNameMinifier,java.lang.String):323:323 -> <init>
-    2:2:void <init>(com.android.tools.r8.naming.ClassNameMinifier,java.lang.String,java.lang.String):326:326 -> <init>
-    3:15:void <init>(com.android.tools.r8.naming.ClassNameMinifier,java.lang.String,java.lang.String):319:331 -> <init>
-    1:3:com.android.tools.r8.graph.DexString nextTypeName(com.android.tools.r8.graph.DexType):339:341 -> a
-    4:4:int getDictionaryIndex():354:354 -> a
-    5:6:int incrementNameIndex(boolean):364:365 -> a
-    1:1:int incrementDictionaryIndex():359:359 -> b
-    1:1:java.lang.String getPackageName():335:335 -> c
-    1:1:java.lang.String nextPackagePrefix():346:346 -> d
-    2:3:java.lang.String com.android.tools.r8.naming.Minifier$MinificationPackageNamingStrategy.next(char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):207:208 -> d
-    2:3:java.lang.String nextPackagePrefix():346 -> d
-    4:5:java.lang.String nextPackagePrefix():347:348 -> d
+    1:1:void <clinit>():322:322 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.naming.ClassNameMinifier,java.lang.String):330:330 -> <init>
+    2:2:void <init>(com.android.tools.r8.naming.ClassNameMinifier,java.lang.String,java.lang.String):333:333 -> <init>
+    3:15:void <init>(com.android.tools.r8.naming.ClassNameMinifier,java.lang.String,java.lang.String):326:338 -> <init>
+    1:3:com.android.tools.r8.graph.DexString nextTypeName(com.android.tools.r8.graph.DexType):346:348 -> a
+    4:4:int getDictionaryIndex():361:361 -> a
+    5:6:int incrementNameIndex(boolean):371:372 -> a
+    1:1:int incrementDictionaryIndex():366:366 -> b
+    1:1:java.lang.String getPackageName():342:342 -> c
+    1:1:java.lang.String nextPackagePrefix():353:353 -> d
+    2:3:java.lang.String com.android.tools.r8.naming.Minifier$MinificationPackageNamingStrategy.next(char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):202:203 -> d
+    2:3:java.lang.String nextPackagePrefix():353 -> d
+    4:5:java.lang.String nextPackagePrefix():354:355 -> d
 com.android.tools.r8.naming.ClassNameMinifier$PackageNamingStrategy -> com.android.tools.r8.naming.c$e:
 com.android.tools.r8.naming.ClassNaming -> com.android.tools.r8.naming.d:
     com.android.tools.r8.naming.MemberNaming lookup(com.android.tools.r8.naming.MemberNaming$Signature) -> a
@@ -66494,7 +66930,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.na:
+com.android.tools.r8.naming.DictionaryReader -> com.android.tools.r8.internal.K9:
     java.nio.file.Path path -> c
     java.io.BufferedReader reader -> b
     boolean $assertionsDisabled -> a
@@ -66523,7 +66959,10 @@
     19:25:void lambda$reserveFieldNames$1(com.android.tools.r8.graph.DexClass):102:108 -> a
     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:41:void lambda$reserveFieldNames$1(com.android.tools.r8.graph.DexClass):111:125 -> 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):273:273 -> 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
     46:48:void propagateReservedFieldNamesUpwards():148:150 -> a
     49:49:void propagateReservedFieldNamesUpwards():149:149 -> a
@@ -66531,8 +66970,11 @@
     51:51:com.android.tools.r8.naming.ReservedFieldNamingState getReservedFieldNamingState(com.android.tools.r8.graph.DexType):87:87 -> a
     51:51:void lambda$propagateReservedFieldNamesUpwards$3(com.android.tools.r8.graph.DexProgramClass):152 -> a
     52:53:void lambda$propagateReservedFieldNamesUpwards$3(com.android.tools.r8.graph.DexProgramClass):154:155 -> a
-    54:55:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):325:326 -> a
-    54:55:void lambda$propagateReservedFieldNamesUpwards$3(com.android.tools.r8.graph.DexProgramClass):155 -> a
+    54:54:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    54:54:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):358 -> a
+    54:54:void lambda$propagateReservedFieldNamesUpwards$3(com.android.tools.r8.graph.DexProgramClass):155 -> a
+    55:55:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):359:359 -> a
+    55:55:void lambda$propagateReservedFieldNamesUpwards$3(com.android.tools.r8.graph.DexProgramClass):155 -> a
     56:57:void lambda$propagateReservedFieldNamesUpwards$3(com.android.tools.r8.graph.DexProgramClass):156:157 -> a
     58:62:void lambda$renameFieldsInClasses$6(java.util.Map,com.android.tools.r8.graph.DexClass):171:175 -> a
     63:63:void com.android.tools.r8.naming.FieldNamingState.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy):25:25 -> a
@@ -66542,7 +66984,10 @@
     78:80:void renameFieldsInInterfacePartition(java.util.Set):201:203 -> a
     81:81:com.android.tools.r8.naming.ReservedFieldNamingState getReservedFieldNamingState(com.android.tools.r8.graph.DexType):87:87 -> a
     81:81:void renameFieldsInInterfacePartition(java.util.Set):203 -> a
-    82:115:void renameFieldsInInterfacePartition(java.util.Set):205:238 -> a
+    82:112:void renameFieldsInInterfacePartition(java.util.Set):205:235 -> a
+    113:113:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    113:113:void renameFieldsInInterfacePartition(java.util.Set):235 -> a
+    114:115:void renameFieldsInInterfacePartition(java.util.Set):237:238 -> a
     116:118:com.android.tools.r8.graph.DexString renameField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.naming.FieldNamingState):245:247 -> a
     116:118:void lambda$renameFieldsInClasses$5(com.android.tools.r8.naming.FieldNamingState,com.android.tools.r8.graph.ProgramField):185 -> a
     119:121:com.android.tools.r8.graph.DexString renameField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.naming.FieldNamingState):245:247 -> a
@@ -66564,7 +67009,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):1254:1254 -> d
+    38:38:void com.android.tools.r8.shaking.AppInfoWithLiveness.forEachReferencedClasspathClass(java.util.function.Consumer):1249:1249 -> 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:
@@ -66583,8 +67028,11 @@
     2:6:void <init>(com.android.tools.r8.naming.FieldNameMinifier):282:286 -> <init>
     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:43:java.util.Set buildSortedPartition(com.android.tools.r8.graph.DexClass):304:337 -> a
-    44:44:int lambda$buildSortedPartition$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):304:304 -> 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):273:273 -> 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
 com.android.tools.r8.naming.FieldNamingState -> com.android.tools.r8.naming.k:
     com.android.tools.r8.naming.ReservedFieldNamingState reservedNames -> c
     com.android.tools.r8.naming.MemberNamingStrategy strategy -> d
@@ -66663,7 +67111,7 @@
     40:40:void replaceDexItemBasedConstStringInMethod(com.android.tools.r8.graph.DexEncodedMethod):163 -> b
     41:52:void replaceDexItemBasedConstStringInMethod(com.android.tools.r8.graph.DexEncodedMethod):164:175 -> b
     1:4:void run(java.util.concurrent.ExecutorService):47:50 -> c
-com.android.tools.r8.naming.IdentifierNameStringMarker -> com.android.tools.r8.internal.oe:
+com.android.tools.r8.naming.IdentifierNameStringMarker -> com.android.tools.r8.internal.Bd:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap identifierNameStrings -> c
     boolean $assertionsDisabled -> a
@@ -66715,7 +67163,7 @@
     369:369: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
     370:370: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
     371:395: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.re:
+com.android.tools.r8.naming.IdentifierNameStringUtils -> com.android.tools.r8.internal.Ed:
     boolean $assertionsDisabled -> a
     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
@@ -66723,7 +67171,7 @@
     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):1318:1318 -> a
+    106:106:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1295:1295 -> 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
@@ -66802,159 +67250,158 @@
     boolean $assertionsDisabled -> a
     java.util.Map globalStateMap -> f
     java.util.Map interfaceStateMap -> g
-    1:1:void <clinit>():97:97 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MethodNameMinifier$State):374:374 -> <init>
-    2:15:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MethodNameMinifier$State):368:381 -> <init>
-    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.naming.InterfaceMethodNameMinifier):97:97 -> a
-    2:4:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):410:412 -> a
-    5:7:void reserveNamesInInterfaces(java.lang.Iterable):400:402 -> a
-    5:7:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):413 -> a
-    8:10:void com.android.tools.r8.naming.MethodNameMinifier$State.allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):103:103 -> a
-    8:10:void reserveNamesInInterfaces(java.lang.Iterable):402 -> a
-    8:10:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):413 -> a
-    11:13:void reserveNamesInInterfaces(java.lang.Iterable):403:405 -> a
-    11:13:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):413 -> a
-    14:18:void patchUpChildrenInReservationStates():628:632 -> a
-    14:18:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):416 -> a
-    19:141:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):417:539 -> a
-    142:151:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):534:543 -> a
-    152:166:boolean verifyAllMethodsAreRepresentedIn(java.util.List):689:703 -> a
-    152:166:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):543 -> a
-    167:167:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):544:544 -> a
-    168:182:boolean verifyAllCallSitesAreRepresentedIn(java.util.List):670:684 -> a
-    168:182:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):544 -> a
-    183:213:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):546:576 -> a
-    214:222:void print(com.android.tools.r8.graph.DexMethod,java.util.Set,java.io.PrintStream):708:716 -> a
-    214:222:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):576 -> a
-    223:229:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):583:589 -> a
-    230:230:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):99:99 -> a
-    230:230:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):589 -> a
-    231:235:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):590:594 -> a
-    236:236:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):91:91 -> a
-    236:236:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):594 -> a
-    237:238:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):595:596 -> a
-    239:239:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):99:99 -> a
-    239:239:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):596 -> a
-    240:246:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):597:603 -> a
-    247:247:com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState lambda$assignNamesToInterfaceMethods$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):430:430 -> a
-    248:285:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):452:489 -> a
-    286:299:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):488:501 -> a
+    1:1:void <clinit>():98:98 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MethodNameMinifier$State):375:375 -> <init>
+    2:15:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MethodNameMinifier$State):369:382 -> <init>
+    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.naming.InterfaceMethodNameMinifier):98:98 -> a
+    2:4:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):411:413 -> a
+    5:7:void reserveNamesInInterfaces(java.util.Collection):401:403 -> a
+    5:7:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):414 -> a
+    8:10:void com.android.tools.r8.naming.MethodNameMinifier$State.allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):104:104 -> a
+    8:10:void reserveNamesInInterfaces(java.util.Collection):403 -> a
+    8:10:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):414 -> a
+    11:13:void reserveNamesInInterfaces(java.util.Collection):404:406 -> a
+    11:13:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):414 -> a
+    14:18:void patchUpChildrenInReservationStates():629:633 -> a
+    14:18:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):417 -> a
+    19:141:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):418:540 -> a
+    142:151:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):535:544 -> a
+    152:166:boolean verifyAllMethodsAreRepresentedIn(java.util.List):683:697 -> a
+    152:166:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):544 -> a
+    167:167:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):545:545 -> a
+    168:182:boolean verifyAllCallSitesAreRepresentedIn(java.util.List):664:678 -> a
+    168:182:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):545 -> a
+    183:213:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):547:577 -> a
+    214:222:void print(com.android.tools.r8.graph.DexMethod,java.util.Set,java.io.PrintStream):702:710 -> a
+    214:222:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):577 -> a
+    223:229:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):584:590 -> a
+    230:230:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):100:100 -> a
+    230:230:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):590 -> a
+    231:237:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):591:597 -> a
+    238:238:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):100:100 -> a
+    238:238:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):597 -> a
+    239:245:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):598:604 -> a
+    246:246:com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState lambda$assignNamesToInterfaceMethods$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):431:431 -> a
+    247:274:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):453:480 -> a
+    275:275:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    275:275:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):480 -> a
+    276:285:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):481:490 -> a
+    286:299:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):489:502 -> a
     300:301:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):128:129 -> a
-    300:301:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):502 -> a
+    300:301:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):503 -> a
     302:303:java.lang.Object com.android.tools.r8.utils.DisjointSets.findOrMakeSet(java.lang.Object):91:92 -> a
     302:303:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):132 -> a
-    302:303:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):502 -> a
+    302:303:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):503 -> a
     304:306:java.lang.Object com.android.tools.r8.utils.DisjointSets.findOrMakeSet(java.lang.Object):91:91 -> a
     304:306:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):134 -> a
-    304:306:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):502 -> a
+    304:306:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):503 -> a
     307:307:java.lang.Object com.android.tools.r8.utils.DisjointSets.findOrMakeSet(java.lang.Object):92:92 -> a
     307:307:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):134 -> a
-    307:307:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):502 -> a
+    307:307:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):503 -> a
     308:308:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):134:134 -> a
-    308:308:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):502 -> a
-    309:312:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):607:610 -> a
-    313:313:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):99:99 -> a
-    313:313:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):610 -> a
-    314:317:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):612:615 -> a
-    318:318:boolean lambda$assignNewName$3(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):614:614 -> a
-    319:319:com.android.tools.r8.graph.DexString newNameInGroup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):624:624 -> a
-    320:322:void computeReservationFrontiersForAllImplementingClasses():639:641 -> a
-    323:327:void lambda$computeReservationFrontiersForAllImplementingClasses$6(com.android.tools.r8.graph.DexClass):644:648 -> a
-    328:331:void lambda$computeReservationFrontiersForAllImplementingClasses$5(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,java.lang.Boolean):650:653 -> a
-    332:332:com.android.tools.r8.graph.DexType com.android.tools.r8.naming.MethodNameMinifier$State.getFrontier(com.android.tools.r8.graph.DexType):108:108 -> a
-    332:332:void lambda$computeReservationFrontiersForAllImplementingClasses$5(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,java.lang.Boolean):653 -> a
-    333:339:void lambda$computeReservationFrontiersForAllImplementingClasses$5(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,java.lang.Boolean):654:660 -> a
-    340:342:void com.android.tools.r8.naming.MethodNameMinifier$State.allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):103:103 -> a
-    340:342:void lambda$computeReservationFrontiersForAllImplementingClasses$5(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,java.lang.Boolean):660 -> a
-    1:1:com.android.tools.r8.naming.MethodNameMinifier$State access$100(com.android.tools.r8.naming.InterfaceMethodNameMinifier):97:97 -> b
-    2:2:java.util.Comparator getDefaultInterfaceMethodOrdering():396:396 -> b
-    3:3:com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState lambda$assignNamesToInterfaceMethods$1(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):490:490 -> b
-    4:4:boolean lambda$newNameInGroup$4(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):624:624 -> b
-    1:1:java.util.Map access$200(com.android.tools.r8.naming.InterfaceMethodNameMinifier):97:97 -> c
-    1:1:com.android.tools.r8.com.google.common.base.Equivalence access$300(com.android.tools.r8.naming.InterfaceMethodNameMinifier):97:97 -> d
+    308:308:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):503 -> a
+    309:312:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):608:611 -> a
+    313:313:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):100:100 -> a
+    313:313:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):611 -> a
+    314:317:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):613:616 -> a
+    318:318:boolean lambda$assignNewName$3(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):615:615 -> a
+    319:319:com.android.tools.r8.graph.DexString newNameInGroup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):625:625 -> a
+    320:322:void computeReservationFrontiersForAllImplementingClasses():640:642 -> a
+    323:328:void lambda$computeReservationFrontiersForAllImplementingClasses$5(com.android.tools.r8.graph.DexClass):645:650 -> a
+    329:329:com.android.tools.r8.graph.DexType com.android.tools.r8.naming.MethodNameMinifier$State.getFrontier(com.android.tools.r8.graph.DexType):109:109 -> a
+    329:329:void lambda$computeReservationFrontiersForAllImplementingClasses$5(com.android.tools.r8.graph.DexClass):650 -> a
+    330:334:void lambda$computeReservationFrontiersForAllImplementingClasses$5(com.android.tools.r8.graph.DexClass):651:655 -> a
+    335:337:void com.android.tools.r8.naming.MethodNameMinifier$State.allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):104:104 -> a
+    335:337:void lambda$computeReservationFrontiersForAllImplementingClasses$5(com.android.tools.r8.graph.DexClass):655 -> a
+    1:1:com.android.tools.r8.naming.MethodNameMinifier$State access$100(com.android.tools.r8.naming.InterfaceMethodNameMinifier):98:98 -> b
+    2:2:java.util.Comparator getDefaultInterfaceMethodOrdering():397:397 -> b
+    3:3:com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState lambda$assignNamesToInterfaceMethods$1(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):491:491 -> b
+    4:4:boolean lambda$newNameInGroup$4(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):625:625 -> b
+    1:1:java.util.Map access$200(com.android.tools.r8.naming.InterfaceMethodNameMinifier):98:98 -> c
+    1:1:com.android.tools.r8.com.google.common.base.Equivalence access$300(com.android.tools.r8.naming.InterfaceMethodNameMinifier):98:98 -> d
 com.android.tools.r8.naming.InterfaceMethodNameMinifier$1 -> com.android.tools.r8.naming.n:
     com.android.tools.r8.naming.InterfaceMethodNameMinifier this$0 -> a
-    1:1:void <init>(com.android.tools.r8.naming.InterfaceMethodNameMinifier):382:382 -> <init>
-    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):382:382 -> a
-    2:2:boolean doEquivalent(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):385:385 -> a
-    2:2:boolean doEquivalent(java.lang.Object,java.lang.Object):382 -> a
-    3:3:int doHash(java.lang.Object):382:382 -> a
-    4:4:int doHash(com.android.tools.r8.graph.DexEncodedMethod):390:390 -> a
-    4:4:int doHash(java.lang.Object):382 -> a
+    1:1:void <init>(com.android.tools.r8.naming.InterfaceMethodNameMinifier):383:383 -> <init>
+    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):383:383 -> a
+    2:2:boolean doEquivalent(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):386:386 -> a
+    2:2:boolean doEquivalent(java.lang.Object,java.lang.Object):383 -> a
+    3:3:int doHash(java.lang.Object):383:383 -> a
+    4:4:int doHash(com.android.tools.r8.graph.DexEncodedMethod):391:391 -> a
+    4:4:int doHash(java.lang.Object):383 -> a
 com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState -> com.android.tools.r8.naming.o:
     java.util.Map methodStates -> b
     java.util.List callSiteCollidingMethods -> c
     java.util.Set callSites -> a
     com.android.tools.r8.naming.InterfaceMethodNameMinifier this$0 -> d
-    1:6:void <init>(com.android.tools.r8.naming.InterfaceMethodNameMinifier):237:242 -> <init>
-    1:1:java.util.Map access$400(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):237:237 -> a
-    2:2:void addState(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):245:245 -> a
-    3:3:java.util.Set lambda$addState$0(com.android.tools.r8.graph.DexEncodedMethod):245:245 -> a
-    4:4:void addCallSite(com.android.tools.r8.graph.DexCallSite):259:259 -> a
-    5:18:com.android.tools.r8.graph.DexString getReservedName():263:276 -> a
-    19:19:int lambda$getReservedName$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):270:270 -> a
-    20:28:boolean isAvailable(com.android.tools.r8.graph.DexString):302:310 -> a
-    29:30:java.lang.Boolean lambda$isAvailable$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):305:306 -> a
-    31:31:void addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.naming.MethodNameMinifier$State):314:314 -> a
-    32:32:void lambda$addRenaming$5(com.android.tools.r8.graph.DexString,com.android.tools.r8.naming.MethodNameMinifier$State,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):316:316 -> a
-    33:33:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):91:91 -> a
-    33:33:void lambda$addRenaming$5(com.android.tools.r8.graph.DexString,com.android.tools.r8.naming.MethodNameMinifier$State,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):317 -> a
-    34:34:void forEachState(java.util.function.BiConsumer):322:322 -> a
-    35:35:java.lang.Object lambda$forEachState$6(java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):324:324 -> a
-    36:38:java.lang.Object forAnyState(java.util.function.BiFunction):332:334 -> a
-    39:42:boolean containsReservation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):344:347 -> a
-    1:1:java.util.List access$500(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):237:237 -> b
-    2:2:java.util.Set lambda$appendMethodGroupState$1(com.android.tools.r8.graph.DexEncodedMethod):252:252 -> b
-    3:3:void reserveName(com.android.tools.r8.graph.DexString):288:288 -> b
-    4:7:void lambda$reserveName$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):290:293 -> b
-    8:8:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):91:91 -> b
-    8:8:void lambda$reserveName$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):293 -> b
-    9:10:void lambda$reserveName$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):295:296 -> b
-    11:11:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):91:91 -> b
-    11:11:void lambda$reserveName$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):296 -> b
-    1:1:java.util.Set access$600(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):237:237 -> c
-    1:1:int compareTo(java.lang.Object):237:237 -> compareTo
-    2:2:int compareTo(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):358:358 -> compareTo
-    2:2:int compareTo(java.lang.Object):237 -> compareTo
-    1:4:void appendMethodGroupState(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):249:252 -> d
+    1:6:void <init>(com.android.tools.r8.naming.InterfaceMethodNameMinifier):238:243 -> <init>
+    1:1:java.util.Map access$400(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):238:238 -> a
+    2:2:void addState(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):246:246 -> a
+    3:3:java.util.Set lambda$addState$0(com.android.tools.r8.graph.DexEncodedMethod):246:246 -> a
+    4:4:void addCallSite(com.android.tools.r8.graph.DexCallSite):260:260 -> a
+    5:18:com.android.tools.r8.graph.DexString getReservedName():264:277 -> a
+    19:19:int lambda$getReservedName$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):271:271 -> a
+    20:28:boolean isAvailable(com.android.tools.r8.graph.DexString):303:311 -> a
+    29:30:java.lang.Boolean lambda$isAvailable$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):306:307 -> a
+    31:31:void addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.naming.MethodNameMinifier$State):315:315 -> a
+    32:32:void lambda$addRenaming$5(com.android.tools.r8.graph.DexString,com.android.tools.r8.naming.MethodNameMinifier$State,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):317:317 -> a
+    33:33:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):92:92 -> a
+    33:33:void lambda$addRenaming$5(com.android.tools.r8.graph.DexString,com.android.tools.r8.naming.MethodNameMinifier$State,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):318 -> a
+    34:34:void forEachState(java.util.function.BiConsumer):323:323 -> a
+    35:35:java.lang.Object lambda$forEachState$6(java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):325:325 -> a
+    36:38:java.lang.Object forAnyState(java.util.function.BiFunction):333:335 -> a
+    39:42:boolean containsReservation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):345:348 -> a
+    1:1:java.util.List access$500(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):238:238 -> b
+    2:2:java.util.Set lambda$appendMethodGroupState$1(com.android.tools.r8.graph.DexEncodedMethod):253:253 -> b
+    3:3:void reserveName(com.android.tools.r8.graph.DexString):289:289 -> b
+    4:7:void lambda$reserveName$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):291:294 -> b
+    8:8:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):92:92 -> b
+    8:8:void lambda$reserveName$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):294 -> b
+    9:10:void lambda$reserveName$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):296:297 -> b
+    11:11:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):92:92 -> b
+    11:11:void lambda$reserveName$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):297 -> b
+    1:1:java.util.Set access$600(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):238:238 -> c
+    1:1:int compareTo(java.lang.Object):238:238 -> compareTo
+    2:2:int compareTo(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):359:359 -> compareTo
+    2:2:int compareTo(java.lang.Object):238 -> compareTo
+    1:4:void appendMethodGroupState(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):250:253 -> d
 com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState -> com.android.tools.r8.naming.p:
     com.android.tools.r8.graph.DexClass iface -> b
     java.util.Set children -> c
     java.util.Set reservationTypes -> d
     boolean $assertionsDisabled -> a
     com.android.tools.r8.naming.InterfaceMethodNameMinifier this$0 -> e
-    1:1:void <clinit>():99:99 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.naming.InterfaceMethodNameMinifier,com.android.tools.r8.graph.DexClass):108:108 -> <init>
-    2:7:void <init>(com.android.tools.r8.naming.InterfaceMethodNameMinifier,com.android.tools.r8.graph.DexClass):104:109 -> <init>
-    1:2:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod):115:116 -> a
-    3:3:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.MethodNameMinifier$State.getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):112:112 -> a
-    3:3:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod):116 -> a
-    4:19:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod):123:138 -> a
-    20:27:java.lang.Boolean lambda$getReservedName$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):126:133 -> a
-    28:28:void addReservationType(com.android.tools.r8.graph.DexType):142:142 -> a
-    29:29:void addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):172:172 -> a
-    30:30:void lambda$addRenaming$5(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):174:174 -> a
-    31:31:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):175:175 -> a
-    32:32:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):99:99 -> a
-    32:32:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):175 -> a
-    33:33:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):175:175 -> a
-    34:34:void forAll(java.util.function.Consumer):179:179 -> a
-    35:35:java.lang.Object lambda$forAll$6(java.util.function.Consumer,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):181:181 -> a
-    36:44:java.lang.Object forAny(java.util.function.Function):187:195 -> a
-    1:1:void lambda$reserveName$1(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):150:150 -> b
-    2:2:com.android.tools.r8.naming.MethodReservationState com.android.tools.r8.naming.MethodNameMinifier$State.getReservationState(com.android.tools.r8.graph.DexType):95:95 -> b
-    2:2:void lambda$reserveName$1(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):150 -> b
-    3:3:void lambda$reserveName$1(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):151:151 -> b
-    4:15:boolean isAvailable(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):157:168 -> b
-    16:17:java.lang.Boolean lambda$isAvailable$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):160:161 -> b
-    18:18:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):99:99 -> b
-    18:18:java.lang.Boolean lambda$isAvailable$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):161 -> b
-    19:20:java.lang.Boolean lambda$isAvailable$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):162:163 -> b
-    21:28:java.lang.Object forChildren(java.util.function.Function):216:223 -> b
-    29:29:boolean containsReservation(com.android.tools.r8.graph.DexType):233:233 -> b
-    1:1:void reserveName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):146:146 -> c
-    2:2:void lambda$reserveName$2(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):148:148 -> c
-    3:10:java.lang.Object forParents(java.util.function.Function):199:206 -> c
+    1:1:void <clinit>():100:100 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.naming.InterfaceMethodNameMinifier,com.android.tools.r8.graph.DexClass):109:109 -> <init>
+    2:7:void <init>(com.android.tools.r8.naming.InterfaceMethodNameMinifier,com.android.tools.r8.graph.DexClass):105:110 -> <init>
+    1:2:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod):116:117 -> a
+    3:3:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.MethodNameMinifier$State.getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):113:113 -> a
+    3:3:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod):117 -> a
+    4:19:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod):124:139 -> a
+    20:27:java.lang.Boolean lambda$getReservedName$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):127:134 -> a
+    28:28:void addReservationType(com.android.tools.r8.graph.DexType):143:143 -> a
+    29:29:void addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):173:173 -> a
+    30:30:void lambda$addRenaming$5(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):175:175 -> a
+    31:31:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):176:176 -> a
+    32:32:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):100:100 -> a
+    32:32:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):176 -> a
+    33:33:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):176:176 -> a
+    34:34:void forAll(java.util.function.Consumer):180:180 -> a
+    35:35:java.lang.Object lambda$forAll$6(java.util.function.Consumer,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):182:182 -> a
+    36:44:java.lang.Object forAny(java.util.function.Function):188:196 -> a
+    1:1:void lambda$reserveName$1(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):151:151 -> b
+    2:2:com.android.tools.r8.naming.MethodReservationState com.android.tools.r8.naming.MethodNameMinifier$State.getReservationState(com.android.tools.r8.graph.DexType):96:96 -> b
+    2:2:void lambda$reserveName$1(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):151 -> b
+    3:3:void lambda$reserveName$1(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):152:152 -> b
+    4:15:boolean isAvailable(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):158:169 -> b
+    16:17:java.lang.Boolean lambda$isAvailable$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):161:162 -> b
+    18:18:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):100:100 -> b
+    18:18:java.lang.Boolean lambda$isAvailable$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):162 -> b
+    19:20:java.lang.Boolean lambda$isAvailable$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):163:164 -> b
+    21:28:java.lang.Object forChildren(java.util.function.Function):217:224 -> b
+    29:29:boolean containsReservation(com.android.tools.r8.graph.DexType):234:234 -> b
+    1:1:void reserveName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):147:147 -> c
+    2:2:void lambda$reserveName$2(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):149:149 -> c
+    3:10:java.lang.Object forParents(java.util.function.Function):200:207 -> c
 com.android.tools.r8.naming.InternalNamingState -> com.android.tools.r8.naming.r:
     int getDictionaryIndex() -> a
     int incrementNameIndex(boolean) -> a
@@ -66978,7 +67425,7 @@
     com.android.tools.r8.naming.MemberNaming$FieldSignature asFieldSignature() -> a
     1:1:com.android.tools.r8.naming.MemberNaming$FieldSignature fromDexField(com.android.tools.r8.graph.DexField):215:215 -> a
     2:2:com.android.tools.r8.naming.MemberNaming$FieldSignature fromDexField(com.android.tools.r8.graph.DexField,boolean):219:219 -> a
-    3:3:java.lang.String com.android.tools.r8.graph.DexField.qualifiedName():169:169 -> a
+    3:3:java.lang.String com.android.tools.r8.graph.DexField.qualifiedName():157:157 -> a
     3:3:com.android.tools.r8.naming.MemberNaming$FieldSignature fromDexField(com.android.tools.r8.graph.DexField,boolean):220 -> a
     4:5:com.android.tools.r8.naming.MemberNaming$FieldSignature fromDexField(com.android.tools.r8.graph.DexField,boolean):220:221 -> a
     6:10:com.android.tools.r8.graph.DexField toDexField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):225:225 -> a
@@ -67054,51 +67501,64 @@
     java.util.Map renaming -> e
     com.android.tools.r8.naming.MethodNameMinifier$State minifierState -> f
     java.util.Map namingStates -> h
-    1:1:void <clinit>():84:84 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.naming.MemberNamingStrategy):136:136 -> <init>
-    2:25:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.naming.MemberNamingStrategy):120:143 -> <init>
+    1:1:void <clinit>():85:85 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.naming.MemberNamingStrategy):137:137 -> <init>
+    2:25:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.naming.MemberNamingStrategy):121:144 -> <init>
     java.lang.Object lambda$getNamingKeyTransform$2(com.android.tools.r8.graph.DexMethod) -> a
-    1:1:java.util.Map access$000(com.android.tools.r8.naming.MethodNameMinifier):84:84 -> a
-    2:2:com.android.tools.r8.naming.MethodNamingState access$200(com.android.tools.r8.naming.MethodNameMinifier,com.android.tools.r8.graph.DexType):84:84 -> 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):84:84 -> a
-    4:6:java.util.function.Function getNamingKeyTransform():158:160 -> a
-    7:7:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.lang.Iterable,com.android.tools.r8.utils.Timing):179:179 -> a
-    8:11:void reserveNamesInClasses():237:237 -> a
-    8:11:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.lang.Iterable,com.android.tools.r8.utils.Timing):180 -> a
-    12:28:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.lang.Iterable,com.android.tools.r8.utils.Timing):181:197 -> a
-    29:37:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):201:209 -> a
-    38:51:void assignNameToMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.MethodNamingState):220:233 -> a
-    38:51:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):210 -> a
-    52:53:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):213:214 -> a
-    54:54: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):206:206 -> a
-    55: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):264:275 -> a
-    67:67:java.lang.Iterable shuffleMethods(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):329:329 -> 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):275 -> a
-    68:71: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):275:278 -> a
-    72:72:com.android.tools.r8.naming.MethodReservationState lambda$allocateReservationStateAndReserve$4(com.android.tools.r8.naming.MethodReservationState,com.android.tools.r8.graph.DexType):271:271 -> a
-    73:83:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):287:297 -> a
-    84:94:com.android.tools.r8.naming.MethodReservationState findReservationStateInHierarchy(com.android.tools.r8.graph.DexType):311:321 -> a
-    84:94:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):302 -> a
-    95:97:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):303:305 -> a
-    1:1:com.android.tools.r8.com.google.common.collect.BiMap access$100(com.android.tools.r8.naming.MethodNameMinifier):84:84 -> b
-    2:8:java.util.function.Function getReservationKeyTransform():147:153 -> b
-    9:9:java.lang.Object lambda$getReservationKeyTransform$0(com.android.tools.r8.graph.DexMethod):150:150 -> b
-    10:22:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):245:257 -> b
-    23:23:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):255:255 -> b
-    1:1:com.android.tools.r8.naming.MethodReservationState access$300(com.android.tools.r8.naming.MethodNameMinifier):84:84 -> c
-    2:2:java.lang.Object lambda$getReservationKeyTransform$1(com.android.tools.r8.graph.DexMethod):153:153 -> c
-    1:1:java.util.Map access$500(com.android.tools.r8.naming.MethodNameMinifier):84:84 -> d
-    1:1:com.android.tools.r8.naming.MemberNamingStrategy access$600(com.android.tools.r8.naming.MethodNameMinifier):84:84 -> e
+    1:1:java.util.Map access$000(com.android.tools.r8.naming.MethodNameMinifier):85:85 -> a
+    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:6:java.util.function.Function getNamingKeyTransform():159:161 -> a
+    7:7:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,com.android.tools.r8.utils.Timing):180:180 -> a
+    8:11:void reserveNamesInClasses():238:238 -> a
+    8:11:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,com.android.tools.r8.utils.Timing):181 -> a
+    12:28:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,com.android.tools.r8.utils.Timing):182:198 -> a
+    29:35:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):202:208 -> a
+    36:36:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    36:36:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):208 -> a
+    37:38:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):209:210 -> a
+    39:52:void assignNameToMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.MethodNamingState):221:234 -> a
+    39:52:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):211 -> a
+    53:54:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):214:215 -> a
+    55:55: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
+    56:65: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
+    66:66:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    66: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):274 -> 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):276:276 -> a
+    68:68:java.lang.Iterable shuffleMethods(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):330:330 -> 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 -> a
+    69:72: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
+    73:73:com.android.tools.r8.naming.MethodReservationState lambda$allocateReservationStateAndReserve$4(com.android.tools.r8.naming.MethodReservationState,com.android.tools.r8.graph.DexType):272:272 -> a
+    74:80:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):288:294 -> a
+    81:81:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    81:81:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):294 -> a
+    82:84:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):296:298 -> a
+    85:95:com.android.tools.r8.naming.MethodReservationState findReservationStateInHierarchy(com.android.tools.r8.graph.DexType):312:322 -> a
+    85:95:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):303 -> a
+    96:98: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:8:java.util.function.Function getReservationKeyTransform():148: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):273:273 -> 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
+    1:1:com.android.tools.r8.naming.MethodReservationState access$300(com.android.tools.r8.naming.MethodNameMinifier):85:85 -> c
+    2:2:java.lang.Object lambda$getReservationKeyTransform$1(com.android.tools.r8.graph.DexMethod):154:154 -> c
+    1:1:java.util.Map access$500(com.android.tools.r8.naming.MethodNameMinifier):85:85 -> d
+    1:1:com.android.tools.r8.naming.MemberNamingStrategy access$600(com.android.tools.r8.naming.MethodNameMinifier):85:85 -> e
 com.android.tools.r8.naming.MethodNameMinifier$1 -> com.android.tools.r8.naming.u:
 com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming -> com.android.tools.r8.naming.v$a:
     java.util.Map renaming -> a
-    1:1:void <init>(java.util.Map,com.android.tools.r8.naming.MethodNameMinifier$1):163:163 -> <init>
-    2:3:void <init>(java.util.Map):167:168 -> <init>
-    1:1:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming empty():172:172 -> a
+    1:1:void <init>(java.util.Map,com.android.tools.r8.naming.MethodNameMinifier$1):164:164 -> <init>
+    2:3:void <init>(java.util.Map):168:169 -> <init>
+    1:1:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming empty():173:173 -> a
 com.android.tools.r8.naming.MethodNameMinifier$State -> com.android.tools.r8.naming.w:
     com.android.tools.r8.naming.MethodNameMinifier this$0 -> a
-    1:1:void <init>(com.android.tools.r8.naming.MethodNameMinifier):88:88 -> <init>
-    1:1:com.android.tools.r8.naming.MethodReservationState getReservationState(com.android.tools.r8.graph.DexType):95:95 -> a
+    1:1:void <init>(com.android.tools.r8.naming.MethodNameMinifier):89:89 -> <init>
+    1:1:void putRenaming(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):92:92 -> a
+    2:2:com.android.tools.r8.naming.MethodReservationState getReservationState(com.android.tools.r8.graph.DexType):96:96 -> a
 com.android.tools.r8.naming.MethodNamingState -> com.android.tools.r8.naming.z:
     com.android.tools.r8.naming.MethodNamingState parentNamingState -> e
     com.android.tools.r8.naming.MethodReservationState reservationState -> d
@@ -67201,57 +67661,63 @@
     1:1:void <clinit>():39:39 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView):43:44 -> <init>
     1:2:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):48:49 -> a
-    3:3:com.android.tools.r8.graph.SubtypingInfo com.android.tools.r8.shaking.AppInfoWithLiveness.computeSubtypingInfo():1349:1349 -> a
+    3:3:com.android.tools.r8.graph.SubtypingInfo com.android.tools.r8.shaking.AppInfoWithLiveness.computeSubtypingInfo():1344:1344 -> a
     3:3:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):49 -> a
-    4:43:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):50:89 -> a
-    44:46:java.util.List computeReachableInterfacesWithDeterministicOrder():95:97 -> a
+    4:15:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):50:61 -> a
+    16:16:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming com.android.tools.r8.naming.ClassNameMinifier.computeRenaming(com.android.tools.r8.utils.Timing):103:103 -> a
+    16:16:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):62 -> a
+    17:44:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):63:90 -> a
+    45:45:com.android.tools.r8.graph.DexType lambda$run$0(com.android.tools.r8.graph.DexClass):51:51 -> 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
     java.util.Set obfuscationDictionaryForLookup -> c
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():100:100 -> <clinit>
-    1:6:void <init>(java.util.List,boolean):108:113 -> <init>
-    1:11:java.lang.String nextName(char[],com.android.tools.r8.naming.InternalNamingState,boolean):117:127 -> a
-    12:18:java.lang.String nextName(char[],com.android.tools.r8.naming.InternalNamingState,boolean):126:132 -> a
+    1:1:void <clinit>():95:95 -> <clinit>
+    1:6:void <init>(java.util.List,boolean):103:108 -> <init>
+    1:11:java.lang.String nextName(char[],com.android.tools.r8.naming.InternalNamingState,boolean):112:122 -> a
+    12:18:java.lang.String nextName(char[],com.android.tools.r8.naming.InternalNamingState,boolean):121:127 -> a
 com.android.tools.r8.naming.Minifier$MinificationClassNamingStrategy -> com.android.tools.r8.naming.E$b:
     com.android.tools.r8.graph.DexItemFactory factory -> f
     com.android.tools.r8.graph.AppView appView -> e
-    1:2:void <init>(com.android.tools.r8.graph.AppView):144:145 -> <init>
-    3:7:void <init>(com.android.tools.r8.graph.AppView):143:147 -> <init>
+    1:2:void <init>(com.android.tools.r8.graph.AppView):139:140 -> <init>
+    3:7:void <init>(com.android.tools.r8.graph.AppView):138:142 -> <init>
     boolean isRenamedByApplyMapping(com.android.tools.r8.graph.DexType) -> a
-    1:18:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):156:173 -> a
-    19:23:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):158:162 -> a
+    1:18:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):151:168 -> a
+    19:23:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):153:157 -> a
     24:24:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    24:24:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):162 -> a
-    25:25:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):162:162 -> a
-    1:2:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):178:179 -> b
+    24:24:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):157 -> a
+    25:25:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):157:157 -> a
+    1:2:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):173:174 -> b
 com.android.tools.r8.naming.Minifier$MinificationPackageNamingStrategy -> com.android.tools.r8.naming.E$c:
-    1:2:void <init>(com.android.tools.r8.graph.AppView):195:196 -> <init>
-    3:3:void <init>(com.android.tools.r8.graph.AppView):194:194 -> <init>
+    1:2:void <init>(com.android.tools.r8.graph.AppView):190:191 -> <init>
+    3:3:void <init>(com.android.tools.r8.graph.AppView):189:189 -> <init>
 com.android.tools.r8.naming.Minifier$MinifierMemberNamingStrategy -> com.android.tools.r8.naming.E$d:
     com.android.tools.r8.graph.DexItemFactory factory -> g
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.AppView appView -> f
     boolean desugaredLibraryRenaming -> h
-    1:1:void <clinit>():213:213 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.AppView):221:224 -> <init>
-    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):232:233 -> a
-    3:3:com.android.tools.r8.graph.DexString getNextName(com.android.tools.r8.naming.InternalNamingState,boolean):255:255 -> a
-    3:3:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):236 -> a
-    4:4:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):237:237 -> a
-    5:5:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):246:246 -> a
-    6:6:com.android.tools.r8.graph.DexString getNextName(com.android.tools.r8.naming.InternalNamingState,boolean):255:255 -> a
-    6:6:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):249 -> a
-    7:7:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):250:250 -> a
-    8:18:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):260:270 -> a
-    19:19:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):264:264 -> a
-    20:20:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass):277:277 -> a
+    1:1:void <clinit>():208:208 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.AppView):216:219 -> <init>
+    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):227:228 -> a
+    3:3:com.android.tools.r8.graph.DexString getNextName(com.android.tools.r8.naming.InternalNamingState,boolean):250:250 -> a
+    3:3:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):231 -> a
+    4:4:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):232:232 -> a
+    5:5:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):241:241 -> a
+    6:6:com.android.tools.r8.graph.DexString getNextName(com.android.tools.r8.naming.InternalNamingState,boolean):250:250 -> a
+    6:6:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):244 -> a
+    7:7:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):245:245 -> a
+    8:18:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):255:265 -> a
+    19:19:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):259:259 -> a
+    20:20:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass):272:272 -> a
     21:21:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    21:21:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass):277 -> a
-    22:23:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass):277:278 -> a
-    24:24:boolean allowMemberRenaming(com.android.tools.r8.graph.DexClass):285:285 -> a
-    1:2:boolean checkAllowMemberRenaming(com.android.tools.r8.graph.DexType):289:290 -> c
+    21:21:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass):272 -> a
+    22:23:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass):272:273 -> a
+    24:24:boolean allowMemberRenaming(com.android.tools.r8.graph.DexClass):280:280 -> a
+    1:1:boolean checkAllowMemberRenaming(com.android.tools.r8.graph.DexType):284:284 -> c
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> c
+    2:2:boolean checkAllowMemberRenaming(com.android.tools.r8.graph.DexType):284 -> c
+    3:3:boolean checkAllowMemberRenaming(com.android.tools.r8.graph.DexType):285:285 -> c
 com.android.tools.r8.naming.NamingLens -> com.android.tools.r8.naming.F:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():39:39 -> <clinit>
@@ -67314,7 +67780,8 @@
     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):48:49 -> 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 lookupDescriptor(com.android.tools.r8.graph.DexType):204:204 -> b
+    12:12:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexType.getDescriptor():83:83 -> b
+    12:12:com.android.tools.r8.graph.DexString lookupDescriptor(com.android.tools.r8.graph.DexType):204 -> b
     1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():198:198 -> c
 com.android.tools.r8.naming.PrefixRewritingNamingLens -> com.android.tools.r8.naming.G:
     boolean $assertionsDisabled -> e
@@ -67355,138 +67822,152 @@
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.com.google.common.collect.BiMap mappedNames -> e
     java.util.Set mappedClasses -> f
-    java.util.Map additionalMethodNamings -> i
-    java.util.Map additionalFieldNamings -> j
+    java.util.Map defaultInterfaceMethodImplementationNames -> i
+    java.util.Map additionalMethodNamings -> j
+    java.util.Map additionalFieldNamings -> k
     boolean $assertionsDisabled -> a
     java.util.Map memberNames -> g
-    java.util.Map defaultInterfaceMethodImplementationNames -> h
-    1:1:void <clinit>():73:73 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.SeedMapper):87:87 -> <init>
-    2:14:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.SeedMapper):78:90 -> <init>
-    1:2:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):94:95 -> a
-    3:3:com.android.tools.r8.graph.SubtypingInfo com.android.tools.r8.shaking.AppInfoWithLiveness.computeSubtypingInfo():1349:1349 -> a
-    3:3:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):95 -> a
-    4:21:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):97:114 -> a
-    22:22:void com.android.tools.r8.shaking.AppInfoWithLiveness.forEachReferencedClasspathClass(java.util.function.Consumer):1254:1254 -> a
-    22:22:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):114 -> a
-    23:27:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):115:119 -> a
-    28:28:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):212:212 -> a
-    28:28:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):119 -> a
-    29:32:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):127:130 -> a
-    33:42:void computeDefaultInterfaceMethodMethods():336:345 -> a
-    33:42:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):131 -> a
-    43:43:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
-    43:43:void computeDefaultInterfaceMethodMethods():346 -> a
-    43:43:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):131 -> a
-    44:44:void computeDefaultInterfaceMethodMethods():347:347 -> a
-    44:44:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):131 -> a
-    45:45:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map):361:361 -> a
-    45:45:void computeDefaultInterfaceMethodMethods():347 -> a
-    45:45:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):131 -> a
-    46:46:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isCompanionClassType(com.android.tools.r8.graph.DexType):950:950 -> a
-    46:46:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map):361 -> a
-    46:46:void computeDefaultInterfaceMethodMethods():347 -> a
-    46:46:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):131 -> a
-    47:48:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map):364:365 -> a
-    47:48:void computeDefaultInterfaceMethodMethods():347 -> a
-    47:48:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):131 -> a
-    49:49:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
-    49:49:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map):366 -> a
-    49:49:void computeDefaultInterfaceMethodMethods():347 -> a
-    49:49:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):131 -> a
-    50:61:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map):369:380 -> a
-    50:61:void computeDefaultInterfaceMethodMethods():347 -> a
-    50:61:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):131 -> a
-    62:66:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map):379:383 -> a
-    62:66:void computeDefaultInterfaceMethodMethods():347 -> a
-    62:66:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):131 -> a
-    67:67:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map):382:382 -> a
-    67:67:void computeDefaultInterfaceMethodMethods():347 -> a
-    67:67:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):131 -> a
-    68:77:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):132:141 -> a
-    78:78:java.util.List com.android.tools.r8.graph.DexApplication.classesWithDeterministicOrder(java.util.Collection):112:112 -> a
-    78:78:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):147 -> a
-    79:109:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):147:177 -> a
-    110:115:void lambda$run$0(java.util.ArrayDeque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,java.util.Set,com.android.tools.r8.graph.DexClass):104:109 -> a
-    116:118:void lambda$run$1(java.util.ArrayDeque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexType):122:124 -> a
-    119:132:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):187:200 -> a
-    133:140:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):322:329 -> a
-    133:140:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):200 -> a
-    141:141:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):328:328 -> a
-    141:141:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):200 -> a
-    142:146:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):327:331 -> a
-    142:146:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):200 -> a
-    147:155:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):201:209 -> a
-    156:171:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):206:221 -> a
-    172:181:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):220:229 -> a
-    182:195:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):224:237 -> a
-    196:216:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):236:256 -> a
-    217:217:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):212:212 -> a
-    217:217:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):256 -> a
-    218:220:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):259:261 -> a
-    221:221:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):212:212 -> a
-    221:221:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):261 -> a
-    222:222:void lambda$computeMapping$3(java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexType):258:258 -> a
-    223:231:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):269:277 -> a
-    232:232:void lambda$addNonPrivateInterfaceMappings$5(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):273:273 -> a
-    233:238:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):287:292 -> a
-    239:241:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):291:293 -> a
-    242:242:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
-    242:242:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):293 -> a
-    243:250:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):294:301 -> a
-    251:253:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):300:302 -> a
-    254:254:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
-    254:254:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):302 -> a
-    255:257:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):303:305 -> a
-    258:260:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):312:312 -> a
-    262:265:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):314:317 -> a
-    1:1:void lambda$computeMapping$2(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):202:202 -> b
-    2:2:void lambda$computeMapping$4(java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexType):263:263 -> b
+    java.util.Map syntheticCompanionClasses -> h
+    1:1:void <clinit>():69:69 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.SeedMapper):84:84 -> <init>
+    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:3:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):91:92 -> a
+    4:4:com.android.tools.r8.graph.SubtypingInfo com.android.tools.r8.shaking.AppInfoWithLiveness.computeSubtypingInfo():1344:1344 -> a
+    4:4:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):92 -> a
+    5:22:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):94:111 -> a
+    23:23:void com.android.tools.r8.shaking.AppInfoWithLiveness.forEachReferencedClasspathClass(java.util.function.Consumer):1249:1249 -> a
+    23:23:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):111 -> a
+    24:28:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):112:116 -> a
+    29:29:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):212:212 -> a
+    29:29:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):116 -> a
+    30:33:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):124:127 -> a
+    34:45:void computeDefaultInterfaceMethodMethods():334:345 -> a
+    34:45:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
+    46:46:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):361:361 -> a
+    46:46:void computeDefaultInterfaceMethodMethods():345 -> a
+    46:46:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
+    47:47:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isCompanionClassType(com.android.tools.r8.graph.DexType):872:872 -> a
+    47:47:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):361 -> a
+    47:47:void computeDefaultInterfaceMethodMethods():345 -> a
+    47:47:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
+    48:49:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):364:365 -> a
+    48:49:void computeDefaultInterfaceMethodMethods():345 -> a
+    48:49:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
+    50:50:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    50:50:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):365 -> a
+    50:50:void computeDefaultInterfaceMethodMethods():345 -> a
+    50:50:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
+    51:51:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
+    51:51:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):366 -> a
+    51:51:void computeDefaultInterfaceMethodMethods():345 -> a
+    51:51:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
+    52:64:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):369:381 -> a
+    52:64:void computeDefaultInterfaceMethodMethods():345 -> a
+    52:64:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
+    65:69:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):380:384 -> a
+    65:69:void computeDefaultInterfaceMethodMethods():345 -> a
+    65:69:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
+    70:70:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):383:383 -> a
+    70:70:void computeDefaultInterfaceMethodMethods():345 -> a
+    70:70:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
+    71:117:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):129:175 -> a
+    118:123: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
+    124:124: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
+    125:125:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    125:125:void lambda$run$3(java.util.ArrayDeque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexType):119 -> a
+    126:127: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
+    128:129:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):185:186 -> a
+    130:130:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    130:130:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):186 -> a
+    131:140:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):189:198 -> a
+    141:148:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):320:327 -> a
+    141:148:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):198 -> a
+    149:149:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):326:326 -> a
+    149:149:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):198 -> a
+    150:154:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):325:329 -> a
+    150:154:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):198 -> a
+    155:163:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):199:207 -> a
+    164:179:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):204:219 -> a
+    180:189:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):218:227 -> a
+    190:203:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):222:235 -> a
+    204:224:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):234:254 -> a
+    225:225:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):212:212 -> a
+    225:225:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):254 -> a
+    226:228:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):257:259 -> a
+    229:229:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):212:212 -> a
+    229:229:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):259 -> a
+    230:230: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
+    231:237:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):267:273 -> a
+    238:238:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    238:238:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):273 -> a
+    239:239:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):275:275 -> a
+    240:240:void lambda$addNonPrivateInterfaceMappings$7(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):271:271 -> a
+    241:246:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):285:290 -> a
+    247:249:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):289:291 -> a
+    250:250:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
+    250:250:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):291 -> a
+    251:258:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):292:299 -> a
+    259:261:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):298:300 -> a
+    262:262:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
+    262:262:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):300 -> a
+    263:263:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):301:301 -> a
+    264:264:boolean com.android.tools.r8.graph.DexEncodedField.isPrivate():207:207 -> a
+    264:264:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):302 -> a
+    265:265:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):303:303 -> a
+    266:268:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):310:310 -> a
+    270:273: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
 com.android.tools.r8.naming.ProguardMapMinifier$ApplyMappingClassNamingStrategy -> com.android.tools.r8.naming.J:
     java.util.Set mappedNames -> i
     boolean $assertionsDisabled -> g
     java.util.Map mappings -> h
-    1:1:void <clinit>():388:388 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,java.util.Set):397:399 -> <init>
-    1:3:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):405:407 -> a
-    4:7:boolean lambda$next$0(java.util.function.Predicate,java.lang.String):412:415 -> a
-    8:8:boolean isRenamedByApplyMapping(com.android.tools.r8.graph.DexType):443:443 -> a
-    1:15:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):424:438 -> b
+    1:1:void <clinit>():389:389 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,java.util.Set):398:400 -> <init>
+    1:3:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):406:408 -> a
+    4:7:boolean lambda$next$0(java.util.function.Predicate,java.lang.String):413:416 -> a
+    8:8:boolean isRenamedByApplyMapping(com.android.tools.r8.graph.DexType):444:444 -> a
+    1:15:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):425:439 -> b
 com.android.tools.r8.naming.ProguardMapMinifier$ApplyMappingMemberNamingStrategy -> com.android.tools.r8.naming.K:
     boolean $assertionsDisabled -> i
     java.util.Map mappedNames -> j
     com.android.tools.r8.graph.DexItemFactory factory -> k
-    1:1:void <clinit>():447:447 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):455:458 -> <init>
+    1:1:void <clinit>():448:448 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):456:459 -> <init>
     boolean allowMemberRenaming(com.android.tools.r8.graph.DexClass) -> a
-    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):466:467 -> a
+    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:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
-    3:3:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):467 -> a
-    4:18:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):468:482 -> a
-    19:19:boolean com.android.tools.r8.graph.DexClass.isAnnotation():571:571 -> a
-    19:19:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):482 -> a
-    20:20:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):482:482 -> a
-    21:32:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):491:502 -> a
-    33:33:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):507:507 -> a
-    34:34:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass):512:512 -> a
-    35:35:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):516:516 -> a
-    36:36:boolean com.android.tools.r8.graph.DexDefinition.isDexEncodedField():0:0 -> a
-    36:36:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):516 -> a
-    37:55:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):516:534 -> a
-    56:62:void reportReservationError(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):545:551 -> a
-    63:63:void reportReservationError(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):548:548 -> a
+    3:3: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
+    4:4:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    4:4:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89 -> a
+    4:4: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
+    5:19: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
+    20:20:boolean com.android.tools.r8.graph.DexClass.isAnnotation():553:553 -> a
+    20:20: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
+    21:21: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
+    22:33: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
+    34:34:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):508:508 -> a
+    35:35:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass):513:513 -> a
+    36:36:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):517:517 -> a
+    37:37:boolean com.android.tools.r8.graph.DexDefinition.isDexEncodedField():0:0 -> a
+    37:37:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):517 -> a
+    38:56:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):517:535 -> a
+    57:63:void reportReservationError(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):546:552 -> a
+    64:64:void reportReservationError(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):549:549 -> a
 com.android.tools.r8.naming.ProguardMapMinifier$ProguardMapMinifiedRenaming -> com.android.tools.r8.naming.L:
     java.util.Set unmappedReferences -> i
     java.util.Map classRenamingsMappingToDifferentName -> j
-    1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming,com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming,com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming,java.util.Set):568:571 -> <init>
-    1:2:void lambda$new$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):573:574 -> a
-    3:13:void checkForUseOfNotMappedReference(com.android.tools.r8.graph.DexType):586:596 -> a
-    3:13:com.android.tools.r8.graph.DexString internalLookupClassDescriptor(com.android.tools.r8.graph.DexType):581 -> a
-    14:14:void checkForUseOfNotMappedReference(com.android.tools.r8.graph.DexType):595:595 -> a
-    14:14:com.android.tools.r8.graph.DexString internalLookupClassDescriptor(com.android.tools.r8.graph.DexType):581 -> a
-    15:19:void checkForUseOfNotMappedReference(com.android.tools.r8.graph.DexType):594:598 -> a
-    15:19:com.android.tools.r8.graph.DexString internalLookupClassDescriptor(com.android.tools.r8.graph.DexType):581 -> a
-    20:20:com.android.tools.r8.graph.DexString internalLookupClassDescriptor(com.android.tools.r8.graph.DexType):582:582 -> a
+    1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming,com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming,com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming,java.util.Set):569:572 -> <init>
+    1:2:void lambda$new$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):574:575 -> a
+    3:13:void checkForUseOfNotMappedReference(com.android.tools.r8.graph.DexType):587:597 -> a
+    3:13:com.android.tools.r8.graph.DexString internalLookupClassDescriptor(com.android.tools.r8.graph.DexType):582 -> a
+    14:14:void checkForUseOfNotMappedReference(com.android.tools.r8.graph.DexType):596:596 -> a
+    14:14:com.android.tools.r8.graph.DexString internalLookupClassDescriptor(com.android.tools.r8.graph.DexType):582 -> a
+    15:19:void checkForUseOfNotMappedReference(com.android.tools.r8.graph.DexType):595:599 -> a
+    15:19:com.android.tools.r8.graph.DexString internalLookupClassDescriptor(com.android.tools.r8.graph.DexType):582 -> a
+    20:20:com.android.tools.r8.graph.DexString internalLookupClassDescriptor(com.android.tools.r8.graph.DexType):583:583 -> a
 com.android.tools.r8.naming.ProguardMapReader -> com.android.tools.r8.naming.O:
     java.util.HashMap cache -> i
     java.lang.String line -> h
@@ -67637,7 +68118,7 @@
     java.lang.String msg -> d
     1:5:void <init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String,boolean):542:546 -> <init>
     1:4:java.lang.String toString():551:554 -> toString
-com.android.tools.r8.naming.ProguardMapSupplier -> com.android.tools.r8.internal.tw:
+com.android.tools.r8.naming.ProguardMapSupplier -> com.android.tools.r8.internal.mv:
     com.android.tools.r8.naming.ClassNameMapper classNameMapper -> c
     com.android.tools.r8.utils.InternalOptions options -> e
     com.android.tools.r8.utils.Reporter reporter -> f
@@ -67658,8 +68139,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.tw$a:
-com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapChecker -> com.android.tools.r8.internal.tw$b:
+com.android.tools.r8.naming.ProguardMapSupplier$1 -> com.android.tools.r8.internal.mv$a:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapChecker -> com.android.tools.r8.internal.mv$b:
     boolean $assertionsDisabled -> a
     com.android.tools.r8.StringConsumer inner -> b
     java.lang.StringBuilder contents -> c
@@ -67672,23 +68153,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.tw$c:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId -> com.android.tools.r8.internal.mv$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.tw$d:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapIdBuilder -> com.android.tools.r8.internal.mv$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.tw$e:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapWriter -> com.android.tools.r8.internal.mv$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.uy:
+com.android.tools.r8.naming.Range -> com.android.tools.r8.internal.mx:
     int to -> b
     int from -> a
     1:3:void <init>(int,int):12:14 -> <init>
@@ -67758,7 +68239,7 @@
     7:8:com.android.tools.r8.naming.ClassNamingForMapApplier$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):57:58 -> a
     7:8:com.android.tools.r8.naming.ClassNaming$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):39 -> a
     9:10:com.android.tools.r8.naming.SeedMapper build():65:66 -> a
-com.android.tools.r8.naming.SourceFileRewriter -> com.android.tools.r8.internal.AC:
+com.android.tools.r8.naming.SourceFileRewriter -> com.android.tools.r8.internal.lB:
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
     com.android.tools.r8.graph.DexApplication application -> c
@@ -67771,7 +68252,7 @@
     47:65:void lambda$run$2(com.android.tools.r8.graph.DexEncodedMethod):59:77 -> a
     66:66:boolean lambda$run$0(com.android.tools.r8.graph.DexDebugEvent):74:74 -> a
     67:67: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.z6:
+com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo -> com.android.tools.r8.internal.k6:
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping mapping -> g
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo CANONICAL_NAME_INSTANCE -> a
     int arrayDepth -> f
@@ -67812,7 +68293,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.y6:
+com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping -> com.android.tools.r8.internal.j6:
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping NONE -> a
     boolean $assertionsDisabled -> g
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping NAME -> b
@@ -67829,7 +68310,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.hc:
+com.android.tools.r8.naming.dexitembasedstring.FieldNameComputationInfo -> com.android.tools.r8.internal.Ab:
     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>
@@ -67837,7 +68318,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.Zr:
+com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo -> com.android.tools.r8.internal.Tq:
     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
@@ -67853,22 +68334,22 @@
     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.R5:
+com.android.tools.r8.naming.identifiernamestring.ClassForNameIdentifierNameStringLookupResult -> com.android.tools.r8.internal.D5:
     1:1:void <init>(com.android.tools.r8.graph.DexType):14:14 -> <init>
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():569:569 -> a
-    1:1:boolean isTypeCompatInstantiatedFromUse(com.android.tools.r8.utils.InternalOptions):24 -> a
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():580:580 -> 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.x6:
+com.android.tools.r8.naming.identifiernamestring.ClassNameComparisonIdentifierNameStringLookupResult -> com.android.tools.r8.internal.i6:
     1:1:void <init>(com.android.tools.r8.graph.DexType):14:14 -> <init>
-    boolean isTypeCompatInstantiatedFromUse(com.android.tools.r8.utils.InternalOptions) -> a
+    boolean isTypeInstantiatedFromUse(com.android.tools.r8.utils.InternalOptions) -> a
     boolean isTypeInitializedFromUse() -> d
-com.android.tools.r8.naming.identifiernamestring.DexMemberBasedConstStringIdentifierNameStringLookupResult -> com.android.tools.r8.internal.ga:
+com.android.tools.r8.naming.identifiernamestring.DexMemberBasedConstStringIdentifierNameStringLookupResult -> com.android.tools.r8.internal.D9:
     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.la:
+com.android.tools.r8.naming.identifiernamestring.DexTypeBasedConstStringIdentifierNameStringLookupResult -> com.android.tools.r8.internal.I9:
     1:1:void <init>(com.android.tools.r8.graph.DexType):14:14 -> <init>
-    boolean isTypeCompatInstantiatedFromUse(com.android.tools.r8.utils.InternalOptions) -> a
+    boolean isTypeInstantiatedFromUse(com.android.tools.r8.utils.InternalOptions) -> a
     boolean isTypeInitializedFromUse() -> d
-com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult -> com.android.tools.r8.internal.ne:
+com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult -> com.android.tools.r8.internal.Ad:
     boolean $assertionsDisabled -> a
     com.android.tools.r8.graph.DexReference reference -> b
     1:1:void <clinit>():13:13 -> <clinit>
@@ -67896,15 +68377,15 @@
     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.pe:
+com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringMemberLookupResult -> com.android.tools.r8.internal.Cd:
     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.qe:
+com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringTypeLookupResult -> com.android.tools.r8.internal.Dd:
     1:1:void <init>(com.android.tools.r8.graph.DexType):14:14 -> <init>
     com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringTypeLookupResult asTypeResult() -> a
-    boolean isTypeCompatInstantiatedFromUse(com.android.tools.r8.utils.InternalOptions) -> 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.OF:
+com.android.tools.r8.naming.identifiernamestring.UncategorizedMemberIdentifierNameStringLookupResult -> com.android.tools.r8.internal.eF:
     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
@@ -68016,20 +68497,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.sd:
+com.android.tools.r8.naming.signature.GenericSignatureAction -> com.android.tools.r8.internal.Gc:
     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.sd$a:
+com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition -> com.android.tools.r8.internal.Gc$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.td:
+com.android.tools.r8.naming.signature.GenericSignatureParser -> com.android.tools.r8.internal.Hc:
     com.android.tools.r8.naming.signature.GenericSignatureAction actions -> b
     char[] buffer -> f
     boolean eof -> e
@@ -68073,9 +68554,10 @@
     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.ud:
+com.android.tools.r8.naming.signature.GenericSignatureRewriter -> com.android.tools.r8.internal.Ic:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.naming.NamingLens namingLens -> b
+    com.android.tools.r8.utils.InternalOptions options -> c
     1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):25:29 -> <init>
     1:8:void run(java.lang.Iterable,java.util.concurrent.ExecutorService):36:43 -> a
     9:16:void lambda$run$2(com.android.tools.r8.graph.DexProgramClass):46:53 -> a
@@ -68083,7 +68565,7 @@
     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.Q5:
+com.android.tools.r8.optimize.ClassAndMemberPublicizer -> com.android.tools.r8.internal.C5:
     com.android.tools.r8.shaking.KeepInfoCollection keepInfo -> d
     com.android.tools.r8.graph.DexApplication application -> b
     com.android.tools.r8.graph.SubtypingInfo subtypingInfo -> e
@@ -68091,28 +68573,39 @@
     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>():38:38 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):51:51 -> <init>
-    2:12:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):46:56 -> <init>
-    1:2: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):75:76 -> a
-    3:11:com.android.tools.r8.graph.GraphLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):81:89 -> a
-    12:12:void lambda$run$0(com.android.tools.r8.graph.DexClass):85:85 -> a
-    13:14:void doPublicize(com.android.tools.r8.graph.ProgramDefinition):93:94 -> 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:15:com.android.tools.r8.shaking.KeepInfoCollection com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection.mutate(java.util.function.Consumer):435:435 -> a
-    15:15:void doPublicize(com.android.tools.r8.graph.ProgramDefinition):94 -> a
-    16:16:void lambda$doPublicize$1(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):95:95 -> a
-    17:21:void publicizeType(com.android.tools.r8.graph.DexType):99:103 -> a
+    15:15:void doPublicize(com.android.tools.r8.graph.ProgramDefinition):97 -> a
+    16:16:void lambda$doPublicize$0(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):98:98 -> a
+    17:21:void publicizeType(com.android.tools.r8.graph.DexType):102:106 -> a
     22:22:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):212:212 -> a
-    22:22:void publicizeType(com.android.tools.r8.graph.DexType):103 -> a
-    23:60:void publicizeClass(com.android.tools.r8.graph.DexProgramClass):107:144 -> a
-    61:61:void publicizeClass(com.android.tools.r8.graph.DexProgramClass):142:142 -> a
-    62:73:void lambda$publicizeClass$2(com.android.tools.r8.graph.ProgramField):112:123 -> a
-    74:140:boolean com.android.tools.r8.optimize.ClassAndMemberPublicizer.publicizeMethod(com.android.tools.r8.graph.ProgramMethod):149:215 -> a
-    74:140:void lambda$publicizeClass$3(java.util.Set,com.android.tools.r8.graph.ProgramMethod):130 -> a
-    141:141:boolean com.android.tools.r8.optimize.ClassAndMemberPublicizer.publicizeMethod(com.android.tools.r8.graph.ProgramMethod):164:164 -> a
-    141:141:void lambda$publicizeClass$3(java.util.Set,com.android.tools.r8.graph.ProgramMethod):130 -> a
-    142:142:void lambda$publicizeClass$3(java.util.Set,com.android.tools.r8.graph.ProgramMethod):131:131 -> a
-com.android.tools.r8.optimize.FieldRebindingIdentityLens -> com.android.tools.r8.internal.mc:
+    22:22:void publicizeType(com.android.tools.r8.graph.DexType):106 -> a
+    23:60:void publicizeClass(com.android.tools.r8.graph.DexProgramClass):110:147 -> a
+    61:61:void publicizeClass(com.android.tools.r8.graph.DexProgramClass):145:145 -> a
+    62:62:void lambda$publicizeClass$1(com.android.tools.r8.graph.ProgramField):115:115 -> a
+    63:63:boolean com.android.tools.r8.graph.DexEncodedField.isPublic():215:215 -> a
+    63:63:void lambda$publicizeClass$1(com.android.tools.r8.graph.ProgramField):116 -> a
+    64:64:void lambda$publicizeClass$1(com.android.tools.r8.graph.ProgramField):119:119 -> a
+    65:65:boolean com.android.tools.r8.graph.DexEncodedField.isPrivate():207:207 -> a
+    65:65:void lambda$publicizeClass$1(com.android.tools.r8.graph.ProgramField):122 -> a
+    66:66:void lambda$publicizeClass$1(com.android.tools.r8.graph.ProgramField):126:126 -> a
+    67:73:boolean com.android.tools.r8.optimize.ClassAndMemberPublicizer.publicizeMethod(com.android.tools.r8.graph.ProgramMethod):152:158 -> a
+    67:73:void lambda$publicizeClass$2(java.util.Set,com.android.tools.r8.graph.ProgramMethod):133 -> a
+    74:74:boolean com.android.tools.r8.graph.DexEncodedMethod.isPrivate():510:510 -> a
+    74:74:boolean com.android.tools.r8.optimize.ClassAndMemberPublicizer.publicizeMethod(com.android.tools.r8.graph.ProgramMethod):161 -> a
+    74:74:void lambda$publicizeClass$2(java.util.Set,com.android.tools.r8.graph.ProgramMethod):133 -> a
+    75:127:boolean com.android.tools.r8.optimize.ClassAndMemberPublicizer.publicizeMethod(com.android.tools.r8.graph.ProgramMethod):166:218 -> a
+    75:127:void lambda$publicizeClass$2(java.util.Set,com.android.tools.r8.graph.ProgramMethod):133 -> a
+    128:128:boolean com.android.tools.r8.optimize.ClassAndMemberPublicizer.publicizeMethod(com.android.tools.r8.graph.ProgramMethod):167:167 -> a
+    128:128:void lambda$publicizeClass$2(java.util.Set,com.android.tools.r8.graph.ProgramMethod):133 -> a
+    129:129: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.Fb:
     boolean $assertionsDisabled -> f
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> g
     1:1:void <clinit>():23:23 -> <clinit>
@@ -68134,15 +68627,15 @@
     com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType) -> e
     1:1:boolean isContextFreeForMethods():111:111 -> 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.kc:
-com.android.tools.r8.optimize.FieldRebindingIdentityLens$Builder -> com.android.tools.r8.internal.lc:
+com.android.tools.r8.optimize.FieldRebindingIdentityLens$1 -> com.android.tools.r8.internal.Db:
+com.android.tools.r8.optimize.FieldRebindingIdentityLens$Builder -> com.android.tools.r8.internal.Eb:
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> a
     1:1:void <init>(com.android.tools.r8.optimize.FieldRebindingIdentityLens$1):114:114 -> <init>
     2:2:void <init>():119:119 -> <init>
     3:3:void <init>():116:116 -> <init>
     1:1:void recordDefinitionForNonReboundFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):123:123 -> a
     2:3:com.android.tools.r8.optimize.FieldRebindingIdentityLens build(com.android.tools.r8.graph.DexItemFactory):130:131 -> a
-com.android.tools.r8.optimize.InvokeSingleTargetExtractor -> com.android.tools.r8.internal.zi:
+com.android.tools.r8.optimize.InvokeSingleTargetExtractor -> com.android.tools.r8.internal.Kh:
     com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind kind -> d
     com.android.tools.r8.graph.DexMethod target -> e
     boolean $assertionsDisabled -> c
@@ -68175,7 +68668,7 @@
     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
-com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind -> com.android.tools.r8.internal.yi:
+com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind -> com.android.tools.r8.internal.Jh:
     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
@@ -68183,7 +68676,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.mq:
+com.android.tools.r8.optimize.MemberRebindingAnalysis -> com.android.tools.r8.internal.jp:
     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
@@ -68192,52 +68685,75 @@
     1:1:void <clinit>():41:41 -> <clinit>
     1:6:void <init>(com.android.tools.r8.graph.AppView):49:54 -> <init>
     1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.optimize.MemberRebindingAnalysis):41:41 -> a
-    2:17:com.android.tools.r8.graph.DexMethod validTargetFor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):58:73 -> a
-    18:18: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):78:78 -> a
-    19:19:boolean com.android.tools.r8.graph.DexClassAndField.isProgramField():0:0 -> 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):79 -> a
-    20:25: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):80:85 -> a
-    26:30: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):84:88 -> a
-    31:31:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexField.withHolder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):183:183 -> a
-    31:31: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):88 -> a
-    32:54:com.android.tools.r8.graph.DexType firstLibraryClassForInterfaceTarget(com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.Object,com.android.tools.r8.graph.DexType,java.util.function.BiFunction):97:119 -> a
-    55:60:com.android.tools.r8.graph.DexType firstLibraryClass(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):127:132 -> a
-    61:61:com.android.tools.r8.graph.DexEncodedMethod anyLookup(com.android.tools.r8.graph.DexMethod):144:144 -> a
-    62:74:void computeMethodRebinding(com.android.tools.r8.graph.MethodAccessInfoCollection):149:161 -> a
-    75:128:void computeMethodRebinding(com.android.tools.r8.utils.BiForEachable,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):170:223 -> a
-    129:129:java.util.List lambda$computeMethodRebinding$0(com.android.tools.r8.graph.DexProgramClass):174:174 -> a
-    130:131:void lambda$computeMethodRebinding$1(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):174:175 -> a
-    132:147:void lambda$computeMethodRebinding$3(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):181:196 -> a
-    148:151: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):245:248 -> a
-    148:151:void lambda$computeMethodRebinding$3(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):203 -> a
-    152:152:void lambda$computeMethodRebinding$3(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):206:206 -> a
-    153:158:com.android.tools.r8.graph.DexMethod com.android.tools.r8.optimize.MemberRebindingAnalysis.insertBridgeForInterfaceMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.TriConsumer):265:270 -> a
-    153:158:void lambda$computeMethodRebinding$3(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):205 -> a
-    159:160:void lambda$computeMethodRebinding$3(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):212:213 -> a
-    161:170:com.android.tools.r8.graph.DexMethod com.android.tools.r8.optimize.MemberRebindingAnalysis.insertBridgeForVisibilityIfNeeded(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.TriConsumer):312:321 -> a
-    161:170:void lambda$computeMethodRebinding$3(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):215 -> a
-    171:174:com.android.tools.r8.graph.DexMethod com.android.tools.r8.optimize.MemberRebindingAnalysis.insertBridgeForVisibilityIfNeeded(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.TriConsumer):316:319 -> a
-    171:174:void lambda$computeMethodRebinding$3(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):215 -> a
-    175:177:void lambda$computeMethodRebinding$3(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):219:219 -> a
-    178:178:int lambda$computeMethodRebinding$4(com.android.tools.r8.utils.Pair,com.android.tools.r8.utils.Pair):227:227 -> a
-    179:190:void lambda$computeMethodRebinding$5(java.util.function.Function,com.android.tools.r8.graph.DexProgramClass,java.util.List):227:238 -> a
-    191:200:com.android.tools.r8.graph.DexProgramClass findHolderForInterfaceMethodBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):274:283 -> a
-    201:212:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.mayNeedBridgeForVisibility(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMethod):287:298 -> a
-    201:212:boolean lambda$computeMethodRebinding$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):213 -> a
-    213:235:com.android.tools.r8.graph.DexProgramClass findHolderForVisibilityBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,java.lang.String):326:348 -> a
-    236:237:void lambda$verifyFieldAccessCollectionContainsAllNonReboundFieldReferences$7(java.util.Set,com.android.tools.r8.graph.FieldAccessInfo):376:377 -> a
-    238:243:void lambda$verifyFieldAccessCollectionContainsAllNonReboundFieldReferences$6(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexField):379:384 -> a
-    244:249:void lambda$verifyFieldAccessCollectionContainsAllNonReboundFieldReferences$6(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexField):380:385 -> a
-    250:252:java.util.Set computeNonReboundFieldReferences(java.util.concurrent.ExecutorService):394:396 -> a
-    253:253:java.util.Set computeNonReboundFieldReferences(java.util.concurrent.ExecutorService):395:395 -> a
-    254:256:void lambda$computeNonReboundFieldReferences$8(java.util.Set,com.android.tools.r8.graph.ProgramMethod):398:400 -> a
-    257:257:void lambda$computeNonReboundFieldReferences$8(java.util.Set,com.android.tools.r8.graph.ProgramMethod):399:399 -> a
+    2:2:com.android.tools.r8.graph.DexMethod validTargetFor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):58:58 -> a
+    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    3:3:com.android.tools.r8.graph.DexMethod validTargetFor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):58 -> a
+    4:18:com.android.tools.r8.graph.DexMethod validTargetFor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):59:73 -> 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):78:78 -> a
+    20:20:boolean com.android.tools.r8.graph.DexClassAndField.isProgramField():0:0 -> a
+    20:20: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):79 -> a
+    21:26: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):80:85 -> a
+    27:31: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):84:88 -> a
+    32:32:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexField.withHolder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):171:171 -> a
+    32:32: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):88 -> a
+    33:55:com.android.tools.r8.graph.DexType firstLibraryClassForInterfaceTarget(com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.Object,com.android.tools.r8.graph.DexType,java.util.function.BiFunction):97:119 -> a
+    56:61:com.android.tools.r8.graph.DexType firstLibraryClass(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):127:132 -> a
+    62:62:com.android.tools.r8.graph.DexEncodedMethod anyLookup(com.android.tools.r8.graph.DexMethod):144:144 -> a
+    63:75:void computeMethodRebinding(com.android.tools.r8.graph.MethodAccessInfoCollection):149:161 -> a
+    76:129:void computeMethodRebinding(com.android.tools.r8.utils.BiForEachable,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):170:223 -> a
+    130:130:java.util.List lambda$computeMethodRebinding$0(com.android.tools.r8.graph.DexProgramClass):174:174 -> a
+    131:132:void lambda$computeMethodRebinding$1(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):174:175 -> a
+    133:136:void lambda$computeMethodRebinding$3(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):181:184 -> a
+    137:137:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    137:137:void lambda$computeMethodRebinding$3(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):184 -> a
+    138:147:void lambda$computeMethodRebinding$3(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):185:194 -> a
+    148:148:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    148:148:void lambda$computeMethodRebinding$3(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):194 -> a
+    149:150:void lambda$computeMethodRebinding$3(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):195:196 -> a
+    151:154: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):245:248 -> a
+    151:154:void lambda$computeMethodRebinding$3(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):203 -> a
+    155:155:void lambda$computeMethodRebinding$3(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):206:206 -> a
+    156:161:com.android.tools.r8.graph.DexMethod com.android.tools.r8.optimize.MemberRebindingAnalysis.insertBridgeForInterfaceMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.TriConsumer):265:270 -> a
+    156:161:void lambda$computeMethodRebinding$3(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):205 -> a
+    162:163:void lambda$computeMethodRebinding$3(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):212:213 -> a
+    164:173:com.android.tools.r8.graph.DexMethod com.android.tools.r8.optimize.MemberRebindingAnalysis.insertBridgeForVisibilityIfNeeded(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.TriConsumer):312:321 -> a
+    164:173:void lambda$computeMethodRebinding$3(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):215 -> a
+    174:177:com.android.tools.r8.graph.DexMethod com.android.tools.r8.optimize.MemberRebindingAnalysis.insertBridgeForVisibilityIfNeeded(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.TriConsumer):316:319 -> a
+    174:177:void lambda$computeMethodRebinding$3(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):215 -> a
+    178:180:void lambda$computeMethodRebinding$3(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):219:219 -> a
+    181:181:int lambda$computeMethodRebinding$4(com.android.tools.r8.utils.Pair,com.android.tools.r8.utils.Pair):227:227 -> a
+    182:193:void lambda$computeMethodRebinding$5(java.util.function.Function,com.android.tools.r8.graph.DexProgramClass,java.util.List):227:238 -> a
+    194:197:com.android.tools.r8.graph.DexProgramClass findHolderForInterfaceMethodBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):274:277 -> a
+    198:198:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    198:198:com.android.tools.r8.graph.DexProgramClass findHolderForInterfaceMethodBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):277 -> a
+    199:203:com.android.tools.r8.graph.DexProgramClass findHolderForInterfaceMethodBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):279:283 -> a
+    204:205:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.mayNeedBridgeForVisibility(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMethod):287:288 -> a
+    204:205:boolean lambda$computeMethodRebinding$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):213 -> a
+    206:206:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    206:206:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.mayNeedBridgeForVisibility(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMethod):288 -> a
+    206:206:boolean lambda$computeMethodRebinding$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):213 -> a
+    207:213:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.mayNeedBridgeForVisibility(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMethod):292:298 -> a
+    207:213:boolean lambda$computeMethodRebinding$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):213 -> a
+    214:220:com.android.tools.r8.graph.DexProgramClass findHolderForVisibilityBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,java.lang.String):326:332 -> a
+    221:221:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    221:221:com.android.tools.r8.graph.DexProgramClass findHolderForVisibilityBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,java.lang.String):332 -> a
+    222:226:com.android.tools.r8.graph.DexProgramClass findHolderForVisibilityBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,java.lang.String):333:337 -> a
+    227:227:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    227:227:com.android.tools.r8.graph.DexProgramClass findHolderForVisibilityBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,java.lang.String):337 -> a
+    228:238:com.android.tools.r8.graph.DexProgramClass findHolderForVisibilityBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,java.lang.String):338:348 -> a
+    239:240:void lambda$verifyFieldAccessCollectionContainsAllNonReboundFieldReferences$7(java.util.Set,com.android.tools.r8.graph.FieldAccessInfo):376:377 -> a
+    241:246:void lambda$verifyFieldAccessCollectionContainsAllNonReboundFieldReferences$6(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexField):379:384 -> a
+    247:252:void lambda$verifyFieldAccessCollectionContainsAllNonReboundFieldReferences$6(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexField):380:385 -> a
+    253:255:java.util.Set computeNonReboundFieldReferences(java.util.concurrent.ExecutorService):394:396 -> a
+    256:256:java.util.Set computeNonReboundFieldReferences(java.util.concurrent.ExecutorService):395:395 -> a
+    257:259:void lambda$computeNonReboundFieldReferences$8(java.util.Set,com.android.tools.r8.graph.ProgramMethod):398:400 -> a
+    260:260:void lambda$computeNonReboundFieldReferences$8(java.util.Set,com.android.tools.r8.graph.ProgramMethod):399:399 -> a
     1:1:com.android.tools.r8.graph.DexEncodedMethod classLookup(com.android.tools.r8.graph.DexMethod):136:136 -> b
     2:5:void recordNonReboundFieldAccesses(java.util.concurrent.ExecutorService):355:358 -> b
     1:1:com.android.tools.r8.graph.DexEncodedMethod interfaceLookup(com.android.tools.r8.graph.DexMethod):140:140 -> c
     2:6:com.android.tools.r8.optimize.MemberRebindingLens run(java.util.concurrent.ExecutorService):362:366 -> c
     1:18:boolean verifyFieldAccessCollectionContainsAllNonReboundFieldReferences(java.util.concurrent.ExecutorService):371:388 -> d
-com.android.tools.r8.optimize.MemberRebindingAnalysis$1 -> com.android.tools.r8.internal.lq:
+com.android.tools.r8.optimize.MemberRebindingAnalysis$1 -> com.android.tools.r8.internal.ip:
     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):400:400 -> <init>
@@ -68255,10 +68771,10 @@
     void registerTypeReference(com.android.tools.r8.graph.DexType) -> f
     1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):419:419 -> g
     1:4:void registerFieldReference(com.android.tools.r8.graph.DexField):423:426 -> i
-    5:5:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():164:164 -> i
+    5:5:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():158:158 -> i
     5:5:void registerFieldReference(com.android.tools.r8.graph.DexField):426 -> i
     6:6:void registerFieldReference(com.android.tools.r8.graph.DexField):427:427 -> i
-com.android.tools.r8.optimize.MemberRebindingIdentityLens -> com.android.tools.r8.internal.pq:
+com.android.tools.r8.optimize.MemberRebindingIdentityLens -> com.android.tools.r8.internal.mp:
     boolean $assertionsDisabled -> f
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> g
     java.util.Map nonReboundMethodReferenceToDefinitionMap -> h
@@ -68284,8 +68800,8 @@
     com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType) -> e
     1:1:boolean isContextFreeForMethods():129:129 -> 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.nq:
-com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder -> com.android.tools.r8.internal.oq:
+com.android.tools.r8.optimize.MemberRebindingIdentityLens$1 -> com.android.tools.r8.internal.kp:
+com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder -> com.android.tools.r8.internal.lp:
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> b
     java.util.Map nonReboundMethodReferenceToDefinitionMap -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -68299,7 +68815,7 @@
     4:13:void recordMethodAccess(com.android.tools.r8.graph.DexMethod):156:165 -> a
     14:14:void recordMethodAccess(com.android.tools.r8.graph.DexMethod):164:164 -> a
     15:19:com.android.tools.r8.optimize.MemberRebindingIdentityLens build():174:178 -> a
-com.android.tools.r8.optimize.MemberRebindingIdentityLensFactory -> com.android.tools.r8.internal.rq:
+com.android.tools.r8.optimize.MemberRebindingIdentityLensFactory -> com.android.tools.r8.internal.op:
     1:19:com.android.tools.r8.optimize.MemberRebindingIdentityLens create(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):47:65 -> a
     20:20: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:72 -> a
     21:21:com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder com.android.tools.r8.optimize.MemberRebindingIdentityLens.builder(com.android.tools.r8.graph.AppView):44:44 -> a
@@ -68310,7 +68826,7 @@
     30:30: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
     31:31:void com.android.tools.r8.graph.UseRegistry.accept(com.android.tools.r8.graph.ProgramMethod):23:23 -> a
     31:31: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.qq:
+com.android.tools.r8.optimize.MemberRebindingIdentityLensFactory$NonReboundMemberReferencesRegistry -> com.android.tools.r8.internal.np:
     com.android.tools.r8.graph.ProgramMethod context -> e
     java.util.Set seenFieldReferences -> h
     java.util.Set seenMethodReferences -> i
@@ -68338,7 +68854,7 @@
     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():164:164 -> i
+    10:10:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():158:158 -> 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
@@ -68347,7 +68863,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.uq:
+com.android.tools.r8.optimize.MemberRebindingLens -> com.android.tools.r8.internal.rp:
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> i
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.AppView appView -> g
@@ -68378,8 +68894,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.sq:
-com.android.tools.r8.optimize.MemberRebindingLens$Builder -> com.android.tools.r8.internal.tq:
+com.android.tools.r8.optimize.MemberRebindingLens$1 -> com.android.tools.r8.internal.pp:
+com.android.tools.r8.optimize.MemberRebindingLens$Builder -> com.android.tools.r8.internal.qp:
     java.util.Map methodMaps -> c
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> d
     com.android.tools.r8.graph.AppView appView -> b
@@ -68394,7 +68910,7 @@
     11:11:void com.android.tools.r8.optimize.MemberRebindingLens$Builder.recordNonReboundFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):179:179 -> a
     11:11:void lambda$recordNonReboundFieldAccesses$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):174 -> a
     12:12:com.android.tools.r8.optimize.MemberRebindingLens build():183:183 -> a
-com.android.tools.r8.optimize.PublicizerLens -> com.android.tools.r8.internal.ty:
+com.android.tools.r8.optimize.PublicizerLens -> com.android.tools.r8.internal.kx:
     boolean $assertionsDisabled -> l
     com.android.tools.r8.graph.AppView appView -> m
     java.util.Set publicizedMethods -> n
@@ -68403,26 +68919,31 @@
     2:7:void <init>(com.android.tools.r8.graph.AppView,java.util.Set):25:30 -> <init>
     8:16:void <init>(com.android.tools.r8.graph.AppView,java.util.Set):24:32 -> <init>
     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:8:boolean com.android.tools.r8.optimize.PublicizerLens.publicizedMethodIsPresentOnHolder(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):62:67 -> a
-    3:8:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):51 -> a
-    9:9:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():501:501 -> a
-    9:9:boolean com.android.tools.r8.optimize.PublicizerLens.publicizedMethodIsPresentOnHolder(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):68 -> a
-    9: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.optimize.PublicizerLens.publicizedMethodIsPresentOnHolder(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):68:68 -> 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):273:273 -> 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():514:514 -> 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:15:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):52:56 -> 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
+    11:11:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):51 -> a
+    12:16:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):52:56 -> a
     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.ry:
-com.android.tools.r8.optimize.PublicizerLens$PublicizedLensBuilder -> com.android.tools.r8.internal.sy:
+com.android.tools.r8.optimize.PublicizerLens$1 -> com.android.tools.r8.internal.ix:
+com.android.tools.r8.optimize.PublicizerLens$PublicizedLensBuilder -> com.android.tools.r8.internal.jx:
     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.eH:
+com.android.tools.r8.optimize.VisibilityBridgeRemover -> com.android.tools.r8.internal.wG:
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():19:19 -> <clinit>
@@ -68434,21 +68955,26 @@
     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():489:489 -> a
+    35:35:boolean com.android.tools.r8.graph.DexEncodedMethod.isBridge():498:498 -> 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):207:207 -> a
+    47:47:boolean com.android.tools.r8.graph.DexMethod.hasSameProtoAndName(com.android.tools.r8.graph.DexMethod):202:202 -> 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:56:boolean com.android.tools.r8.optimize.VisibilityBridgeRemover.isUnneededVisibilityBridge(com.android.tools.r8.graph.ProgramMethod):82:90 -> a
-    48:56:void lambda$removeUnneededVisibilityBridges$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):48 -> a
-    57:57:boolean com.android.tools.r8.optimize.VisibilityBridgeRemover.isUnneededVisibilityBridge(com.android.tools.r8.graph.ProgramMethod):89:89 -> a
-    57:57:void lambda$removeUnneededVisibilityBridges$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):48 -> a
-    58:58:void lambda$removeUnneededVisibilityBridges$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):49:49 -> a
-    59:60:void run():100:101 -> a
-com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting -> com.android.tools.r8.internal.m3:
+    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():510:510 -> 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
+    50:58:void lambda$removeUnneededVisibilityBridges$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):48 -> a
+    59:59:boolean com.android.tools.r8.optimize.VisibilityBridgeRemover.isUnneededVisibilityBridge(com.android.tools.r8.graph.ProgramMethod):89:89 -> a
+    59:59:void lambda$removeUnneededVisibilityBridges$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):48 -> a
+    60:60:void lambda$removeUnneededVisibilityBridges$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):49:49 -> a
+    61:62:void run():100:101 -> a
+com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting -> com.android.tools.r8.internal.Z2:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple feedback -> a
     com.android.tools.r8.graph.AppView appView -> c
     boolean $assertionsDisabled -> b
@@ -68456,66 +68982,69 @@
     1:4:void <clinit>():68:71 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.AppView):79:81 -> <init>
     1:1:void run():85:85 -> a
-    2:2:com.android.tools.r8.graph.SubtypingInfo com.android.tools.r8.shaking.AppInfoWithLiveness.computeSubtypingInfo():1349:1349 -> a
+    2:2:com.android.tools.r8.graph.SubtypingInfo com.android.tools.r8.shaking.AppInfoWithLiveness.computeSubtypingInfo():1344:1344 -> a
     2:2:void run():85 -> a
     3:26:void run():86:109 -> a
     27:27:void lambda$run$0(com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexProgramClass):88:88 -> a
     28:30: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):111:113 -> a
-    31:38:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):122:129 -> a
-    39:45:java.util.Set com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.getCandidatesForHoisting(java.util.Set):137:143 -> a
-    39:45:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):131 -> a
-    46:47:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):131:132 -> a
-    48:48:int lambda$processClass$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):123:123 -> a
-    49:98:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):155:204 -> a
-    99:101:java.util.Map$Entry com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.findMostFrequentBridge(java.util.Map):266:268 -> a
-    99:101:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):207 -> a
-    102:104:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):208:210 -> a
-    105:112:java.util.List com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.getBridgesEligibleForHoisting(java.lang.Iterable,com.android.tools.r8.graph.DexMethod):277:284 -> a
-    105:112:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):214 -> a
-    113:113:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):215:215 -> a
-    114:117:boolean com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.mayBecomeInaccessibleAfterHoisting(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):290:293 -> a
-    114:117:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):218 -> a
-    118:118:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():501:501 -> a
-    118:118:boolean com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.mayBecomeInaccessibleAfterHoisting(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):293 -> a
-    118:118:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):218 -> a
-    119:131:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):224:236 -> a
-    132:134: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):297:299 -> a
-    132:134:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):237 -> a
-    135:138: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):308:311 -> a
-    135:138: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):299 -> a
-    135:138:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):237 -> a
-    139:139:boolean com.android.tools.r8.cf.code.CfInstruction.isInvoke():0:0 -> a
-    139:139: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):311 -> a
-    139:139: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):299 -> a
-    139:139:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):237 -> a
-    140:158: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):311:329 -> a
-    140:158: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):299 -> a
-    140:158:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):237 -> a
-    159:160: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):301:302 -> a
-    159:160:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):237 -> a
-    161:165: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):334:338 -> a
-    161:165: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):302 -> a
-    161:165:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):237 -> a
-    166:166:boolean com.android.tools.r8.code.Instruction.isInvokeVirtual():0:0 -> a
-    166:166: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):338 -> a
-    166:166: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):302 -> a
-    166:166:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):237 -> a
-    167:173: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):339:345 -> a
-    167:173: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):302 -> a
-    167:173:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):237 -> a
-    174:174:boolean com.android.tools.r8.code.Instruction.isInvokeVirtualRange():0:0 -> a
-    174:174: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):347 -> a
-    174:174: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):302 -> a
-    174:174:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):237 -> a
-    175:194: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):348:367 -> a
-    175:194: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):302 -> a
-    175:194:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):237 -> a
-    195:210:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):237:252 -> a
-    211:220:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):249:258 -> a
-    221:221: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):304:304 -> a
-    221:221:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):237 -> a
-    222:222:java.util.List lambda$hoistBridgeIfPossible$3(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):199:199 -> a
-com.android.tools.r8.optimize.bridgehoisting.BridgeHoistingLens -> com.android.tools.r8.internal.n3:
+    31:34:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):122:125 -> a
+    35:35:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    35:35:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):125 -> a
+    36:40:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):125:129 -> a
+    41:47:java.util.Set com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.getCandidatesForHoisting(java.util.Set):137:143 -> a
+    41:47:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):131 -> a
+    48:49:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):131:132 -> a
+    50:50:int lambda$processClass$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):123:123 -> a
+    51:100:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):155:204 -> a
+    101:103:java.util.Map$Entry com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.findMostFrequentBridge(java.util.Map):266:268 -> a
+    101:103:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):207 -> a
+    104:106:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):208:210 -> a
+    107:114:java.util.List com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.getBridgesEligibleForHoisting(java.lang.Iterable,com.android.tools.r8.graph.DexMethod):277:284 -> a
+    107:114:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):214 -> a
+    115:115:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):215:215 -> a
+    116:119:boolean com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.mayBecomeInaccessibleAfterHoisting(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):290:293 -> a
+    116:119:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):218 -> a
+    120:120:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():514:514 -> a
+    120:120:boolean com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.mayBecomeInaccessibleAfterHoisting(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):293 -> a
+    120:120:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):218 -> a
+    121:133:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):224:236 -> a
+    134:136: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):297:299 -> a
+    134:136:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):237 -> a
+    137:140: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):308:311 -> a
+    137:140: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):299 -> a
+    137:140:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):237 -> a
+    141:141:boolean com.android.tools.r8.cf.code.CfInstruction.isInvoke():0:0 -> a
+    141:141: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):311 -> a
+    141:141: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):299 -> a
+    141:141:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):237 -> a
+    142:160: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):311:329 -> a
+    142:160: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):299 -> a
+    142:160:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):237 -> a
+    161:162: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):301:302 -> a
+    161:162:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):237 -> a
+    163:167: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):334:338 -> a
+    163:167: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):302 -> a
+    163:167:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):237 -> a
+    168:168:boolean com.android.tools.r8.code.Instruction.isInvokeVirtual():0:0 -> a
+    168:168: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):338 -> a
+    168:168: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):302 -> a
+    168:168:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):237 -> a
+    169:175: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):339:345 -> a
+    169:175: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):302 -> a
+    169:175:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):237 -> a
+    176:176:boolean com.android.tools.r8.code.Instruction.isInvokeVirtualRange():0:0 -> a
+    176:176: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):347 -> a
+    176:176: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):302 -> a
+    176:176:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):237 -> a
+    177:196: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):348:367 -> a
+    177:196: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):302 -> a
+    177:196:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):237 -> a
+    197:212:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):237:252 -> a
+    213:222:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):249:258 -> a
+    223:223: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):304:304 -> a
+    223:223:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):237 -> a
+    224:224:java.util.List lambda$hoistBridgeIfPossible$3(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):199:199 -> a
+com.android.tools.r8.optimize.bridgehoisting.BridgeHoistingLens -> com.android.tools.r8.internal.a3:
     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>
     com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod) -> a
@@ -68534,7 +69063,7 @@
     com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType) -> e
     1:1:boolean isContextFreeForMethods():73:73 -> e
     1:2:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):42:43 -> f
-com.android.tools.r8.optimize.bridgehoisting.BridgeHoistingResult -> com.android.tools.r8.internal.o3:
+com.android.tools.r8.optimize.bridgehoisting.BridgeHoistingResult -> com.android.tools.r8.internal.b3:
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap bridgeToHoistedBridgeMap -> c
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
@@ -68559,7 +69088,7 @@
     35:36:com.android.tools.r8.optimize.bridgehoisting.BridgeHoistingLens buildLens():86:87 -> a
     1:1:boolean isEmpty():44:44 -> b
     2:2:void lambda$recordNonReboundMethodAccesses$2(com.android.tools.r8.graph.MethodAccessInfoCollection$IdentityBuilder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):80:80 -> b
-com.android.tools.r8.org.objectweb.asm.AnnotationVisitor -> com.android.tools.r8.internal.e1:
+com.android.tools.r8.org.objectweb.asm.AnnotationVisitor -> com.android.tools.r8.internal.d1:
     1:1:void <init>(int):59:59 -> <init>
     2:13:void <init>(int,com.android.tools.r8.org.objectweb.asm.AnnotationVisitor):70:81 -> <init>
     void visit(java.lang.String,java.lang.Object) -> a
@@ -68567,7 +69096,7 @@
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String) -> a
     void visitEnd() -> a
     void visitEnum(java.lang.String,java.lang.String,java.lang.String) -> a
-com.android.tools.r8.org.objectweb.asm.AnnotationWriter -> com.android.tools.r8.internal.f1:
+com.android.tools.r8.org.objectweb.asm.AnnotationWriter -> com.android.tools.r8.internal.e1:
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter previousAnnotation -> f
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter nextAnnotation -> g
     com.android.tools.r8.org.objectweb.asm.SymbolTable symbolTable -> a
@@ -68600,7 +69129,7 @@
     179:181:int computeParameterAnnotationsSize(java.lang.String,com.android.tools.r8.org.objectweb.asm.AnnotationWriter[],int):498:500 -> a
     182:205:void putParameterAnnotations(int,com.android.tools.r8.org.objectweb.asm.AnnotationWriter[],int,com.android.tools.r8.org.objectweb.asm.ByteVector):526:549 -> a
     1:8:int computeAnnotationsSize(java.lang.String):334:341 -> b
-com.android.tools.r8.org.objectweb.asm.Attribute -> com.android.tools.r8.internal.U1:
+com.android.tools.r8.org.objectweb.asm.Attribute -> com.android.tools.r8.internal.P1:
     byte[] content -> b
     java.lang.String type -> a
     com.android.tools.r8.org.objectweb.asm.Attribute nextAttribute -> c
@@ -68624,7 +69153,7 @@
     30:30:void putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int,com.android.tools.r8.org.objectweb.asm.ByteVector):311 -> a
     31:33:void putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int,com.android.tools.r8.org.objectweb.asm.ByteVector):313:315 -> a
     34:44:void putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,int,com.android.tools.r8.org.objectweb.asm.ByteVector):336:346 -> a
-com.android.tools.r8.org.objectweb.asm.Attribute$Set -> com.android.tools.r8.internal.T1:
+com.android.tools.r8.org.objectweb.asm.Attribute$Set -> com.android.tools.r8.internal.O1:
     com.android.tools.r8.org.objectweb.asm.Attribute[] data -> b
     int size -> a
     1:6:void <init>():351:356 -> <init>
@@ -68634,7 +69163,7 @@
     5:10:void com.android.tools.r8.org.objectweb.asm.Attribute$Set.add(com.android.tools.r8.org.objectweb.asm.Attribute):384:389 -> a
     5:10:void addAttributes(com.android.tools.r8.org.objectweb.asm.Attribute):362 -> a
     11:11:void addAttributes(com.android.tools.r8.org.objectweb.asm.Attribute):364:364 -> a
-com.android.tools.r8.org.objectweb.asm.ByteVector -> com.android.tools.r8.internal.w3:
+com.android.tools.r8.org.objectweb.asm.ByteVector -> com.android.tools.r8.internal.j3:
     byte[] data -> a
     int length -> b
     1:2:void <init>():45:46 -> <init>
@@ -68653,14 +69182,15 @@
     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.N6:
-    int[] bootstrapMethodOffsets -> f
-    byte[] classFileBuffer -> b
-    int[] cpInfoOffsets -> c
-    com.android.tools.r8.org.objectweb.asm.ConstantDynamic[] constantDynamicValues -> e
-    java.lang.String[] constantUtf8Values -> d
-    int maxStringLength -> g
-    int header -> a
+com.android.tools.r8.org.objectweb.asm.ClassReader -> com.android.tools.r8.internal.y6:
+    int[] bootstrapMethodOffsets -> g
+    byte[] b -> a
+    com.android.tools.r8.org.objectweb.asm.ConstantDynamic[] constantDynamicValues -> f
+    int[] cpInfoOffsets -> d
+    int maxStringLength -> h
+    java.lang.String[] constantUtf8Values -> e
+    int header -> b
+    byte[] classFileBuffer -> c
     1:1:void <init>(byte[]):156:156 -> <init>
     2:2:void <init>(byte[],int,int):170:170 -> <init>
     3:73:void <init>(byte[],int,boolean):182:252 -> <init>
@@ -68843,13 +69373,13 @@
     1:2:short readShort(int):3572:3573 -> f
     3:9:java.lang.String readUtf(int,char[]):3634:3640 -> f
     1:2:int readUnsignedShort(int):3560:3561 -> g
-com.android.tools.r8.org.objectweb.asm.ClassTooLargeException -> com.android.tools.r8.internal.W6:
+com.android.tools.r8.org.objectweb.asm.ClassTooLargeException -> com.android.tools.r8.internal.H6:
     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.Y6:
+com.android.tools.r8.org.objectweb.asm.ClassVisitor -> com.android.tools.r8.internal.J6:
     com.android.tools.r8.org.objectweb.asm.ClassVisitor cv -> b
     int api -> a
     1:1:void <init>(int):58:58 -> <init>
@@ -68875,7 +69405,7 @@
     12:12:com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor visitRecordComponent(java.lang.String,java.lang.String,java.lang.String):305:305 -> b
     1:5:void visitPermittedSubclass(java.lang.String):265:269 -> c
     6:6:void visitPermittedSubclass(java.lang.String):266:266 -> c
-com.android.tools.r8.org.objectweb.asm.ClassWriter -> com.android.tools.r8.internal.Z6:
+com.android.tools.r8.org.objectweb.asm.ClassWriter -> com.android.tools.r8.internal.K6:
     int numberOfInnerClasses -> n
     com.android.tools.r8.org.objectweb.asm.FieldWriter firstField -> j
     int interfaceCount -> h
@@ -68936,7 +69466,7 @@
     295:295:byte[] toByteArray():720:720 -> b
     296:296:byte[] toByteArray():599:599 -> b
     1:5:void visitPermittedSubclass(java.lang.String):377:381 -> c
-com.android.tools.r8.org.objectweb.asm.ConstantDynamic -> com.android.tools.r8.internal.s8:
+com.android.tools.r8.org.objectweb.asm.ConstantDynamic -> com.android.tools.r8.internal.U7:
     java.lang.Object[] bootstrapMethodArguments -> d
     java.lang.String name -> a
     java.lang.String descriptor -> b
@@ -68949,18 +69479,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.Constants -> com.android.tools.r8.internal.u8:
-    1:2:void 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 checkAsmExperimental(java.lang.Object):188 -> a
-    11:11:void checkAsmExperimental(java.lang.Object):189:189 -> a
-    12:20:void com.android.tools.r8.org.objectweb.asm.Constants.checkIsPreview(java.io.InputStream):210:210 -> a
-    12:20:void checkAsmExperimental(java.lang.Object):189 -> a
-    23:24:void com.android.tools.r8.org.objectweb.asm.Constants.checkIsPreview(java.io.InputStream):213:214 -> a
-    23:24:void 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 checkAsmExperimental(java.lang.Object):189 -> a
-com.android.tools.r8.org.objectweb.asm.Context -> com.android.tools.r8.internal.C8:
+com.android.tools.r8.org.objectweb.asm.Context -> com.android.tools.r8.internal.d8:
     int currentFrameType -> n
     java.lang.String currentMethodDescriptor -> f
     int currentFrameLocalCount -> o
@@ -68981,15 +69500,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.G8:
+com.android.tools.r8.org.objectweb.asm.CurrentFrame -> com.android.tools.r8.internal.h8:
     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.Ea:
+com.android.tools.r8.org.objectweb.asm.Edge -> com.android.tools.r8.internal.aa:
     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.tc:
+com.android.tools.r8.org.objectweb.asm.FieldVisitor -> com.android.tools.r8.internal.Mb:
     com.android.tools.r8.org.objectweb.asm.FieldVisitor fv -> a
     1:1:void <init>(int):57:57 -> <init>
     2:16:void <init>(int,com.android.tools.r8.org.objectweb.asm.FieldVisitor):69:83 -> <init>
@@ -68997,7 +69516,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):95:96 -> a
     3:4:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):131:132 -> a
-com.android.tools.r8.org.objectweb.asm.FieldWriter -> com.android.tools.r8.internal.uc:
+com.android.tools.r8.org.objectweb.asm.FieldWriter -> com.android.tools.r8.internal.Nb:
     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
@@ -69019,7 +69538,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.Xc:
+com.android.tools.r8.org.objectweb.asm.Frame -> com.android.tools.r8.internal.mc:
     short outputStackTop -> g
     short outputStackStart -> f
     int[] initializations -> i
@@ -69116,7 +69635,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.zd:
+com.android.tools.r8.org.objectweb.asm.Handle -> com.android.tools.r8.internal.Nc:
     boolean isInterface -> e
     java.lang.String name -> c
     java.lang.String owner -> b
@@ -69131,7 +69650,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.Ad:
+com.android.tools.r8.org.objectweb.asm.Handler -> com.android.tools.r8.internal.Oc:
     com.android.tools.r8.org.objectweb.asm.Handler nextHandler -> f
     com.android.tools.r8.org.objectweb.asm.Label handlerPc -> c
     int catchType -> d
@@ -69147,7 +69666,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.un:
+com.android.tools.r8.org.objectweb.asm.Label -> com.android.tools.r8.internal.zm:
     int bytecodeOffset -> f
     com.android.tools.r8.org.objectweb.asm.Edge outgoingEdges -> n
     com.android.tools.r8.org.objectweb.asm.Frame frame -> l
@@ -69175,7 +69694,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.hr:
+com.android.tools.r8.org.objectweb.asm.MethodTooLargeException -> com.android.tools.r8.internal.fq:
     java.lang.String className -> a
     int codeSize -> d
     java.lang.String descriptor -> c
@@ -69185,7 +69704,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.ir:
+com.android.tools.r8.org.objectweb.asm.MethodVisitor -> com.android.tools.r8.internal.gq:
     int api -> h
     com.android.tools.r8.org.objectweb.asm.MethodVisitor mv -> i
     1:1:void <init>(int):71:71 -> <init>
@@ -69230,7 +69749,7 @@
     7:8:void visitMaxs(int,int):772:773 -> c
     9:10:void visitEnd():782:783 -> c
     1:2:void visitVarInsn(int,int):358:359 -> d
-com.android.tools.r8.org.objectweb.asm.MethodWriter -> com.android.tools.r8.internal.jr:
+com.android.tools.r8.org.objectweb.asm.MethodWriter -> com.android.tools.r8.internal.hq:
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeVisibleAnnotation -> I
     int accessFlags -> l
     boolean hasAsmInstructions -> f0
@@ -69419,7 +69938,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.lr:
+com.android.tools.r8.org.objectweb.asm.ModuleVisitor -> com.android.tools.r8.internal.jq:
     1:1:void <init>(int):57:57 -> <init>
     2:13:void <init>(int,com.android.tools.r8.org.objectweb.asm.ModuleVisitor):68:79 -> <init>
     void visitExport(java.lang.String,int,java.lang.String[]) -> a
@@ -69429,7 +69948,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.mr:
+com.android.tools.r8.org.objectweb.asm.ModuleWriter -> com.android.tools.r8.internal.kq:
     com.android.tools.r8.org.objectweb.asm.ByteVector provides -> n
     int packageCount -> o
     com.android.tools.r8.org.objectweb.asm.ByteVector usesIndex -> l
@@ -69458,7 +69977,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.ru:
+com.android.tools.r8.org.objectweb.asm.Opcodes -> com.android.tools.r8.internal.lt:
     java.lang.Integer FLOAT -> c
     java.lang.Integer DOUBLE -> d
     java.lang.Integer LONG -> e
@@ -69467,14 +69986,14 @@
     java.lang.Integer TOP -> a
     java.lang.Integer INTEGER -> b
     1:7:void <clinit>():390:396 -> <clinit>
-com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor -> com.android.tools.r8.internal.Dy:
+com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor -> com.android.tools.r8.internal.ux:
     com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor delegate -> a
     1:1:void <init>(int):57:57 -> <init>
     2:16:void <init>(int,com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor):68:82 -> <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.Ey:
+com.android.tools.r8.org.objectweb.asm.RecordComponentWriter -> com.android.tools.r8.internal.vx:
     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
@@ -69493,7 +70012,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.pE:
+com.android.tools.r8.org.objectweb.asm.SymbolTable -> com.android.tools.r8.internal.cD:
     com.android.tools.r8.org.objectweb.asm.ClassWriter classWriter -> a
     int typeCount -> k
     int bootstrapMethodCount -> i
@@ -69633,7 +70152,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.oE:
+com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry -> com.android.tools.r8.internal.bD:
     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
@@ -69660,7 +70179,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.oF:
+com.android.tools.r8.org.objectweb.asm.Type -> com.android.tools.r8.internal.hE:
     int valueBegin -> l
     int valueEnd -> m
     int sort -> j
@@ -69697,7 +70216,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.CF:
+com.android.tools.r8.org.objectweb.asm.TypePath -> com.android.tools.r8.internal.RE:
     byte[] typePathContainer -> a
     int typePathOffset -> b
     1:3:void <init>(byte[],int):72:74 -> <init>
@@ -69714,7 +70233,18 @@
     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.commons.JSRInlinerAdapter -> com.android.tools.r8.internal.Zi:
+com.android.tools.r8.org.objectweb.asm.TypeReference -> com.android.tools.r8.internal.SE:
+    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
+    11:11:void com.android.tools.r8.org.objectweb.asm.Constants.checkAsmExperimental(java.lang.Object):189:189 -> a
+    12:20:void com.android.tools.r8.org.objectweb.asm.Constants.checkIsPreview(java.io.InputStream):210:210 -> a
+    12:20:void com.android.tools.r8.org.objectweb.asm.Constants.checkAsmExperimental(java.lang.Object):189 -> a
+    23:24:void com.android.tools.r8.org.objectweb.asm.Constants.checkIsPreview(java.io.InputStream):213:214 -> a
+    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.ii:
     java.util.BitSet sharedSubroutineInsns -> F
     java.util.Map subroutinesInsns -> E
     java.util.BitSet mainSubroutineInsns -> D
@@ -69753,7 +70283,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.Yi:
+com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation -> com.android.tools.r8.internal.hi:
     java.util.Map clonedLabels -> c
     com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation parent -> a
     java.util.BitSet subroutineInsns -> b
@@ -69770,7 +70300,7 @@
     1:1:com.android.tools.r8.org.objectweb.asm.tree.LabelNode com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation.get(java.lang.Object):558:558 -> get
     1:1:java.lang.Object get(java.lang.Object):427 -> get
     1:1:int hashCode():568:568 -> hashCode
-com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode -> com.android.tools.r8.internal.r:
+com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode -> com.android.tools.r8.internal.q:
     java.util.List visibleTypeAnnotations -> b
     java.util.List invisibleTypeAnnotations -> c
     int index -> f
@@ -69787,7 +70317,7 @@
     1:5:void acceptAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor):180:184 -> b
     6:15:void acceptAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor):183:192 -> b
     16:16:void acceptAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor):191:191 -> b
-com.android.tools.r8.org.objectweb.asm.tree.AnnotationNode -> com.android.tools.r8.internal.d1:
+com.android.tools.r8.org.objectweb.asm.tree.AnnotationNode -> com.android.tools.r8.internal.c1:
     java.util.List values -> b
     java.lang.String desc -> a
     1:3:void <init>(java.lang.String):63:65 -> <init>
@@ -69821,7 +70351,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.dc:
+com.android.tools.r8.org.objectweb.asm.tree.FieldInsnNode -> com.android.tools.r8.internal.wb:
     java.lang.String owner -> g
     java.lang.String desc -> i
     java.lang.String name -> h
@@ -69829,7 +70359,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.Yc:
+com.android.tools.r8.org.objectweb.asm.tree.FrameNode -> com.android.tools.r8.internal.nc:
     int type -> g
     java.util.List stack -> i
     java.util.List local -> h
@@ -69848,14 +70378,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.ve:
+com.android.tools.r8.org.objectweb.asm.tree.IincInsnNode -> com.android.tools.r8.internal.Hd:
     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.Lf:
+com.android.tools.r8.org.objectweb.asm.tree.InsnList -> com.android.tools.r8.internal.Xe:
     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
@@ -69878,7 +70408,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.Lf$a:
+com.android.tools.r8.org.objectweb.asm.tree.InsnList$InsnListIterator -> com.android.tools.r8.internal.Xe$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
@@ -69896,18 +70426,18 @@
     1:7:int previousIndex():568:574 -> previousIndex
     1:10:void remove():525:534 -> remove
     1:9:void set(java.lang.Object):592:600 -> set
-com.android.tools.r8.org.objectweb.asm.tree.InsnNode -> com.android.tools.r8.internal.Mf:
+com.android.tools.r8.org.objectweb.asm.tree.InsnNode -> com.android.tools.r8.internal.Ye:
     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.rh:
+com.android.tools.r8.org.objectweb.asm.tree.IntInsnNode -> com.android.tools.r8.internal.Dg:
     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.ri:
+com.android.tools.r8.org.objectweb.asm.tree.InvokeDynamicInsnNode -> com.android.tools.r8.internal.Ch:
     java.lang.String name -> g
     java.lang.String desc -> h
     com.android.tools.r8.org.objectweb.asm.Handle bsm -> i
@@ -69916,7 +70446,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.qj:
+com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode -> com.android.tools.r8.internal.yi:
     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
@@ -69925,7 +70455,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.vn:
+com.android.tools.r8.org.objectweb.asm.tree.LabelNode -> com.android.tools.r8.internal.Am:
     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
@@ -69933,13 +70463,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.ko:
+com.android.tools.r8.org.objectweb.asm.tree.LdcInsnNode -> com.android.tools.r8.internal.pn:
     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.Bo:
+com.android.tools.r8.org.objectweb.asm.tree.LineNumberNode -> com.android.tools.r8.internal.Fn:
     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>
@@ -69949,14 +70479,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.ip:
+com.android.tools.r8.org.objectweb.asm.tree.LocalVariableAnnotationNode -> com.android.tools.r8.internal.lo:
     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.jp:
+com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode -> com.android.tools.r8.internal.mo:
     int index -> f
     java.lang.String name -> a
     java.lang.String signature -> c
@@ -69964,7 +70494,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.Fp:
+com.android.tools.r8.org.objectweb.asm.tree.LookupSwitchInsnNode -> com.android.tools.r8.internal.Ho:
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode dflt -> g
     java.util.List labels -> i
     java.util.List keys -> h
@@ -69975,7 +70505,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.Tq:
+com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode -> com.android.tools.r8.internal.Sp:
     java.lang.String owner -> g
     java.lang.String desc -> i
     java.lang.String name -> h
@@ -69984,7 +70514,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.Yq:
+com.android.tools.r8.org.objectweb.asm.tree.MethodNode -> com.android.tools.r8.internal.Xp:
     java.util.List attrs -> p
     java.util.List invisibleTypeAnnotations -> o
     java.lang.String desc -> j
@@ -70068,22 +70598,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.Xq:
+com.android.tools.r8.org.objectweb.asm.tree.MethodNode$1 -> com.android.tools.r8.internal.Wp:
     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.vr:
+com.android.tools.r8.org.objectweb.asm.tree.MultiANewArrayInsnNode -> com.android.tools.r8.internal.sq:
     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.Xu:
+com.android.tools.r8.org.objectweb.asm.tree.ParameterNode -> com.android.tools.r8.internal.Qt:
     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.CE:
+com.android.tools.r8.org.objectweb.asm.tree.TableSwitchInsnNode -> com.android.tools.r8.internal.vD:
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode dflt -> i
     int max -> h
     java.util.List labels -> j
@@ -70095,7 +70625,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.mF:
+com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode -> com.android.tools.r8.internal.fE:
     java.util.List invisibleTypeAnnotations -> f
     java.util.List visibleTypeAnnotations -> e
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode start -> a
@@ -70103,30 +70633,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.wF:
+com.android.tools.r8.org.objectweb.asm.tree.TypeAnnotationNode -> com.android.tools.r8.internal.LE:
     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.BF:
+com.android.tools.r8.org.objectweb.asm.tree.TypeInsnNode -> com.android.tools.r8.internal.QE:
     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.pG:
+com.android.tools.r8.org.objectweb.asm.tree.Util -> com.android.tools.r8.internal.FF:
     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.BG:
+com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode -> com.android.tools.r8.internal.RF:
     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.Wv:
+com.android.tools.r8.org.objectweb.asm.util.Printer -> com.android.tools.r8.internal.Pu:
     java.lang.String[] OPCODES -> a
     1:1:void <clinit>():54:54 -> <clinit>
 com.android.tools.r8.origin.ArchiveEntryOrigin -> com.android.tools.r8.origin.ArchiveEntryOrigin:
@@ -70357,7 +70887,7 @@
     1:3:void lambda$run$0(com.android.tools.r8.relocator.RelocatorCommand,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):49:51 -> a
     1:1:void lambda$run$1(com.android.tools.r8.relocator.RelocatorCommand,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):69:69 -> b
     1:27:void run(com.android.tools.r8.relocator.RelocatorCommand,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):79:105 -> c
-    28:28:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):221:221 -> c
+    28:28:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):210:210 -> c
     28:28:void run(com.android.tools.r8.relocator.RelocatorCommand,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):100 -> c
     29:34:void run(com.android.tools.r8.relocator.RelocatorCommand,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):100:105 -> c
     1:5:void run(com.android.tools.r8.relocator.RelocatorCommand):42:46 -> run
@@ -70482,83 +71012,84 @@
     4:4:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexField):132:132 -> a
     boolean verifyRenamingConsistentWithResolution(com.android.tools.r8.graph.DexMethod) -> b
     1:1:java.lang.String lookupPackageName(java.lang.String):112:112 -> b
-com.android.tools.r8.repackaging.Repackaging -> com.android.tools.r8.internal.Xz:
+com.android.tools.r8.repackaging.Repackaging -> com.android.tools.r8.internal.Jy:
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
     com.android.tools.r8.repackaging.Repackaging$RepackagingConfiguration repackagingConfiguration -> d
     com.android.tools.r8.shaking.ProguardConfiguration proguardConfiguration -> c
-    1:1:void <clinit>():53:53 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.graph.AppView):59:63 -> <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):69:71 -> a
-    4:35:boolean verifyIdentityRepackaging(com.android.tools.r8.graph.AppView):79:110 -> a
-    36:46:boolean verifyIdentityRepackaging(com.android.tools.r8.graph.AppView):104:114 -> a
-    47:47:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):126:126 -> a
-    48:48:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isNone():1050:1050 -> a
-    48:48:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):126 -> a
-    49:52:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):130:133 -> a
-    53:68: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):195:210 -> a
-    53:68:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):134 -> a
-    69:73: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):223:227 -> a
-    69:73:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):135 -> a
-    74:80:java.lang.Iterable com.android.tools.r8.repackaging.Repackaging.computeClassesToRepackage(com.android.tools.r8.graph.ProgramPackage,java.util.concurrent.ExecutorService):272:278 -> a
-    74:80: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):230 -> a
-    74:80:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):135 -> a
-    81:85: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):231:235 -> a
-    81:85:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):135 -> a
-    86:97:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):136:147 -> a
-    98:99:com.android.tools.r8.repackaging.RepackagingLens com.android.tools.r8.repackaging.RepackagingLens$Builder.build(com.android.tools.r8.graph.AppView):70:71 -> a
-    98:99:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):147 -> a
-    100:100:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):148:148 -> a
-    101:101:boolean lambda$run$0(java.util.Map$Entry):136:136 -> a
-    102:121: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):247:266 -> a
-    122:122: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):264:264 -> a
-com.android.tools.r8.repackaging.Repackaging$1 -> com.android.tools.r8.internal.Wz:
+    1:1:void <clinit>():54:54 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.graph.AppView):60:64 -> <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):70:72 -> a
+    4:35:boolean verifyIdentityRepackaging(com.android.tools.r8.graph.AppView):81:112 -> a
+    36:50:boolean verifyIdentityRepackaging(com.android.tools.r8.graph.AppView):106:120 -> a
+    51:51:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):128:128 -> a
+    52:52:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isNone():1189:1189 -> a
+    52:52:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):128 -> a
+    53:56:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):132:135 -> a
+    57:72: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):192:207 -> a
+    57:72:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):136 -> a
+    73:77: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):220:224 -> a
+    73:77:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):137 -> a
+    78:84:java.lang.Iterable com.android.tools.r8.repackaging.Repackaging.computeClassesToRepackage(com.android.tools.r8.graph.ProgramPackage,java.util.concurrent.ExecutorService):269:275 -> a
+    78:84: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):227 -> a
+    78:84:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):137 -> a
+    85:89: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):228:232 -> a
+    85:89:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):137 -> a
+    90:100:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):138:148 -> a
+    101:102:com.android.tools.r8.repackaging.RepackagingLens com.android.tools.r8.repackaging.RepackagingLens$Builder.build(com.android.tools.r8.graph.AppView):70:71 -> a
+    101:102:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):148 -> a
+    103:103:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):149:149 -> a
+    104:104:boolean lambda$run$0(java.util.Map$Entry):138:138 -> a
+    105:113: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):244:252 -> a
+    114:114:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    114:114: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):252 -> a
+    115:126: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):252:263 -> a
+    127:127: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):261:261 -> a
+com.android.tools.r8.repackaging.Repackaging$1 -> com.android.tools.r8.internal.Iy:
     boolean $assertionsDisabled -> g
-    1:1:void <clinit>():80:80 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):80:80 -> <init>
-    1:1:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):88:88 -> a
-    2:2:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):93:93 -> a
-    3:3:void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):98:98 -> a
+    1:1:void <clinit>():82:82 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):82:82 -> <init>
+    1:1:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):90:90 -> a
+    2:2:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):95:95 -> a
+    3:3:void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):100:100 -> a
     com.android.tools.r8.graph.DexType mapClassType(com.android.tools.r8.graph.DexType) -> b
-com.android.tools.r8.repackaging.Repackaging$DefaultRepackagingConfiguration -> com.android.tools.r8.internal.Xz$a:
+com.android.tools.r8.repackaging.Repackaging$DefaultRepackagingConfiguration -> com.android.tools.r8.internal.Jy$a:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     boolean $assertionsDisabled -> a
     com.android.tools.r8.shaking.ProguardConfiguration proguardConfiguration -> c
-    1:1:void <clinit>():292:292 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.ProguardConfiguration):298:300 -> <init>
-    1:3:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):305:307 -> a
-    4:4:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isRepackageClasses():1058:1058 -> a
-    4:4:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):307 -> a
-    5:11:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):310:316 -> a
-    12:36: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):328:352 -> a
-    37:37: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):351:351 -> a
-com.android.tools.r8.repackaging.Repackaging$RepackagingConfiguration -> com.android.tools.r8.internal.Xz$b:
+    1:1:void <clinit>():289:289 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.ProguardConfiguration):295:297 -> <init>
+    1:3:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):302:304 -> a
+    4:4:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isRepackageClasses():1197:1197 -> a
+    4:4:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):304 -> a
+    5:11:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):307:313 -> a
+    12:36: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):325:349 -> a
+    37:37: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):348:348 -> a
+com.android.tools.r8.repackaging.Repackaging$RepackagingConfiguration -> com.android.tools.r8.internal.Jy$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$RepackagingTreeFixer -> com.android.tools.r8.internal.Yz:
-    com.android.tools.r8.repackaging.RepackagingLens$Builder lensBuilder -> i
-    boolean $assertionsDisabled -> g
-    com.android.tools.r8.com.google.common.collect.BiMap mappings -> h
-    1:1:void <clinit>():152:152 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.repackaging.RepackagingLens$Builder):161:165 -> <init>
-    1:1:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):175:175 -> a
+com.android.tools.r8.repackaging.Repackaging$RepackagingTreeFixer -> com.android.tools.r8.internal.Ky:
+    com.android.tools.r8.repackaging.RepackagingLens$Builder lensBuilder -> h
+    com.android.tools.r8.com.google.common.collect.BiMap mappings -> g
+    1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.repackaging.RepackagingLens$Builder):160:162 -> <init>
+    1:1:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):172:172 -> a
     2:2:void com.android.tools.r8.repackaging.RepackagingLens$Builder.recordMove(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):58:58 -> a
-    2:2:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):175 -> a
-    3:3:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):180:180 -> a
+    2:2:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):172 -> a
+    3:3:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):177:177 -> a
     4:4:void com.android.tools.r8.repackaging.RepackagingLens$Builder.recordMove(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):62:62 -> a
-    4:4:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):180 -> a
-    5:5:void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):185:185 -> a
+    4:4:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):177 -> a
+    5:5:void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):182:182 -> a
     6:6:void com.android.tools.r8.repackaging.RepackagingLens$Builder.recordMove(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):66:66 -> a
-    6:6:void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):185 -> a
-    1:1:com.android.tools.r8.graph.DexType mapClassType(com.android.tools.r8.graph.DexType):170:170 -> b
-com.android.tools.r8.repackaging.Repackaging$SuffixRenamingRepackagingConfiguration -> com.android.tools.r8.internal.Xz$c:
+    6:6:void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):182 -> a
+    1:1:com.android.tools.r8.graph.DexType mapClassType(com.android.tools.r8.graph.DexType):167:167 -> b
+com.android.tools.r8.repackaging.Repackaging$SuffixRenamingRepackagingConfiguration -> com.android.tools.r8.internal.Jy$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):365:367 -> <init>
-    1:1:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):373:373 -> 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):382:401 -> 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):400:400 -> a
-com.android.tools.r8.repackaging.RepackagingAnnotationTracer -> com.android.tools.r8.internal.Zz:
+    1:3:void <init>(java.lang.String,com.android.tools.r8.graph.DexItemFactory):362:364 -> <init>
+    1:1:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):370:370 -> 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):379:398 -> 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):397:397 -> a
+com.android.tools.r8.repackaging.RepackagingAnnotationTracer -> com.android.tools.r8.internal.Ly:
     com.android.tools.r8.repackaging.RepackagingUseRegistry registry -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():18:18 -> <clinit>
@@ -70572,7 +71103,7 @@
     8:8:void traceAnnotationElement(com.android.tools.r8.graph.DexAnnotationElement):47:47 -> a
     9:63:void traceDexValue(com.android.tools.r8.graph.DexValue):51:105 -> a
     64:64:void traceDexValue(com.android.tools.r8.graph.DexValue):65:65 -> a
-    65:65:com.android.tools.r8.graph.DexEncodedAnnotation com.android.tools.r8.graph.DexValue$DexValueAnnotation.getValue():1709:1709 -> a
+    65:65:com.android.tools.r8.graph.DexEncodedAnnotation com.android.tools.r8.graph.DexValue$DexValueAnnotation.getValue():1711:1711 -> a
     65:65:void traceDexValue(com.android.tools.r8.graph.DexValue):65 -> a
     66:82:void traceDexValue(com.android.tools.r8.graph.DexValue):65:81 -> a
     83:107:void traceDexValue(com.android.tools.r8.graph.DexValue):77:101 -> a
@@ -70585,7 +71116,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):78:79 -> a
     122:123:void traceDexValue(com.android.tools.r8.graph.DexValue):97 -> a
-com.android.tools.r8.repackaging.RepackagingConstraintGraph -> com.android.tools.r8.internal.bA:
+com.android.tools.r8.repackaging.RepackagingConstraintGraph -> com.android.tools.r8.internal.Ny:
     com.android.tools.r8.graph.ProgramPackage pkg -> c
     com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node libraryBoundaryNode -> f
     java.util.Map nodes -> d
@@ -70601,58 +71132,60 @@
     9:9:void populateConstraints(java.util.concurrent.ExecutorService):98 -> a
     10:10:void populateConstraints(java.util.concurrent.ExecutorService):99:99 -> a
     11:11:void registerReferencesFromClass(com.android.tools.r8.graph.DexProgramClass):103:103 -> a
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getSuperType():658:658 -> a
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getSuperType():640:640 -> a
     12:12:void registerReferencesFromClass(com.android.tools.r8.graph.DexProgramClass):106 -> a
     13:39:void registerReferencesFromClass(com.android.tools.r8.graph.DexProgramClass):106:132 -> a
     40:40:void lambda$registerReferencesFromClass$0(com.android.tools.r8.repackaging.RepackagingUseRegistry,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute):127:127 -> a
     41:44:void registerReferencesFromField(com.android.tools.r8.graph.ProgramField):136:139 -> a
-    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():49:49 -> a
+    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():46:46 -> a
     45:45:void registerReferencesFromField(com.android.tools.r8.graph.ProgramField):139 -> a
     46:49:void registerReferencesFromField(com.android.tools.r8.graph.ProgramField):139:142 -> a
     50:51:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):146:147 -> a
-    52:52:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.getProto():388:388 -> a
+    52:52:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.getProto():397:397 -> a
     52:52:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):150 -> a
-    53:53:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexMethod.getProto():62:62 -> a
-    53:53:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.getProto():388 -> a
-    53:53:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):150 -> a
-    54:54:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):150:150 -> a
-    55:56:void com.android.tools.r8.graph.DexProto.forEachType(java.util.function.Consumer):78:79 -> a
-    55:56:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):150 -> a
-    57:58:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):153:154 -> a
-    59:59:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getSuperType():658:658 -> a
-    59:59:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):154 -> a
-    60:63:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):154:157 -> a
-    64:71:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):156:163 -> a
-    72:72:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.DexEncodedMethod.getParameterAnnotations():898:898 -> a
-    72:72:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):164 -> a
-    73:77:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):164:168 -> a
-    78:86:java.lang.Iterable computeClassesToRepackage():173:181 -> a
+    53:53:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):150:150 -> a
+    54:55:void com.android.tools.r8.graph.DexProto.forEachType(java.util.function.Consumer):78:79 -> a
+    54:55:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):150 -> a
+    56:57:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):153:154 -> a
+    58:58:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getSuperType():640:640 -> a
+    58:58:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):154 -> a
+    59:62:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):154:157 -> a
+    63:70:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):156:163 -> a
+    71:71:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.DexEncodedMethod.getParameterAnnotations():911:911 -> a
+    71:71:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):164 -> a
+    72:76:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):164:168 -> a
+    77:85:java.lang.Iterable computeClassesToRepackage():173:181 -> a
     1:9:boolean initializeGraph():59:67 -> b
     10:10:com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node getNode(com.android.tools.r8.graph.DexDefinition):81:81 -> b
-    11:15:boolean com.android.tools.r8.graph.DexDefinition.isNotProgramDefinition(com.android.tools.r8.graph.AppView):109:113 -> b
-    11:15:com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node getNode(com.android.tools.r8.graph.DexDefinition):81 -> b
-    16:22:com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node getNode(com.android.tools.r8.graph.DexDefinition):82:88 -> b
-com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node -> com.android.tools.r8.internal.aA:
+    11:14:boolean com.android.tools.r8.graph.DexDefinition.isNotProgramDefinition(com.android.tools.r8.graph.AppView):109:112 -> b
+    11:14:com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node getNode(com.android.tools.r8.graph.DexDefinition):81 -> b
+    15:15:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> b
+    15:15:boolean com.android.tools.r8.graph.DexDefinition.isNotProgramDefinition(com.android.tools.r8.graph.AppView):112 -> b
+    15:15:com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node getNode(com.android.tools.r8.graph.DexDefinition):81 -> b
+    16:16:boolean com.android.tools.r8.graph.DexDefinition.isNotProgramDefinition(com.android.tools.r8.graph.AppView):113:113 -> b
+    16:16:com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node getNode(com.android.tools.r8.graph.DexDefinition):81 -> b
+    17:23:com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node getNode(com.android.tools.r8.graph.DexDefinition):82:88 -> b
+com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node -> com.android.tools.r8.internal.My:
     java.util.Set neighbors -> a
     1:3:void <init>():187:189 -> <init>
     1:2:void addNeighbor(com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node):192:193 -> a
     3:3:java.util.Set getNeighbors():197:197 -> a
-com.android.tools.r8.repackaging.RepackagingLens -> com.android.tools.r8.internal.eA:
+com.android.tools.r8.repackaging.RepackagingLens -> com.android.tools.r8.internal.Qy:
     com.android.tools.r8.com.google.common.collect.BiMap originalTypes -> l
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.repackaging.RepackagingLens$1):19:19 -> <init>
     2:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,com.android.tools.r8.com.google.common.collect.BiMap):29:34 -> <init>
     8:15:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,com.android.tools.r8.com.google.common.collect.BiMap):28:35 -> <init>
     1:2:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):40:41 -> a
     3:3:boolean isSimpleRenaming(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):46:46 -> a
-com.android.tools.r8.repackaging.RepackagingLens$1 -> com.android.tools.r8.internal.cA:
-com.android.tools.r8.repackaging.RepackagingLens$Builder -> com.android.tools.r8.internal.dA:
+com.android.tools.r8.repackaging.RepackagingLens$1 -> com.android.tools.r8.internal.Oy:
+com.android.tools.r8.repackaging.RepackagingLens$Builder -> com.android.tools.r8.internal.Py:
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap originalMethodSignatures -> d
     com.android.tools.r8.com.google.common.collect.BiMap originalTypes -> b
     boolean $assertionsDisabled -> a
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap newFieldSignatures -> c
     1:1:void <clinit>():49:49 -> <clinit>
     1:6:void <init>():49:54 -> <init>
-com.android.tools.r8.repackaging.RepackagingUseRegistry -> com.android.tools.r8.internal.fA:
+com.android.tools.r8.repackaging.RepackagingUseRegistry -> com.android.tools.r8.internal.Ry:
     com.android.tools.r8.shaking.AppInfoWithLiveness appInfo -> d
     com.android.tools.r8.graph.InitClassLens initClassLens -> h
     com.android.tools.r8.graph.ProgramDefinition context -> g
@@ -70662,18 +71195,20 @@
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():35:35 -> <clinit>
     1:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.repackaging.RepackagingConstraintGraph,com.android.tools.r8.graph.ProgramDefinition):48:54 -> <init>
-    1:6:boolean isOnlyAccessibleFromSamePackage(com.android.tools.r8.graph.DexClass):58:63 -> a
-    7:7:void com.android.tools.r8.repackaging.RepackagingUseRegistry.registerFieldAccess(com.android.tools.r8.graph.DexField):93:93 -> a
-    7:7:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):205 -> a
-    8:8:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult):109:109 -> a
-    9:26:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult,boolean):115:132 -> a
-    27:33:boolean com.android.tools.r8.repackaging.RepackagingUseRegistry.isOnlyAccessibleFromSamePackage(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,boolean):71:77 -> a
-    27:33:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult,boolean):134 -> a
-    34:43:boolean com.android.tools.r8.repackaging.RepackagingUseRegistry.isOnlyAccessibleFromSamePackage(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,boolean):76:85 -> a
-    34:43:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult,boolean):134 -> a
-    44:44:boolean com.android.tools.r8.repackaging.RepackagingUseRegistry.isOnlyAccessibleFromSamePackage(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,boolean):84:84 -> a
-    44:44:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult,boolean):134 -> a
-    45:45:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult,boolean):135:135 -> a
+    1:1:void com.android.tools.r8.repackaging.RepackagingUseRegistry.registerFieldAccess(com.android.tools.r8.graph.DexField):93:93 -> a
+    1:1:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):205 -> a
+    2:2:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult):109:109 -> a
+    3:20:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult,boolean):115:132 -> a
+    21:27:boolean com.android.tools.r8.repackaging.RepackagingUseRegistry.isOnlyAccessibleFromSamePackage(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,boolean):71:77 -> a
+    21:27:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult,boolean):134 -> a
+    28:37:boolean com.android.tools.r8.repackaging.RepackagingUseRegistry.isOnlyAccessibleFromSamePackage(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,boolean):76:85 -> a
+    28:37:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult,boolean):134 -> a
+    38:38:boolean com.android.tools.r8.repackaging.RepackagingUseRegistry.isOnlyAccessibleFromSamePackage(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,boolean):84:84 -> a
+    38:38:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult,boolean):134 -> a
+    39:39:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult,boolean):135:135 -> a
+    40:40:com.android.tools.r8.graph.ClassAccessFlags com.android.tools.r8.graph.DexClass.getAccessFlags():137:137 -> a
+    40:40:boolean isOnlyAccessibleFromSamePackage(com.android.tools.r8.graph.DexClass):58 -> a
+    41:45:boolean isOnlyAccessibleFromSamePackage(com.android.tools.r8.graph.DexClass):59:63 -> a
     46:56:void registerTypeAccess(com.android.tools.r8.graph.DexType,java.util.function.Consumer):145:155 -> a
     57:59:void registerClassTypeAccess(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):167:169 -> a
     60:60:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):185:185 -> a
@@ -70728,76 +71263,72 @@
     1:1:void registerFieldAccess(com.android.tools.r8.graph.DexField):93:93 -> 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.ProguardMapProducer -> com.android.tools.r8.retrace.ProguardMapProducer:
-    1:9:java.lang.String lambda$fromReader$0(java.io.Reader):20:20 -> a
-    16:16:java.lang.String lambda$fromReader$0(java.io.Reader):27:27 -> a
-    1:1:com.android.tools.r8.retrace.ProguardMapProducer fromReader(java.io.Reader):19:19 -> fromReader
 com.android.tools.r8.retrace.Retrace -> com.android.tools.r8.retrace.Retrace:
     boolean $assertionsDisabled -> a
-    1:12:void <clinit>():50:61 -> <clinit>
-    1:1:void <init>():51:51 -> <init>
-    1:42:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):67:108 -> a
-    1:42:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):304 -> a
-    43:43:java.util.List getStackTraceFromFile(java.lang.String,com.android.tools.r8.DiagnosticsHandler):154:154 -> a
-    43:43:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):108 -> a
-    43:43:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):304 -> a
-    44:45:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):108:109 -> a
-    44:45:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):304 -> a
-    46:47:java.util.List getStackTraceFromFile(java.lang.String,com.android.tools.r8.DiagnosticsHandler):156:157 -> a
-    46:47:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):108 -> a
-    46:47:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):304 -> a
-    48:51:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):112:112 -> a
-    48:51:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):304 -> a
-    54:55:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):115:116 -> a
-    54:55:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):304 -> a
-    56:61:java.util.List getStackTraceFromStandardInput(boolean):340:345 -> a
-    56:61:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):124 -> a
-    56:61:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):304 -> a
-    62:65:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):124:127 -> a
-    62:65:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):304 -> a
-    66:85:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):307:326 -> a
-    86:87:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):120:121 -> a
-    86:87:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):304 -> a
-    88:94:com.android.tools.r8.retrace.ProguardMapProducer getMappingSupplier(java.lang.String,com.android.tools.r8.DiagnosticsHandler):134:140 -> a
-    95:97:com.android.tools.r8.retrace.ProguardMapProducer getMappingSupplier(java.lang.String,com.android.tools.r8.DiagnosticsHandler):136:136 -> a
-    99:99:com.android.tools.r8.retrace.ProguardMapProducer getMappingSupplier(java.lang.String,com.android.tools.r8.DiagnosticsHandler):138:138 -> a
-    100:103:java.lang.String lambda$getMappingSupplier$0(java.nio.file.Path,com.android.tools.r8.DiagnosticsHandler,java.lang.String):142:145 -> a
-    104:106:java.lang.String lambda$getMappingSupplier$0(java.nio.file.Path,com.android.tools.r8.DiagnosticsHandler,java.lang.String):144:146 -> a
-    107:112:java.util.List runInternal(com.android.tools.r8.retrace.StackTraceVisitor,com.android.tools.r8.retrace.Retracer,boolean):209:214 -> a
-    113:113:java.util.List runInternal(com.android.tools.r8.retrace.StackTraceVisitor,com.android.tools.r8.retrace.Retracer,boolean):212:212 -> a
-    114:114:void lambda$runInternal$2(com.android.tools.r8.utils.Box,java.util.Set,boolean,java.util.List,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.util.List):216:216 -> a
-    115:130:void lambda$runInternal$1(com.android.tools.r8.utils.Box,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.util.Set,boolean,java.util.List,com.android.tools.r8.retrace.RetraceStackTraceProxy):218:233 -> a
-    131:147:void lambda$run$5(com.android.tools.r8.retrace.StackTraceElementProxyRetracer,java.util.function.BiConsumer,com.android.tools.r8.retrace.StackTraceElementProxy):252:268 -> a
-    148:153:void lambda$run$3(java.util.Map,com.android.tools.r8.utils.Box,com.android.tools.r8.retrace.RetraceStackTraceProxy):259:264 -> a
-    154:154:void lambda$run$4(java.util.function.BiConsumer,com.android.tools.r8.retrace.StackTraceElementProxy,java.util.Map,com.android.tools.r8.retrace.RetraceStackTraceProxy):270:270 -> a
-    155:160:void lambda$run$6(com.android.tools.r8.DiagnosticsHandler,java.util.List):318:318 -> a
-    164:165:void lambda$run$6(com.android.tools.r8.DiagnosticsHandler,java.util.List):322:323 -> a
-    166:166:void lambda$main$7(java.lang.String[]):335:335 -> a
-    1:1:void main(java.lang.String[]):335:335 -> main
-    2:7:void withMainProgramHandler(com.android.tools.r8.retrace.Retrace$MainAction):356:361 -> main
-    2:7:void main(java.lang.String[]):335 -> main
-    8:8:void withMainProgramHandler(com.android.tools.r8.retrace.Retrace$MainAction):359:359 -> main
-    8:8:void main(java.lang.String[]):335 -> main
-    1:14:void run(com.android.tools.r8.retrace.RetraceCommand):168:181 -> run
-    15:23:void run(com.android.tools.r8.retrace.RetraceCommand):180:188 -> run
-    24:24:java.util.List run(com.android.tools.r8.retrace.Retracer,java.util.List,boolean):201:201 -> run
-    25:25:void run(com.android.tools.r8.retrace.StackTraceVisitor,com.android.tools.r8.retrace.StackTraceElementProxyRetracer,java.util.function.BiConsumer):250:250 -> run
-    26:39:void run(java.lang.String[]):276:289 -> run
-    40:57:void run(java.lang.String[]):281:298 -> run
+    1:12:void <clinit>():51:62 -> <clinit>
+    1:1:void <init>():52:52 -> <init>
+    1:42:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):68:109 -> a
+    1:42:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):305 -> a
+    43:43:java.util.List getStackTraceFromFile(java.lang.String,com.android.tools.r8.DiagnosticsHandler):155:155 -> a
+    43:43:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):109 -> a
+    43:43:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):305 -> a
+    44:45:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):109:110 -> a
+    44:45:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):305 -> a
+    46:47:java.util.List getStackTraceFromFile(java.lang.String,com.android.tools.r8.DiagnosticsHandler):157:158 -> a
+    46:47:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):109 -> a
+    46:47:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):305 -> a
+    48:51:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):113:113 -> a
+    48:51:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):305 -> a
+    54:55:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):116:117 -> a
+    54:55:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):305 -> a
+    56:61:java.util.List getStackTraceFromStandardInput(boolean):341:346 -> a
+    56:61:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):125 -> a
+    56:61:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):305 -> a
+    62:65:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):125:128 -> a
+    62:65:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):305 -> a
+    66:85:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):308:327 -> a
+    86:87:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):121:122 -> a
+    86:87:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):305 -> a
+    88:94:com.android.tools.r8.retrace.RetraceCommand$ProguardMapProducer getMappingSupplier(java.lang.String,com.android.tools.r8.DiagnosticsHandler):135:141 -> a
+    95:97:com.android.tools.r8.retrace.RetraceCommand$ProguardMapProducer getMappingSupplier(java.lang.String,com.android.tools.r8.DiagnosticsHandler):137:137 -> a
+    99:99:com.android.tools.r8.retrace.RetraceCommand$ProguardMapProducer getMappingSupplier(java.lang.String,com.android.tools.r8.DiagnosticsHandler):139:139 -> a
+    100:103:java.lang.String lambda$getMappingSupplier$0(java.nio.file.Path,com.android.tools.r8.DiagnosticsHandler,java.lang.String):143:146 -> a
+    104:106:java.lang.String lambda$getMappingSupplier$0(java.nio.file.Path,com.android.tools.r8.DiagnosticsHandler,java.lang.String):145:147 -> a
+    107:112:java.util.List runInternal(com.android.tools.r8.retrace.StackTraceVisitor,com.android.tools.r8.retrace.Retracer,boolean):210:215 -> a
+    113:113:java.util.List runInternal(com.android.tools.r8.retrace.StackTraceVisitor,com.android.tools.r8.retrace.Retracer,boolean):213:213 -> a
+    114:114:void lambda$runInternal$2(com.android.tools.r8.utils.Box,java.util.Set,boolean,java.util.List,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.util.List):217:217 -> a
+    115:130:void lambda$runInternal$1(com.android.tools.r8.utils.Box,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.util.Set,boolean,java.util.List,com.android.tools.r8.retrace.RetraceStackTraceProxy):219:234 -> a
+    131:147:void lambda$run$5(com.android.tools.r8.retrace.StackTraceElementProxyRetracer,java.util.function.BiConsumer,com.android.tools.r8.retrace.StackTraceElementProxy):253:269 -> a
+    148:153:void lambda$run$3(java.util.Map,com.android.tools.r8.utils.Box,com.android.tools.r8.retrace.RetraceStackTraceProxy):260:265 -> a
+    154:154:void lambda$run$4(java.util.function.BiConsumer,com.android.tools.r8.retrace.StackTraceElementProxy,java.util.Map,com.android.tools.r8.retrace.RetraceStackTraceProxy):271:271 -> a
+    155:160:void lambda$run$6(com.android.tools.r8.DiagnosticsHandler,java.util.List):319:319 -> a
+    164:165:void lambda$run$6(com.android.tools.r8.DiagnosticsHandler,java.util.List):323:324 -> a
+    166:166:void lambda$main$7(java.lang.String[]):336:336 -> a
+    1:1:void main(java.lang.String[]):336:336 -> main
+    2:7:void withMainProgramHandler(com.android.tools.r8.retrace.Retrace$MainAction):357:362 -> main
+    2:7:void main(java.lang.String[]):336 -> main
+    8:8:void withMainProgramHandler(com.android.tools.r8.retrace.Retrace$MainAction):360:360 -> main
+    8:8:void main(java.lang.String[]):336 -> main
+    1:14:void run(com.android.tools.r8.retrace.RetraceCommand):169:182 -> run
+    15:23:void run(com.android.tools.r8.retrace.RetraceCommand):181:189 -> run
+    24:24:java.util.List run(com.android.tools.r8.retrace.Retracer,java.util.List,boolean):202:202 -> run
+    25:25:void run(com.android.tools.r8.retrace.StackTraceVisitor,com.android.tools.r8.retrace.StackTraceElementProxyRetracer,java.util.function.BiConsumer):251:251 -> run
+    26:39:void run(java.lang.String[]):277:290 -> run
+    40:57:void run(java.lang.String[]):282:299 -> run
 com.android.tools.r8.retrace.Retrace$1 -> com.android.tools.r8.retrace.Retrace$a:
-    1:1:void <init>():294:294 -> <init>
+    1:1:void <init>():295:295 -> <init>
 com.android.tools.r8.retrace.Retrace$MainAction -> com.android.tools.r8.retrace.Retrace$b:
 com.android.tools.r8.retrace.Retrace$RetraceDiagnosticsHandler -> com.android.tools.r8.retrace.Retrace$c:
     com.android.tools.r8.DiagnosticsHandler diagnosticsHandler -> b
     boolean $assertionsDisabled -> a
     boolean printInfo -> c
-    1:1:void <clinit>():365:365 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.DiagnosticsHandler,boolean):370:372 -> <init>
-    1:1:void error(com.android.tools.r8.Diagnostic):378:378 -> error
-    1:2:void info(com.android.tools.r8.Diagnostic):388:389 -> info
-    1:1:void warning(com.android.tools.r8.Diagnostic):383:383 -> warning
+    1:1:void <clinit>():366:366 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.DiagnosticsHandler,boolean):371:373 -> <init>
+    1:1:void error(com.android.tools.r8.Diagnostic):379:379 -> error
+    1:2:void info(com.android.tools.r8.Diagnostic):389:390 -> info
+    1:1:void warning(com.android.tools.r8.Diagnostic):384:384 -> warning
 com.android.tools.r8.retrace.RetraceCommand -> com.android.tools.r8.retrace.RetraceCommand:
-    com.android.tools.r8.retrace.ProguardMapProducer proguardMapProducer -> e
+    com.android.tools.r8.retrace.RetraceCommand$ProguardMapProducer proguardMapProducer -> e
     com.android.tools.r8.DiagnosticsHandler diagnosticsHandler -> d
     java.util.List stackTrace -> f
     java.util.function.Consumer retracedStackTraceConsumer -> g
@@ -70805,8 +71336,8 @@
     java.lang.String regularExpression -> c
     boolean isVerbose -> b
     1:1:void <clinit>():12:12 -> <clinit>
-    1:1:void <init>(boolean,java.lang.String,com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.retrace.ProguardMapProducer,java.util.List,java.util.function.Consumer,com.android.tools.r8.retrace.RetraceCommand$1):13:13 -> <init>
-    2:13:void <init>(boolean,java.lang.String,com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.retrace.ProguardMapProducer,java.util.List,java.util.function.Consumer):28:39 -> <init>
+    1:1:void <init>(boolean,java.lang.String,com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.retrace.RetraceCommand$ProguardMapProducer,java.util.List,java.util.function.Consumer,com.android.tools.r8.retrace.RetraceCommand$1):13:13 -> <init>
+    2:13:void <init>(boolean,java.lang.String,com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.retrace.RetraceCommand$ProguardMapProducer,java.util.List,java.util.function.Consumer):28:39 -> <init>
     1:1:com.android.tools.r8.retrace.RetraceCommand$Builder builder(com.android.tools.r8.DiagnosticsHandler):56:56 -> builder
     2:2:com.android.tools.r8.retrace.RetraceCommand$Builder builder():61:61 -> builder
     1:1:boolean printMemory():47:47 -> printMemory
@@ -70815,15 +71346,15 @@
     1:1:void <init>():61:61 -> <init>
 com.android.tools.r8.retrace.RetraceCommand$Builder -> com.android.tools.r8.retrace.RetraceCommand$b:
     com.android.tools.r8.DiagnosticsHandler diagnosticsHandler -> b
-    com.android.tools.r8.retrace.ProguardMapProducer proguardMapProducer -> c
     java.util.List stackTrace -> e
+    com.android.tools.r8.retrace.RetraceCommand$ProguardMapProducer proguardMapProducer -> c
     java.util.function.Consumer retracedStackTraceConsumer -> f
     boolean isVerbose -> a
     java.lang.String regularExpression -> d
     1:1:void <init>(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.retrace.RetraceCommand$1):64:64 -> <init>
     2:3:void <init>(com.android.tools.r8.DiagnosticsHandler):73:74 -> <init>
     1:1:com.android.tools.r8.retrace.RetraceCommand$Builder setVerbose(boolean):79:79 -> a
-    2:2:com.android.tools.r8.retrace.RetraceCommand$Builder setProguardMapProducer(com.android.tools.r8.retrace.ProguardMapProducer):89:89 -> a
+    2:2:com.android.tools.r8.retrace.RetraceCommand$Builder setProguardMapProducer(com.android.tools.r8.retrace.RetraceCommand$ProguardMapProducer):89:89 -> a
     3:3:com.android.tools.r8.retrace.RetraceCommand$Builder setRegularExpression(java.lang.String):100:100 -> a
     4:4:com.android.tools.r8.retrace.RetraceCommand$Builder setStackTrace(java.util.List):111:111 -> a
     5:5:com.android.tools.r8.retrace.RetraceCommand$Builder setRetracedStackTraceConsumer(java.util.function.Consumer):121:121 -> a
@@ -70832,6 +71363,7 @@
     20:20:com.android.tools.r8.retrace.RetraceCommand build():133:133 -> a
     21:21:com.android.tools.r8.retrace.RetraceCommand build():130:130 -> a
     22:22:com.android.tools.r8.retrace.RetraceCommand build():127:127 -> a
+com.android.tools.r8.retrace.RetraceCommand$ProguardMapProducer -> com.android.tools.r8.retrace.RetraceCommand$c:
 com.android.tools.r8.retrace.RetraceFailedException -> com.android.tools.r8.retrace.RetraceFailedException:
     1:1:void <init>():17:17 -> <init>
     2:2:void <init>(java.lang.String,java.lang.Throwable):21:21 -> <init>
@@ -70844,20 +71376,21 @@
     1:1:com.android.tools.r8.origin.Origin getOrigin():30:30 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():35:35 -> getPosition
 com.android.tools.r8.retrace.Retracer -> com.android.tools.r8.retrace.Retracer:
-    1:1:com.android.tools.r8.retrace.Retracer createDefault(com.android.tools.r8.retrace.ProguardMapProducer,com.android.tools.r8.DiagnosticsHandler):31:31 -> createDefault
+    1:1:com.android.tools.r8.retrace.Retracer createDefault(com.android.tools.r8.retrace.RetraceCommand$ProguardMapProducer,com.android.tools.r8.DiagnosticsHandler):32:32 -> createDefault
 com.android.tools.r8.retrace.StackTraceElementProxy -> com.android.tools.r8.retrace.StackTraceElementProxy:
     1:1:void <init>():11:11 -> <init>
 com.android.tools.r8.retrace.StackTraceElementProxyRetracer -> com.android.tools.r8.retrace.StackTraceElementProxyRetracer:
     1:1:com.android.tools.r8.retrace.StackTraceElementProxyRetracer createDefault(com.android.tools.r8.retrace.Retracer):18:18 -> createDefault
-com.android.tools.r8.retrace.internal.Definition -> com.android.tools.r8.internal.n9:
-com.android.tools.r8.retrace.internal.DirectClassNameMapperProguardMapProducer -> com.android.tools.r8.internal.oa:
+com.android.tools.r8.retrace.internal.Definition -> com.android.tools.r8.internal.L8:
+com.android.tools.r8.retrace.internal.DirectClassNameMapperProguardMapProducer -> com.android.tools.r8.internal.L9:
     com.android.tools.r8.naming.ClassNameMapper getClassNameMapper() -> a
-com.android.tools.r8.retrace.internal.FieldDefinition -> com.android.tools.r8.internal.cc:
+    1:1:java.lang.String get():16:16 -> get
+com.android.tools.r8.retrace.internal.FieldDefinition -> com.android.tools.r8.internal.vb:
     1:1:void <init>():13:13 -> <init>
     com.android.tools.r8.retrace.internal.FieldDefinition substituteHolder(com.android.tools.r8.references.ClassReference) -> a
     1:1:com.android.tools.r8.retrace.internal.FieldDefinition create(com.android.tools.r8.references.ClassReference,java.lang.String):16:16 -> a
-com.android.tools.r8.retrace.internal.FieldDefinition$1 -> com.android.tools.r8.internal.Zb:
-com.android.tools.r8.retrace.internal.FieldDefinition$BaseFieldDefinition -> com.android.tools.r8.internal.ac:
+com.android.tools.r8.retrace.internal.FieldDefinition$1 -> com.android.tools.r8.internal.sb:
+com.android.tools.r8.retrace.internal.FieldDefinition$BaseFieldDefinition -> com.android.tools.r8.internal.tb:
     com.android.tools.r8.references.ClassReference classReference -> a
     java.lang.String name -> b
     1:1:void <init>(com.android.tools.r8.references.ClassReference,java.lang.String,com.android.tools.r8.retrace.internal.FieldDefinition$1):25:25 -> <init>
@@ -70867,7 +71400,7 @@
     1:1:com.android.tools.r8.references.ClassReference getHolderClass():41:41 -> getHolderClass
     1:1:java.lang.String getName():36:36 -> getName
     1:1:int hashCode():63:63 -> hashCode
-com.android.tools.r8.retrace.internal.FieldDefinition$FullFieldDefinition -> com.android.tools.r8.internal.bc:
+com.android.tools.r8.retrace.internal.FieldDefinition$FullFieldDefinition -> com.android.tools.r8.internal.ub:
     com.android.tools.r8.references.FieldReference fieldReference -> a
     1:1:void <init>(com.android.tools.r8.references.FieldReference,com.android.tools.r8.retrace.internal.FieldDefinition$1):67:67 -> <init>
     2:3:void <init>(com.android.tools.r8.references.FieldReference):71:72 -> <init>
@@ -70881,14 +71414,14 @@
     1:1:com.android.tools.r8.references.ClassReference getHolderClass():82:82 -> getHolderClass
     1:1:java.lang.String getName():77:77 -> getName
     1:1:int hashCode():105:105 -> hashCode
-com.android.tools.r8.retrace.internal.MethodDefinition -> com.android.tools.r8.internal.Sq:
+com.android.tools.r8.retrace.internal.MethodDefinition -> com.android.tools.r8.internal.Rp:
     1:1:void <init>():13:13 -> <init>
     com.android.tools.r8.retrace.internal.MethodDefinition$FullMethodDefinition asFullMethodDefinition() -> a
     com.android.tools.r8.retrace.internal.MethodDefinition substituteHolder(com.android.tools.r8.references.ClassReference) -> a
     1:1:com.android.tools.r8.retrace.internal.MethodDefinition create(com.android.tools.r8.references.ClassReference,java.lang.String):16:16 -> a
     2:2:com.android.tools.r8.retrace.internal.MethodDefinition create(com.android.tools.r8.references.MethodReference):20:20 -> a
-com.android.tools.r8.retrace.internal.MethodDefinition$1 -> com.android.tools.r8.internal.Pq:
-com.android.tools.r8.retrace.internal.MethodDefinition$BaseMethodDefinition -> com.android.tools.r8.internal.Qq:
+com.android.tools.r8.retrace.internal.MethodDefinition$1 -> com.android.tools.r8.internal.Op:
+com.android.tools.r8.retrace.internal.MethodDefinition$BaseMethodDefinition -> com.android.tools.r8.internal.Pp:
     com.android.tools.r8.references.ClassReference classReference -> a
     java.lang.String name -> b
     1:1:void <init>(com.android.tools.r8.references.ClassReference,java.lang.String,com.android.tools.r8.retrace.internal.MethodDefinition$1):33:33 -> <init>
@@ -70898,7 +71431,7 @@
     1:1:com.android.tools.r8.references.ClassReference getHolderClass():45:45 -> getHolderClass
     1:1:java.lang.String getName():50:50 -> getName
     1:1:int hashCode():72:72 -> hashCode
-com.android.tools.r8.retrace.internal.MethodDefinition$FullMethodDefinition -> com.android.tools.r8.internal.Rq:
+com.android.tools.r8.retrace.internal.MethodDefinition$FullMethodDefinition -> com.android.tools.r8.internal.Qp:
     com.android.tools.r8.references.MethodReference methodReference -> a
     1:1:void <init>(com.android.tools.r8.references.MethodReference,com.android.tools.r8.retrace.internal.MethodDefinition$1):76:76 -> <init>
     2:3:void <init>(com.android.tools.r8.references.MethodReference):80:81 -> <init>
@@ -70911,7 +71444,7 @@
     1:1:com.android.tools.r8.references.ClassReference getHolderClass():86:86 -> getHolderClass
     1:1:java.lang.String getName():91:91 -> getName
     1:1:int hashCode():132:132 -> hashCode
-com.android.tools.r8.retrace.internal.PlainStackTraceVisitor -> com.android.tools.r8.internal.iv:
+com.android.tools.r8.retrace.internal.PlainStackTraceVisitor -> com.android.tools.r8.internal.bu:
     java.util.List stackTrace -> a
     com.android.tools.r8.DiagnosticsHandler diagnosticsHandler -> b
     1:3:void <init>(java.util.List,com.android.tools.r8.DiagnosticsHandler):25:27 -> <init>
@@ -70932,9 +71465,9 @@
     102:102:void forEach(java.util.function.Consumer):33:33 -> forEach
     103:104:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy com.android.tools.r8.retrace.internal.PlainStackTraceVisitor.parseLine(int,java.lang.String):198:199 -> forEach
     103:104:void forEach(java.util.function.Consumer):33 -> forEach
-com.android.tools.r8.retrace.internal.RetraceAbortException -> com.android.tools.r8.internal.qA:
+com.android.tools.r8.retrace.internal.RetraceAbortException -> com.android.tools.r8.internal.cz:
     1:1:void <init>():7:7 -> <init>
-com.android.tools.r8.retrace.internal.RetraceClassResultImpl -> com.android.tools.r8.internal.tA:
+com.android.tools.r8.retrace.internal.RetraceClassResultImpl -> com.android.tools.r8.internal.fz:
     com.android.tools.r8.naming.ClassNamingForNameMapper mapper -> c
     com.android.tools.r8.references.ClassReference obfuscatedReference -> b
     com.android.tools.r8.retrace.Retracer retracer -> d
@@ -70998,7 +71531,7 @@
     6:6:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.lookupMethod(java.lang.String,java.util.List,com.android.tools.r8.references.TypeReference):66:66 -> lookupMethod
     6:6:com.android.tools.r8.retrace.RetraceMethodResult lookupMethod(java.lang.String,java.util.List,com.android.tools.r8.references.TypeReference):29 -> lookupMethod
     1:1:java.util.stream.Stream stream():173:173 -> stream
-com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ElementImpl -> com.android.tools.r8.internal.rA:
+com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ElementImpl -> com.android.tools.r8.internal.dz:
     com.android.tools.r8.retrace.internal.RetracedClassImpl classReference -> b
     com.android.tools.r8.retrace.internal.RetraceClassResultImpl classResult -> a
     com.android.tools.r8.naming.ClassNamingForNameMapper mapper -> c
@@ -71038,9 +71571,9 @@
     8:17:com.android.tools.r8.retrace.RetraceSourceFileResult retraceSourceFile(java.lang.String):210 -> retraceSourceFile
     18:18:com.android.tools.r8.retrace.internal.RetraceSourceFileResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ElementImpl.retraceSourceFile(java.lang.String):250:250 -> retraceSourceFile
     18:18:com.android.tools.r8.retrace.RetraceSourceFileResult retraceSourceFile(java.lang.String):210 -> retraceSourceFile
-com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor -> com.android.tools.r8.internal.sA:
+com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor -> com.android.tools.r8.internal.ez:
     java.lang.Object create(com.android.tools.r8.retrace.internal.RetraceClassResultImpl,java.util.List,java.lang.Object,com.android.tools.r8.retrace.Retracer) -> a
-com.android.tools.r8.retrace.internal.RetraceFieldResultImpl -> com.android.tools.r8.internal.wA:
+com.android.tools.r8.retrace.internal.RetraceFieldResultImpl -> com.android.tools.r8.internal.iz:
     java.util.List memberNamings -> b
     com.android.tools.r8.retrace.Retracer retracer -> d
     com.android.tools.r8.retrace.internal.FieldDefinition fieldDefinition -> c
@@ -71066,8 +71599,8 @@
     1:1:com.android.tools.r8.retrace.RetraceFieldResult forEach(java.util.function.Consumer):19 -> forEach
     1:8:boolean isAmbiguous():89:96 -> isAmbiguous
     1:2:java.util.stream.Stream stream():41:42 -> stream
-com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$1 -> com.android.tools.r8.internal.uA:
-com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$ElementImpl -> com.android.tools.r8.internal.vA:
+com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$1 -> com.android.tools.r8.internal.gz:
+com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$ElementImpl -> com.android.tools.r8.internal.hz:
     com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ElementImpl classElement -> c
     com.android.tools.r8.retrace.internal.RetracedFieldImpl fieldReference -> a
     com.android.tools.r8.retrace.internal.RetraceFieldResultImpl retraceFieldResult -> b
@@ -71081,7 +71614,7 @@
     1:1:com.android.tools.r8.retrace.RetraceFieldResult getRetraceFieldResult():99 -> getRetraceFieldResult
     1:1:boolean isUnknown():116:116 -> isUnknown
     1:3:com.android.tools.r8.retrace.RetraceSourceFileResult retraceSourceFile(java.lang.String):136:136 -> retraceSourceFile
-com.android.tools.r8.retrace.internal.RetraceFrameResultImpl -> com.android.tools.r8.internal.yA:
+com.android.tools.r8.retrace.internal.RetraceFrameResultImpl -> com.android.tools.r8.internal.kz:
     com.android.tools.r8.retrace.internal.MethodDefinition methodDefinition -> a
     java.util.List mappedRanges -> c
     com.android.tools.r8.retrace.Retracer retracer -> d
@@ -71108,7 +71641,7 @@
     1:1:com.android.tools.r8.retrace.RetraceFrameResult forEach(java.util.function.Consumer):27 -> forEach
     1:12:boolean isAmbiguous():50:61 -> isAmbiguous
     1:2:java.util.stream.Stream stream():70:71 -> stream
-com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl -> com.android.tools.r8.internal.xA:
+com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl -> com.android.tools.r8.internal.jz:
     com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ElementImpl classElement -> c
     com.android.tools.r8.retrace.internal.RetraceFrameResultImpl retraceFrameResult -> b
     java.util.List mappedRanges -> d
@@ -71134,7 +71667,7 @@
     16:16:java.util.List com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl.getOuterFrames():201:201 -> visitFrames
     16:16:void visitFrames(java.util.function.BiConsumer):179 -> visitFrames
     17:18:void visitFrames(java.util.function.BiConsumer):179:180 -> visitFrames
-com.android.tools.r8.retrace.internal.RetraceMethodResultImpl -> com.android.tools.r8.internal.BA:
+com.android.tools.r8.retrace.internal.RetraceMethodResultImpl -> com.android.tools.r8.internal.nz:
     com.android.tools.r8.retrace.internal.MethodDefinition methodDefinition -> b
     com.android.tools.r8.retrace.internal.RetraceClassResultImpl classResult -> c
     java.util.List mappedRanges -> d
@@ -71159,8 +71692,8 @@
     1:12:boolean isAmbiguous():41:52 -> isAmbiguous
     1:1:com.android.tools.r8.retrace.RetraceFrameResult narrowByPosition(int):19:19 -> narrowByPosition
     1:2:java.util.stream.Stream stream():99:100 -> stream
-com.android.tools.r8.retrace.internal.RetraceMethodResultImpl$1 -> com.android.tools.r8.internal.zA:
-com.android.tools.r8.retrace.internal.RetraceMethodResultImpl$ElementImpl -> com.android.tools.r8.internal.AA:
+com.android.tools.r8.retrace.internal.RetraceMethodResultImpl$1 -> com.android.tools.r8.internal.lz:
+com.android.tools.r8.retrace.internal.RetraceMethodResultImpl$ElementImpl -> com.android.tools.r8.internal.mz:
     com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ElementImpl classElement -> c
     com.android.tools.r8.retrace.internal.RetraceMethodResultImpl retraceMethodResult -> b
     com.android.tools.r8.retrace.internal.RetracedMethodImpl methodReference -> a
@@ -71172,7 +71705,7 @@
     1:1:com.android.tools.r8.retrace.RetraceMethodResult getRetraceMethodResult():131 -> getRetraceMethodResult
     1:1:boolean isUnknown():148:148 -> isUnknown
     1:3:com.android.tools.r8.retrace.RetraceSourceFileResult retraceSourceFile(java.lang.String):169:169 -> retraceSourceFile
-com.android.tools.r8.retrace.internal.RetraceRegularExpression -> com.android.tools.r8.internal.QA:
+com.android.tools.r8.retrace.internal.RetraceRegularExpression -> com.android.tools.r8.internal.Cz:
     java.util.List stackTrace -> b
     com.android.tools.r8.retrace.internal.RetraceRegularExpression$LineNumberGroup lineNumberGroup -> h
     com.android.tools.r8.retrace.internal.RetraceRegularExpression$MethodNameGroup methodNameGroup -> k
@@ -71212,83 +71745,83 @@
     39:59:int registerGroups(java.lang.String,java.lang.StringBuilder,java.util.List,int):88:108 -> a
     60:60:int registerGroups(java.lang.String,java.lang.StringBuilder,java.util.List,int):107:107 -> a
     1:25:void forEach(java.util.function.Consumer):45:69 -> forEach
-com.android.tools.r8.retrace.internal.RetraceRegularExpression$1 -> com.android.tools.r8.internal.CA:
-com.android.tools.r8.retrace.internal.RetraceRegularExpression$BinaryNameGroup -> com.android.tools.r8.internal.DA:
+com.android.tools.r8.retrace.internal.RetraceRegularExpression$1 -> com.android.tools.r8.internal.oz:
+com.android.tools.r8.retrace.internal.RetraceRegularExpression$BinaryNameGroup -> com.android.tools.r8.internal.pz:
     1:1:void <init>():222:222 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.RetraceRegularExpression$1):222:222 -> <init>
     java.lang.String subExpression() -> a
     1:1:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType getClassNameType():231:231 -> b
-com.android.tools.r8.retrace.internal.RetraceRegularExpression$ClassNameGroup -> com.android.tools.r8.internal.FA:
+com.android.tools.r8.retrace.internal.RetraceRegularExpression$ClassNameGroup -> com.android.tools.r8.internal.rz:
     1:1:void <init>():179:179 -> <init>
     1:1:com.android.tools.r8.retrace.internal.RetraceRegularExpression$RegularExpressionGroupHandler createHandler(java.lang.String):185:185 -> a
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType getClassNameType() -> b
-com.android.tools.r8.retrace.internal.RetraceRegularExpression$ClassNameGroup$1 -> com.android.tools.r8.internal.EA:
+com.android.tools.r8.retrace.internal.RetraceRegularExpression$ClassNameGroup$1 -> com.android.tools.r8.internal.qz:
     com.android.tools.r8.retrace.internal.RetraceRegularExpression$ClassNameGroup this$0 -> b
     java.lang.String val$captureGroup -> a
     1:1:void <init>(com.android.tools.r8.retrace.internal.RetraceRegularExpression$ClassNameGroup,java.lang.String):185:185 -> <init>
     boolean isClassHandler() -> a
     1:10:boolean matchHandler(com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):188:197 -> a
-com.android.tools.r8.retrace.internal.RetraceRegularExpression$FieldNameGroup -> com.android.tools.r8.internal.GA:
+com.android.tools.r8.retrace.internal.RetraceRegularExpression$FieldNameGroup -> com.android.tools.r8.internal.sz:
     1:1:void <init>():255:255 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.RetraceRegularExpression$1):255:255 -> <init>
     java.lang.String subExpression() -> a
     1:1:com.android.tools.r8.retrace.internal.RetraceRegularExpression$RegularExpressionGroupHandler createHandler(java.lang.String):264:264 -> a
     2:6:boolean lambda$createHandler$0(java.lang.String,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):265:269 -> a
-com.android.tools.r8.retrace.internal.RetraceRegularExpression$FieldOrReturnTypeGroup -> com.android.tools.r8.internal.HA:
+com.android.tools.r8.retrace.internal.RetraceRegularExpression$FieldOrReturnTypeGroup -> com.android.tools.r8.internal.tz:
     1:1:void <init>():339:339 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.RetraceRegularExpression$1):339:339 -> <init>
     java.lang.String subExpression() -> a
     1:1:com.android.tools.r8.retrace.internal.RetraceRegularExpression$RegularExpressionGroupHandler createHandler(java.lang.String):348:348 -> a
     2:6:boolean lambda$createHandler$0(java.lang.String,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):349:353 -> a
-com.android.tools.r8.retrace.internal.RetraceRegularExpression$LineNumberGroup -> com.android.tools.r8.internal.IA:
+com.android.tools.r8.retrace.internal.RetraceRegularExpression$LineNumberGroup -> com.android.tools.r8.internal.uz:
     1:1:void <init>():298:298 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.RetraceRegularExpression$1):298:298 -> <init>
     java.lang.String subExpression() -> a
     1:1:com.android.tools.r8.retrace.internal.RetraceRegularExpression$RegularExpressionGroupHandler createHandler(java.lang.String):307:307 -> a
     2:6:boolean lambda$createHandler$0(java.lang.String,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):308:312 -> a
-com.android.tools.r8.retrace.internal.RetraceRegularExpression$MethodArgumentsGroup -> com.android.tools.r8.internal.JA:
+com.android.tools.r8.retrace.internal.RetraceRegularExpression$MethodArgumentsGroup -> com.android.tools.r8.internal.vz:
     1:1:void <init>():359:359 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.RetraceRegularExpression$1):359:359 -> <init>
     java.lang.String subExpression() -> a
     1:1:com.android.tools.r8.retrace.internal.RetraceRegularExpression$RegularExpressionGroupHandler createHandler(java.lang.String):368:368 -> a
     2:6:boolean lambda$createHandler$0(java.lang.String,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):369:373 -> a
-com.android.tools.r8.retrace.internal.RetraceRegularExpression$MethodNameGroup -> com.android.tools.r8.internal.KA:
+com.android.tools.r8.retrace.internal.RetraceRegularExpression$MethodNameGroup -> com.android.tools.r8.internal.wz:
     1:1:void <init>():235:235 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.RetraceRegularExpression$1):235:235 -> <init>
     java.lang.String subExpression() -> a
     1:1:com.android.tools.r8.retrace.internal.RetraceRegularExpression$RegularExpressionGroupHandler createHandler(java.lang.String):244:244 -> a
     2:6:boolean lambda$createHandler$0(java.lang.String,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):245:249 -> a
-com.android.tools.r8.retrace.internal.RetraceRegularExpression$RegularExpressionGroup -> com.android.tools.r8.internal.LA:
+com.android.tools.r8.retrace.internal.RetraceRegularExpression$RegularExpressionGroup -> com.android.tools.r8.internal.xz:
     1:1:void <init>():158:158 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.RetraceRegularExpression$1):158:158 -> <init>
     com.android.tools.r8.retrace.internal.RetraceRegularExpression$RegularExpressionGroupHandler createHandler(java.lang.String) -> a
     java.lang.String subExpression() -> a
-com.android.tools.r8.retrace.internal.RetraceRegularExpression$RegularExpressionGroupHandler -> com.android.tools.r8.internal.MA:
+com.android.tools.r8.retrace.internal.RetraceRegularExpression$RegularExpressionGroupHandler -> com.android.tools.r8.internal.yz:
     boolean isClassHandler() -> a
     boolean matchHandler(com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher) -> a
-com.android.tools.r8.retrace.internal.RetraceRegularExpression$SourceFileGroup -> com.android.tools.r8.internal.NA:
+com.android.tools.r8.retrace.internal.RetraceRegularExpression$SourceFileGroup -> com.android.tools.r8.internal.zz:
     1:1:void <init>():275:275 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.RetraceRegularExpression$1):275:275 -> <init>
     1:2:java.lang.String subExpression():281:282 -> a
     3:3:com.android.tools.r8.retrace.internal.RetraceRegularExpression$RegularExpressionGroupHandler createHandler(java.lang.String):287:287 -> a
     4:8:boolean lambda$createHandler$0(java.lang.String,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):288:292 -> a
-com.android.tools.r8.retrace.internal.RetraceRegularExpression$SourceFileLineNumberGroup -> com.android.tools.r8.internal.OA:
+com.android.tools.r8.retrace.internal.RetraceRegularExpression$SourceFileLineNumberGroup -> com.android.tools.r8.internal.Az:
     1:1:void <init>():318:318 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.RetraceRegularExpression$1):318:318 -> <init>
     java.lang.String subExpression() -> a
     1:1:com.android.tools.r8.retrace.internal.RetraceRegularExpression$RegularExpressionGroupHandler createHandler(java.lang.String):327:327 -> a
-com.android.tools.r8.retrace.internal.RetraceRegularExpression$TypeNameGroup -> com.android.tools.r8.internal.PA:
+com.android.tools.r8.retrace.internal.RetraceRegularExpression$TypeNameGroup -> com.android.tools.r8.internal.Bz:
     1:1:void <init>():209:209 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.RetraceRegularExpression$1):209:209 -> <init>
     java.lang.String subExpression() -> a
     1:1:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType getClassNameType():218:218 -> b
-com.android.tools.r8.retrace.internal.RetraceSourceFileResultImpl -> com.android.tools.r8.internal.RA:
+com.android.tools.r8.retrace.internal.RetraceSourceFileResultImpl -> com.android.tools.r8.internal.Dz:
     java.lang.String filename -> a
     boolean synthesized -> b
     1:3:void <init>(java.lang.String,boolean):14:16 -> <init>
     1:1:java.lang.String getFilename():26:26 -> getFilename
     1:1:boolean isSynthesized():21:21 -> isSynthesized
-com.android.tools.r8.retrace.internal.RetraceTypeResultImpl -> com.android.tools.r8.internal.TA:
+com.android.tools.r8.retrace.internal.RetraceTypeResultImpl -> com.android.tools.r8.internal.Fz:
     com.android.tools.r8.retrace.Retracer retracer -> b
     com.android.tools.r8.references.TypeReference obfuscatedType -> a
     1:3:void <init>(com.android.tools.r8.references.TypeReference,com.android.tools.r8.retrace.Retracer):18:20 -> <init>
@@ -71299,12 +71832,12 @@
     1:1:com.android.tools.r8.retrace.RetraceTypeResult forEach(java.util.function.Consumer):13 -> forEach
     1:13:java.util.stream.Stream stream():30:42 -> stream
     14:14:java.util.stream.Stream stream():31:31 -> stream
-com.android.tools.r8.retrace.internal.RetraceTypeResultImpl$ElementImpl -> com.android.tools.r8.internal.SA:
+com.android.tools.r8.retrace.internal.RetraceTypeResultImpl$ElementImpl -> com.android.tools.r8.internal.Ez:
     com.android.tools.r8.retrace.internal.RetracedTypeImpl retracedType -> a
     1:2:void <init>(com.android.tools.r8.retrace.internal.RetracedTypeImpl):60:61 -> <init>
     1:1:com.android.tools.r8.retrace.internal.RetracedTypeImpl com.android.tools.r8.retrace.internal.RetraceTypeResultImpl$ElementImpl.getType():66:66 -> getType
     1:1:com.android.tools.r8.retrace.RetracedType getType():56 -> getType
-com.android.tools.r8.retrace.internal.RetraceUtils -> com.android.tools.r8.internal.UA:
+com.android.tools.r8.retrace.internal.RetraceUtils -> com.android.tools.r8.internal.Gz:
     java.util.Set KEEP_SOURCEFILE_NAMES -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():31:33 -> <clinit>
@@ -71327,7 +71860,7 @@
     61:61:int firstCharFromIndex(java.lang.String,int,char):151:151 -> a
     62:62:boolean lambda$firstCharFromIndex$1(char,java.lang.Character):151:151 -> a
     63:68:int firstFromIndex(java.lang.String,int,java.util.function.Predicate):155:160 -> a
-com.android.tools.r8.retrace.internal.RetracedClassImpl -> com.android.tools.r8.internal.VA:
+com.android.tools.r8.retrace.internal.RetracedClassImpl -> com.android.tools.r8.internal.Hz:
     com.android.tools.r8.references.ClassReference classReference -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():10:10 -> <clinit>
@@ -71339,12 +71872,12 @@
     1:1:com.android.tools.r8.retrace.internal.RetracedTypeImpl getRetracedType():35:35 -> getRetracedType
     1:1:java.lang.String getTypeName():25:25 -> getTypeName
     1:1:int hashCode():56:56 -> hashCode
-com.android.tools.r8.retrace.internal.RetracedFieldImpl -> com.android.tools.r8.internal.ZA:
+com.android.tools.r8.retrace.internal.RetracedFieldImpl -> com.android.tools.r8.internal.Lz:
     1:1:void <init>(com.android.tools.r8.retrace.internal.RetracedFieldImpl$1):12:12 -> <init>
     2:2:void <init>():14:14 -> <init>
     1:1:boolean isKnown():23:23 -> isKnown
-com.android.tools.r8.retrace.internal.RetracedFieldImpl$1 -> com.android.tools.r8.internal.WA:
-com.android.tools.r8.retrace.internal.RetracedFieldImpl$KnownRetracedFieldImpl -> com.android.tools.r8.internal.XA:
+com.android.tools.r8.retrace.internal.RetracedFieldImpl$1 -> com.android.tools.r8.internal.Iz:
+com.android.tools.r8.retrace.internal.RetracedFieldImpl$KnownRetracedFieldImpl -> com.android.tools.r8.internal.Jz:
     com.android.tools.r8.references.FieldReference fieldReference -> a
     1:1:void <init>(com.android.tools.r8.references.FieldReference,com.android.tools.r8.retrace.internal.RetracedFieldImpl$1):31:31 -> <init>
     2:3:void <init>(com.android.tools.r8.references.FieldReference):36:37 -> <init>
@@ -71355,7 +71888,7 @@
     1:1:com.android.tools.r8.retrace.internal.RetracedClassImpl com.android.tools.r8.retrace.internal.RetracedFieldImpl$KnownRetracedFieldImpl.getHolderClass():52:52 -> getHolderClass
     1:1:com.android.tools.r8.retrace.RetracedClass getHolderClass():31 -> getHolderClass
     1:1:int hashCode():84:84 -> hashCode
-com.android.tools.r8.retrace.internal.RetracedFieldImpl$UnknownRetracedField -> com.android.tools.r8.internal.YA:
+com.android.tools.r8.retrace.internal.RetracedFieldImpl$UnknownRetracedField -> com.android.tools.r8.internal.Kz:
     com.android.tools.r8.retrace.internal.FieldDefinition fieldDefinition -> a
     1:1:void <init>(com.android.tools.r8.retrace.internal.FieldDefinition,com.android.tools.r8.retrace.internal.RetracedFieldImpl$1):88:88 -> <init>
     2:3:void <init>(com.android.tools.r8.retrace.internal.FieldDefinition):92:93 -> <init>
@@ -71364,7 +71897,7 @@
     1:1:com.android.tools.r8.retrace.internal.RetracedClassImpl com.android.tools.r8.retrace.internal.RetracedFieldImpl$UnknownRetracedField.getHolderClass():98:98 -> getHolderClass
     1:1:com.android.tools.r8.retrace.RetracedClass getHolderClass():88 -> getHolderClass
     1:1:int hashCode():120:120 -> hashCode
-com.android.tools.r8.retrace.internal.RetracedMethodImpl -> com.android.tools.r8.internal.dB:
+com.android.tools.r8.retrace.internal.RetracedMethodImpl -> com.android.tools.r8.internal.Pz:
     1:1:void <init>(com.android.tools.r8.retrace.internal.RetracedMethodImpl$1):16:16 -> <init>
     2:2:void <init>():20:20 -> <init>
     1:6:int compareTo(com.android.tools.r8.retrace.RetracedMethod):39:44 -> a
@@ -71383,8 +71916,8 @@
     43:43:com.android.tools.r8.retrace.internal.RetracedMethodImpl create(com.android.tools.r8.references.MethodReference,int):194:194 -> a
     1:1:int com.android.tools.r8.retrace.internal.RetracedMethodImpl$KnownRetracedMethodImpl.compareTo(java.lang.Object):58:58 -> compareTo
     1:1:boolean isKnown():29:29 -> isKnown
-com.android.tools.r8.retrace.internal.RetracedMethodImpl$1 -> com.android.tools.r8.internal.aB:
-com.android.tools.r8.retrace.internal.RetracedMethodImpl$KnownRetracedMethodImpl -> com.android.tools.r8.internal.bB:
+com.android.tools.r8.retrace.internal.RetracedMethodImpl$1 -> com.android.tools.r8.internal.Mz:
+com.android.tools.r8.retrace.internal.RetracedMethodImpl$KnownRetracedMethodImpl -> com.android.tools.r8.internal.Nz:
     com.android.tools.r8.references.MethodReference methodReference -> b
     boolean $assertionsDisabled -> a
     int position -> c
@@ -71403,7 +71936,7 @@
     1:1:boolean hasPosition():97:97 -> hasPosition
     1:1:int hashCode():135:135 -> hashCode
     1:1:boolean isVoid():77:77 -> isVoid
-com.android.tools.r8.retrace.internal.RetracedMethodImpl$UnknownRetracedMethodImpl -> com.android.tools.r8.internal.cB:
+com.android.tools.r8.retrace.internal.RetracedMethodImpl$UnknownRetracedMethodImpl -> com.android.tools.r8.internal.Oz:
     com.android.tools.r8.retrace.internal.MethodDefinition methodDefinition -> a
     int position -> b
     1:1:void <init>(com.android.tools.r8.retrace.internal.MethodDefinition,int,com.android.tools.r8.retrace.internal.RetracedMethodImpl$1):139:139 -> <init>
@@ -71414,7 +71947,7 @@
     1:1:boolean com.android.tools.r8.retrace.internal.RetracedMethodImpl$UnknownRetracedMethodImpl.hasPosition():161:161 -> getOriginalPositionOrDefault
     1:1:int getOriginalPositionOrDefault(int):166 -> getOriginalPositionOrDefault
     1:1:boolean hasPosition():161:161 -> hasPosition
-com.android.tools.r8.retrace.internal.RetracedTypeImpl -> com.android.tools.r8.internal.eB:
+com.android.tools.r8.retrace.internal.RetracedTypeImpl -> com.android.tools.r8.internal.Qz:
     boolean $assertionsDisabled -> a
     com.android.tools.r8.references.TypeReference typeReference -> b
     1:1:void <clinit>():12:12 -> <clinit>
@@ -71430,12 +71963,12 @@
     1:1:int hashCode():62:62 -> hashCode
     1:1:boolean isVoid():30:30 -> isVoid
     1:1:com.android.tools.r8.references.TypeReference toArray(int):35:35 -> toArray
-com.android.tools.r8.retrace.internal.RetracerImpl -> com.android.tools.r8.internal.fB:
+com.android.tools.r8.retrace.internal.RetracerImpl -> com.android.tools.r8.internal.Rz:
     com.android.tools.r8.naming.ClassNameMapper classNameMapper -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():18:18 -> <clinit>
     1:3:void <init>(com.android.tools.r8.naming.ClassNameMapper):22:24 -> <init>
-    1:10:com.android.tools.r8.retrace.internal.RetracerImpl create(com.android.tools.r8.retrace.ProguardMapProducer,com.android.tools.r8.DiagnosticsHandler):29:38 -> a
+    1:10:com.android.tools.r8.retrace.internal.RetracerImpl create(com.android.tools.r8.retrace.RetraceCommand$ProguardMapProducer,com.android.tools.r8.DiagnosticsHandler):29:38 -> a
     11:13:com.android.tools.r8.retrace.internal.RetraceClassResultImpl retraceClass(com.android.tools.r8.references.ClassReference):62:62 -> a
     1:3:com.android.tools.r8.retrace.internal.RetraceClassResultImpl com.android.tools.r8.retrace.internal.RetracerImpl.retraceClass(com.android.tools.r8.references.ClassReference):62:62 -> retraceClass
     1:3:com.android.tools.r8.retrace.RetraceClassResult retraceClass(com.android.tools.r8.references.ClassReference):18 -> retraceClass
@@ -71447,7 +71980,7 @@
     1:2:com.android.tools.r8.retrace.RetraceMethodResult retraceMethod(com.android.tools.r8.references.MethodReference):18 -> retraceMethod
     1:1:com.android.tools.r8.retrace.internal.RetraceTypeResultImpl com.android.tools.r8.retrace.internal.RetracerImpl.retraceType(com.android.tools.r8.references.TypeReference):68:68 -> retraceType
     1:1:com.android.tools.r8.retrace.RetraceTypeResult retraceType(com.android.tools.r8.references.TypeReference):18 -> retraceType
-com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl -> com.android.tools.r8.internal.IC:
+com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl -> com.android.tools.r8.internal.tB:
     com.android.tools.r8.retrace.Retracer retracer -> a
     1:2:void <init>(com.android.tools.r8.retrace.Retracer):35:36 -> <init>
     void lambda$retraceFieldOrReturnType$10(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder) -> a
@@ -71482,14 +72015,14 @@
     3:4:java.util.stream.Stream retraceField(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceClassResult):131:132 -> b
     5:5:void lambda$retraceFieldOrReturnType$11(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder):169:169 -> b
     6:16:java.util.stream.Stream retracedMethodArguments(com.android.tools.r8.retrace.StackTraceElementProxy):187:197 -> b
-    17:18:java.lang.Object com.android.tools.r8.utils.ListUtils.fold(java.util.Collection,java.lang.Object,java.util.function.BiFunction):136:137 -> b
+    17:18:java.lang.Object com.android.tools.r8.utils.ListUtils.fold(java.util.Collection,java.lang.Object,java.util.function.BiFunction):98:99 -> b
     17:18:java.util.stream.Stream retracedMethodArguments(com.android.tools.r8.retrace.StackTraceElementProxy):198 -> b
     19:39:java.util.stream.Stream retracedMethodArguments(com.android.tools.r8.retrace.StackTraceElementProxy):198:218 -> b
     void lambda$retracedMethodArguments$14(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder) -> c
     1:2:java.util.stream.Stream retraceMethod(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceClassResult):84:85 -> c
     1:10:java.util.stream.Stream retrace(com.android.tools.r8.retrace.StackTraceElementProxy):41:50 -> retrace
-com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$1 -> com.android.tools.r8.internal.FC:
-com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl -> com.android.tools.r8.internal.HC:
+com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$1 -> com.android.tools.r8.internal.qB:
+com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl -> com.android.tools.r8.internal.sB:
     java.lang.String sourceFile -> h
     boolean isAmbiguous -> j
     boolean isTopFrame -> k
@@ -71541,7 +72074,7 @@
     1:1:boolean hasSourceFile():293:293 -> hasSourceFile
     1:1:boolean isAmbiguous():268:268 -> isAmbiguous
     1:1:boolean isTopFrame():273:273 -> isTopFrame
-com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder -> com.android.tools.r8.internal.GC:
+com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder -> com.android.tools.r8.internal.rB:
     java.lang.String sourceFile -> g
     java.util.List methodArguments -> f
     boolean isAmbiguous -> i
@@ -71575,7 +72108,7 @@
     9:13:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl access$100(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder):398 -> a
     1:1:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder.setTopFrame(boolean):456:456 -> b
     1:1:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder access$900(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder,boolean):398 -> b
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy -> com.android.tools.r8.internal.OC:
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy -> com.android.tools.r8.internal.zB:
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex fieldName -> h
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex fieldOrReturnType -> i
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex methodArguments -> j
@@ -71586,53 +72119,53 @@
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex methodName -> e
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex sourceFile -> f
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex lineNumber -> g
-    1:1:void <clinit>():22:22 -> <clinit>
-    1:1:void <init>(java.lang.String,java.util.List,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassStringIndex,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$1):22:22 -> <init>
-    2:11:void <init>(java.lang.String,java.util.List,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassStringIndex,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex):43:52 -> <init>
-    1:1:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder builder(java.lang.String):56:56 -> a
-    2:10:java.lang.String toRetracedItem(com.android.tools.r8.retrace.RetraceStackTraceProxy,boolean):138:146 -> a
-    11:11:java.lang.String lineNumberAsString():150:150 -> a
-    12:13:java.lang.String getEntryInLine(com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex):154:155 -> a
-    1:1:boolean com.android.tools.r8.retrace.internal.StackTraceElementStringProxy.hasClassName():61:61 -> getClassReference
-    1:1:com.android.tools.r8.references.ClassReference getClassReference():96 -> getClassReference
-    2:2:com.android.tools.r8.references.ClassReference getClassReference():96:96 -> getClassReference
-    1:1:boolean com.android.tools.r8.retrace.internal.StackTraceElementStringProxy.hasFieldName():81:81 -> getFieldName
-    1:1:java.lang.String getFieldName():123 -> getFieldName
-    2:2:java.lang.String getFieldName():123:123 -> getFieldName
-    1:1:boolean com.android.tools.r8.retrace.internal.StackTraceElementStringProxy.hasFieldOrReturnType():86:86 -> getFieldOrReturnType
-    1:1:java.lang.String getFieldOrReturnType():128 -> getFieldOrReturnType
-    2:2:java.lang.String getFieldOrReturnType():128:128 -> getFieldOrReturnType
-    1:1:boolean com.android.tools.r8.retrace.internal.StackTraceElementStringProxy.hasFileName():71:71 -> getFileName
-    1:1:java.lang.String getFileName():106 -> getFileName
-    2:2:java.lang.String getFileName():106:106 -> getFileName
-    1:1:boolean com.android.tools.r8.retrace.internal.StackTraceElementStringProxy.hasLineNumber():76:76 -> getLineNumber
-    1:1:int getLineNumber():111 -> getLineNumber
-    2:2:int getLineNumber():115:115 -> getLineNumber
-    1:1:boolean com.android.tools.r8.retrace.internal.StackTraceElementStringProxy.hasMethodArguments():91:91 -> getMethodArguments
-    1:1:java.lang.String getMethodArguments():133 -> getMethodArguments
-    2:2:java.lang.String getMethodArguments():133:133 -> getMethodArguments
-    1:1:boolean com.android.tools.r8.retrace.internal.StackTraceElementStringProxy.hasMethodName():66:66 -> getMethodName
-    1:1:java.lang.String getMethodName():101 -> getMethodName
-    2:2:java.lang.String getMethodName():101:101 -> getMethodName
-    1:1:boolean hasClassName():61:61 -> hasClassName
-    1:1:boolean hasFieldName():81:81 -> hasFieldName
-    1:1:boolean hasFieldOrReturnType():86:86 -> hasFieldOrReturnType
-    1:1:boolean hasFileName():71:71 -> hasFileName
-    1:1:boolean hasLineNumber():76:76 -> hasLineNumber
-    1:1:boolean hasMethodArguments():91:91 -> hasMethodArguments
-    1:1:boolean hasMethodName():66:66 -> hasMethodName
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$1 -> com.android.tools.r8.internal.JC:
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType -> com.android.tools.r8.internal.KC:
+    1:1:void <clinit>():23:23 -> <clinit>
+    1:1:void <init>(java.lang.String,java.util.List,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassStringIndex,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$1):23:23 -> <init>
+    2:11:void <init>(java.lang.String,java.util.List,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassStringIndex,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex):44:53 -> <init>
+    1:1:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder builder(java.lang.String):57:57 -> a
+    2:10:java.lang.String toRetracedItem(com.android.tools.r8.retrace.RetraceStackTraceProxy,boolean):139:147 -> a
+    11:11:java.lang.String lineNumberAsString():151:151 -> a
+    12:13:java.lang.String getEntryInLine(com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex):155:156 -> a
+    1:1:boolean com.android.tools.r8.retrace.internal.StackTraceElementStringProxy.hasClassName():62:62 -> getClassReference
+    1:1:com.android.tools.r8.references.ClassReference getClassReference():97 -> getClassReference
+    2:2:com.android.tools.r8.references.ClassReference getClassReference():97:97 -> getClassReference
+    1:1:boolean com.android.tools.r8.retrace.internal.StackTraceElementStringProxy.hasFieldName():82:82 -> getFieldName
+    1:1:java.lang.String getFieldName():124 -> getFieldName
+    2:2:java.lang.String getFieldName():124:124 -> getFieldName
+    1:1:boolean com.android.tools.r8.retrace.internal.StackTraceElementStringProxy.hasFieldOrReturnType():87:87 -> getFieldOrReturnType
+    1:1:java.lang.String getFieldOrReturnType():129 -> getFieldOrReturnType
+    2:2:java.lang.String getFieldOrReturnType():129:129 -> getFieldOrReturnType
+    1:1:boolean com.android.tools.r8.retrace.internal.StackTraceElementStringProxy.hasFileName():72:72 -> getFileName
+    1:1:java.lang.String getFileName():107 -> getFileName
+    2:2:java.lang.String getFileName():107:107 -> getFileName
+    1:1:boolean com.android.tools.r8.retrace.internal.StackTraceElementStringProxy.hasLineNumber():77:77 -> getLineNumber
+    1:1:int getLineNumber():112 -> getLineNumber
+    2:2:int getLineNumber():116:116 -> getLineNumber
+    1:1:boolean com.android.tools.r8.retrace.internal.StackTraceElementStringProxy.hasMethodArguments():92:92 -> getMethodArguments
+    1:1:java.lang.String getMethodArguments():134 -> getMethodArguments
+    2:2:java.lang.String getMethodArguments():134:134 -> getMethodArguments
+    1:1:boolean com.android.tools.r8.retrace.internal.StackTraceElementStringProxy.hasMethodName():67:67 -> getMethodName
+    1:1:java.lang.String getMethodName():102 -> getMethodName
+    2:2:java.lang.String getMethodName():102:102 -> getMethodName
+    1:1:boolean hasClassName():62:62 -> hasClassName
+    1:1:boolean hasFieldName():82:82 -> hasFieldName
+    1:1:boolean hasFieldOrReturnType():87:87 -> hasFieldOrReturnType
+    1:1:boolean hasFileName():72:72 -> hasFileName
+    1:1:boolean hasLineNumber():77:77 -> hasLineNumber
+    1:1:boolean hasMethodArguments():92:92 -> hasMethodArguments
+    1:1:boolean hasMethodName():67:67 -> hasMethodName
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$1 -> com.android.tools.r8.internal.uB:
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType -> com.android.tools.r8.internal.vB:
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType BINARY -> a
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType TYPENAME -> b
-    1:2:void <clinit>():159:160 -> <clinit>
-    1:1:void <init>(java.lang.String,int):158:158 -> <init>
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassStringIndex -> com.android.tools.r8.internal.LC:
+    1:2:void <clinit>():160:161 -> <clinit>
+    1:1:void <init>(java.lang.String,int):159:159 -> <init>
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassStringIndex -> com.android.tools.r8.internal.wB:
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType classNameType -> e
-    1:1:void <init>(int,int,com.android.tools.r8.utils.TriFunction,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$1):353:353 -> <init>
-    2:3:void <init>(int,int,com.android.tools.r8.utils.TriFunction,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType):367:368 -> <init>
-    1:4:com.android.tools.r8.references.ClassReference getReference(java.lang.String):372:375 -> a
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder -> com.android.tools.r8.internal.MC:
+    1:1:void <init>(int,int,com.android.tools.r8.utils.TriFunction,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$1):354:354 -> <init>
+    2:3:void <init>(int,int,com.android.tools.r8.utils.TriFunction,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType):368:369 -> <init>
+    1:4:com.android.tools.r8.references.ClassReference getReference(java.lang.String):373:376 -> a
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder -> com.android.tools.r8.internal.xB:
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex fieldName -> h
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex fieldOrReturnType -> i
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex methodArguments -> j
@@ -71644,49 +72177,47 @@
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex methodName -> e
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex sourceFile -> f
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex lineNumber -> g
-    1:1:void <clinit>():163:163 -> <clinit>
-    1:1:void <init>(java.lang.String,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$1):163:163 -> <init>
-    2:2:void <init>(java.lang.String):176:176 -> <init>
-    3:14:void <init>(java.lang.String):166:177 -> <init>
-    1:5:java.lang.String lambda$registerClassName$0(com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType,com.android.tools.r8.retrace.RetraceStackTraceProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):188:192 -> a
-    6:22:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder registerFieldName(int,int):240:256 -> a
-    23:32:java.lang.String lambda$registerFieldName$4(com.android.tools.r8.retrace.RetraceStackTraceProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):245:254 -> a
-    33:33:java.lang.String lambda$registerFieldName$4(com.android.tools.r8.retrace.RetraceStackTraceProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):250:250 -> a
-    34:34:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy build():296:296 -> a
-    35:38:void com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder.ensureLineIndexIncreases(int):309:312 -> a
-    35:38:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder registerClassName(int,int,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType):182 -> a
-    39:51:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder registerClassName(int,int,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType):183:195 -> a
-    52:52:void com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder.ensureLineIndexIncreases(int):310:310 -> a
-    52:52:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder registerClassName(int,int,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType):182 -> a
-    1:13:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder registerFieldOrReturnType(int,int):262:274 -> b
-    14:19:java.lang.String lambda$registerFieldOrReturnType$5(com.android.tools.r8.retrace.RetraceStackTraceProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):267:272 -> b
-    1:9:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder registerLineNumber(int,int):227:235 -> c
-    10:12:java.lang.String lambda$registerLineNumber$3(com.android.tools.r8.retrace.RetraceStackTraceProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):232:234 -> c
-    1:12:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder registerMethodArguments(int,int):280:291 -> d
-    13:17:java.lang.String lambda$registerMethodArguments$6(com.android.tools.r8.retrace.RetraceStackTraceProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):285:289 -> d
-    18:18:java.lang.String lambda$registerMethodArguments$6(com.android.tools.r8.retrace.RetraceStackTraceProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):288:288 -> d
-    19:19:java.lang.String com.android.tools.r8.utils.StringUtils.join(java.lang.String,java.lang.Iterable,java.util.function.Function):132:132 -> d
-    19:19:java.lang.String lambda$registerMethodArguments$6(com.android.tools.r8.retrace.RetraceStackTraceProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):288 -> d
-    1:12:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder registerMethodName(int,int):200:211 -> e
-    13:17:java.lang.String lambda$registerMethodName$1(com.android.tools.r8.retrace.RetraceStackTraceProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):205:209 -> e
-    18:18:java.lang.String lambda$registerMethodName$1(com.android.tools.r8.retrace.RetraceStackTraceProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):208:208 -> e
+    1:1:void <clinit>():164:164 -> <clinit>
+    1:1:void <init>(java.lang.String,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$1):164:164 -> <init>
+    2:2:void <init>(java.lang.String):177:177 -> <init>
+    3:14:void <init>(java.lang.String):167:178 -> <init>
+    1:5:java.lang.String lambda$registerClassName$0(com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType,com.android.tools.r8.retrace.RetraceStackTraceProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):189:193 -> a
+    6:22:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder registerFieldName(int,int):241:257 -> a
+    23:32:java.lang.String lambda$registerFieldName$4(com.android.tools.r8.retrace.RetraceStackTraceProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):246:255 -> a
+    33:33:java.lang.String lambda$registerFieldName$4(com.android.tools.r8.retrace.RetraceStackTraceProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):251:251 -> a
+    34:34:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy build():297:297 -> a
+    35:38:void com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder.ensureLineIndexIncreases(int):310:313 -> a
+    35:38:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder registerClassName(int,int,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType):183 -> a
+    39:51:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder registerClassName(int,int,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType):184:196 -> a
+    52:52:void com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder.ensureLineIndexIncreases(int):311:311 -> a
+    52:52:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder registerClassName(int,int,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType):183 -> a
+    1:13:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder registerFieldOrReturnType(int,int):263:275 -> b
+    14:19:java.lang.String lambda$registerFieldOrReturnType$5(com.android.tools.r8.retrace.RetraceStackTraceProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):268:273 -> b
+    1:9:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder registerLineNumber(int,int):228:236 -> c
+    10:12:java.lang.String lambda$registerLineNumber$3(com.android.tools.r8.retrace.RetraceStackTraceProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):233:235 -> c
+    1:12:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder registerMethodArguments(int,int):281:292 -> d
+    13:17:java.lang.String lambda$registerMethodArguments$6(com.android.tools.r8.retrace.RetraceStackTraceProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):286:290 -> d
+    18:18:java.lang.String lambda$registerMethodArguments$6(com.android.tools.r8.retrace.RetraceStackTraceProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):289:289 -> d
+    1:12:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder registerMethodName(int,int):201:212 -> e
+    13:17:java.lang.String lambda$registerMethodName$1(com.android.tools.r8.retrace.RetraceStackTraceProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):206:210 -> e
+    18:18:java.lang.String lambda$registerMethodName$1(com.android.tools.r8.retrace.RetraceStackTraceProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):209:209 -> e
     19:42:java.lang.String com.android.tools.r8.retrace.internal.RetraceUtils.methodDescriptionFromRetraceMethod(com.android.tools.r8.retrace.RetracedMethod,boolean,boolean):37:60 -> e
-    19:42:java.lang.String lambda$registerMethodName$1(com.android.tools.r8.retrace.RetraceStackTraceProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):208 -> e
+    19:42:java.lang.String lambda$registerMethodName$1(com.android.tools.r8.retrace.RetraceStackTraceProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):209 -> e
     43:43:java.lang.String com.android.tools.r8.retrace.internal.RetraceUtils.methodDescriptionFromRetraceMethod(com.android.tools.r8.retrace.RetracedMethod,boolean,boolean) -> e
-    43:43:java.lang.String lambda$registerMethodName$1(com.android.tools.r8.retrace.RetraceStackTraceProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):208 -> e
-    1:7:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder registerSourceFile(int,int):216:222 -> f
-    8:8:java.lang.String lambda$registerSourceFile$2(com.android.tools.r8.retrace.RetraceStackTraceProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):221:221 -> f
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex -> com.android.tools.r8.internal.NC:
+    43:43:java.lang.String lambda$registerMethodName$1(com.android.tools.r8.retrace.RetraceStackTraceProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):209 -> e
+    1:7:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder registerSourceFile(int,int):217:223 -> f
+    8:8:java.lang.String lambda$registerSourceFile$2(com.android.tools.r8.retrace.RetraceStackTraceProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):222:222 -> f
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex -> com.android.tools.r8.internal.yB:
     com.android.tools.r8.utils.TriFunction retracedString -> d
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassStringIndex NO_INDEX -> a
     int startIndex -> b
     int endIndex -> c
-    1:1:void <clinit>():318:318 -> <clinit>
-    1:1:void <init>(int,int,com.android.tools.r8.utils.TriFunction,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$1):316:316 -> <init>
-    2:5:void <init>(int,int,com.android.tools.r8.utils.TriFunction):342:345 -> <init>
-    1:1:com.android.tools.r8.utils.TriFunction access$100(com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex):316:316 -> a
-    2:2:boolean hasIndex():349:349 -> a
-    1:1:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassStringIndex noIndex():322:322 -> b
+    1:1:void <clinit>():319:319 -> <clinit>
+    1:1:void <init>(int,int,com.android.tools.r8.utils.TriFunction,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$1):317:317 -> <init>
+    2:5:void <init>(int,int,com.android.tools.r8.utils.TriFunction):343:346 -> <init>
+    1:1:com.android.tools.r8.utils.TriFunction access$100(com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex):317:317 -> a
+    2:2:boolean hasIndex():350:350 -> a
+    1:1:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassStringIndex noIndex():323:323 -> b
 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
@@ -71696,18 +72227,21 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):32:32 -> <init>
     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:7:void processClass(com.android.tools.r8.graph.DexType):43:47 -> a
-    8:13:java.util.List com.android.tools.r8.utils.IterableUtils.ensureUnmodifiableList(java.lang.Iterable):34:39 -> a
-    8:13:void processClass(com.android.tools.r8.graph.DexType):47 -> a
-    14:30:com.android.tools.r8.graph.DexEncodedMethod[] processMethods(java.util.List):63:79 -> a
-    14:30:void processClass(com.android.tools.r8.graph.DexType):47 -> a
-    31:46:com.android.tools.r8.graph.DexEncodedMethod[] processMethods(java.util.List):69:84 -> a
-    31:46:void processClass(com.android.tools.r8.graph.DexType):47 -> a
-    47:51:void processClass(com.android.tools.r8.graph.DexType):49:53 -> a
-    52:52:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):212:212 -> a
-    52:52:void processClass(com.android.tools.r8.graph.DexType):53 -> a
-    53:53:void processClass(com.android.tools.r8.graph.DexType):54:54 -> a
-com.android.tools.r8.shaking.AnnotationFixer -> com.android.tools.r8.internal.c1:
+    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):273:273 -> 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):34:39 -> a
+    9:14:void processClass(com.android.tools.r8.graph.DexType):47 -> a
+    15:31:com.android.tools.r8.graph.DexEncodedMethod[] processMethods(java.util.List):63:79 -> a
+    15:31:void processClass(com.android.tools.r8.graph.DexType):47 -> a
+    32:47:com.android.tools.r8.graph.DexEncodedMethod[] processMethods(java.util.List):69:84 -> a
+    32:47:void processClass(com.android.tools.r8.graph.DexType):47 -> a
+    48:52:void processClass(com.android.tools.r8.graph.DexType):49:53 -> a
+    53:53:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):212:212 -> a
+    53:53:void processClass(com.android.tools.r8.graph.DexType):53 -> a
+    54:54:void processClass(com.android.tools.r8.graph.DexType) -> a
+com.android.tools.r8.shaking.AnnotationFixer -> com.android.tools.r8.internal.b1:
     boolean $assertionsDisabled -> a
     com.android.tools.r8.graph.GraphLens lens -> b
     1:1:void <clinit>():26:26 -> <clinit>
@@ -71726,7 +72260,7 @@
     23:23:boolean com.android.tools.r8.graph.DexValue.isDexValueAnnotation():0:0 -> a
     23:23:com.android.tools.r8.graph.DexValue rewriteComplexValue(com.android.tools.r8.graph.DexValue):80 -> a
     24:24:com.android.tools.r8.graph.DexValue rewriteComplexValue(com.android.tools.r8.graph.DexValue):81:81 -> a
-    25:25:com.android.tools.r8.graph.DexEncodedAnnotation com.android.tools.r8.graph.DexValue$DexValueAnnotation.getValue():1709:1709 -> a
+    25:25:com.android.tools.r8.graph.DexEncodedAnnotation com.android.tools.r8.graph.DexValue$DexValueAnnotation.getValue():1711:1711 -> a
     25:25:com.android.tools.r8.graph.DexValue rewriteComplexValue(com.android.tools.r8.graph.DexValue):82 -> a
     26:30:com.android.tools.r8.graph.DexValue rewriteComplexValue(com.android.tools.r8.graph.DexValue):82:86 -> a
     31:31:boolean com.android.tools.r8.graph.DexValue.isDexItemBasedValueString():0:0 -> a
@@ -71798,29 +72332,29 @@
     6:6:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):225 -> a
     7:7:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):227:227 -> a
     8:17:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):76:85 -> a
-    18:18:boolean com.android.tools.r8.graph.DexAnnotation.isMemberClassesAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):158:158 -> a
+    18:18:boolean com.android.tools.r8.graph.DexAnnotation.isMemberClassesAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):156:156 -> a
     18:18:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):86 -> a
     19:19:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):86:86 -> a
-    20:20:boolean com.android.tools.r8.graph.DexAnnotation.isEnclosingMethodAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):149:149 -> a
+    20:20:boolean com.android.tools.r8.graph.DexAnnotation.isEnclosingMethodAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):147:147 -> a
     20:20:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):87 -> a
     21:21:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):87:87 -> a
-    22:22:boolean com.android.tools.r8.graph.DexAnnotation.isEnclosingClassAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):144:144 -> a
+    22:22:boolean com.android.tools.r8.graph.DexAnnotation.isEnclosingClassAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):142:142 -> a
     22:22:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):88 -> a
     23:25:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):88:90 -> a
     26:28:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):89:91 -> a
-    29:29:boolean com.android.tools.r8.graph.DexAnnotation.isThrowingAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):294:294 -> a
+    29:29:boolean com.android.tools.r8.graph.DexAnnotation.isThrowingAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):292:292 -> a
     29:29:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):91 -> a
-    30:30:boolean com.android.tools.r8.graph.DexAnnotation.isSourceDebugExtension(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):310:310 -> a
+    30:30:boolean com.android.tools.r8.graph.DexAnnotation.isSourceDebugExtension(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):308:308 -> a
     30:30:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):94 -> a
     31:33:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):95:97 -> a
     34:38:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):96:100 -> a
-    39:39:boolean com.android.tools.r8.graph.DexAnnotation.isParameterNameAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):315:315 -> a
+    39:39:boolean com.android.tools.r8.graph.DexAnnotation.isParameterNameAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):313:313 -> a
     39:39:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):101 -> a
-    40:40:boolean com.android.tools.r8.graph.DexAnnotation.isAnnotationDefaultAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):305:305 -> a
+    40:40:boolean com.android.tools.r8.graph.DexAnnotation.isAnnotationDefaultAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):303:303 -> a
     40:40:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):104 -> a
     41:41:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):128:128 -> a
     42:42:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):112:112 -> a
-    43:43:boolean com.android.tools.r8.graph.DexAnnotation.isSynthesizedClassMapAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):476:476 -> a
+    43:43:boolean com.android.tools.r8.graph.DexAnnotation.isSynthesizedClassMapAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):455:455 -> a
     43:43:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):118 -> a
     44:44:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):122:122 -> a
     45:62:boolean filterParameterAnnotations(com.android.tools.r8.graph.DexAnnotation):146:163 -> a
@@ -71875,8 +72409,11 @@
     29:29:com.android.tools.r8.shaking.AnnotationRemover ensureValid():169 -> b
     30:30:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):164:164 -> b
     30:30:com.android.tools.r8.shaking.AnnotationRemover ensureValid():169 -> b
-    31:41:com.android.tools.r8.graph.DexAnnotationElement rewriteAnnotationElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):251:261 -> b
-    42:44:boolean enclosingMethodPinned(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):267:269 -> b
+    31:31:com.android.tools.r8.graph.DexAnnotationElement rewriteAnnotationElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):251:251 -> b
+    32:32:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> b
+    32:32:com.android.tools.r8.graph.DexAnnotationElement rewriteAnnotationElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):251 -> b
+    33:37:com.android.tools.r8.graph.DexAnnotationElement rewriteAnnotationElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):257:261 -> b
+    38:40:boolean enclosingMethodPinned(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):267:269 -> b
     1:1:java.util.Set getClassesToRetainInnerClassAttributeFor():55:55 -> c
     1:4:void run():190:193 -> d
     5:8:void run():192:195 -> d
@@ -71893,232 +72430,228 @@
     57:58:com.android.tools.r8.shaking.AnnotationRemover build(com.android.tools.r8.graph.AppView,java.util.Set):431:432 -> a
 com.android.tools.r8.shaking.AppInfoWithLiveness -> com.android.tools.r8.shaking.e:
     java.util.Map initClassReferences -> R
-    java.util.Set virtualMethodsTargetedByInvokeDirect -> s
+    java.util.Set liveMethods -> s
     boolean $assertionsDisabled -> k
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap identifierNameStrings -> T
-    com.android.tools.r8.graph.FieldAccessInfoCollectionImpl fieldAccessInfoCollection -> u
+    java.util.Map mayHaveSideEffects -> y
     java.util.Map switchMaps -> V
-    com.android.tools.r8.utils.PredicateSet alwaysClassInline -> L
-    java.util.Map assumedValues -> B
-    java.util.Set keepConstantArguments -> H
-    java.util.Set reprocess -> J
-    com.android.tools.r8.graph.MethodAccessInfoCollection methodAccessInfoCollection -> v
-    java.util.Set forceInline -> D
-    java.util.Set neverInlineDueToSingleCaller -> F
-    java.util.Set failedMethodResolutionTargets -> o
-    java.util.Set noVerticalClassMerging -> P
-    java.util.Set bootstrapMethods -> q
+    java.util.Map callSites -> w
+    java.util.Set keepUnusedArguments -> H
+    java.util.Set neverReprocess -> J
+    java.util.Set neverInline -> D
+    com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl objectAllocationInfoCollection -> v
+    java.util.Set whyAreYouNotInlining -> F
+    java.util.Set failedResolutionTargets -> o
+    java.util.Set noStaticClassMerging -> P
+    java.util.Set methodsTargetedByInvokeDynamic -> q
+    com.android.tools.r8.shaking.KeepInfoCollection keepInfo -> x
+    java.util.Set neverClassInline -> L
     java.util.Set liveTypes -> m
     com.android.tools.r8.cf.CfVersion largestInputCfVersion -> X
-    java.util.Set noClassMerging -> N
+    java.util.Set noHorizontalClassMerging -> N
     java.util.Set neverPropagateValue -> S
     com.android.tools.r8.shaking.SingleTargetLookupCache singleTargetLookupCache -> W
-    java.util.Set liveMethods -> t
     java.util.Set prunedTypes -> U
-    java.util.Map mayHaveSideEffects -> z
-    java.util.Map callSites -> x
-    java.util.Map noSideEffects -> A
-    java.util.Set whyAreYouNotInlining -> G
-    java.util.Set keepUnusedArguments -> I
-    java.util.Set alwaysInline -> C
-    com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl objectAllocationInfoCollection -> w
-    java.util.Set neverInline -> E
-    java.util.Set noHorizontalClassMerging -> O
-    java.util.Set failedFieldResolutionTargets -> p
+    java.util.Map noSideEffects -> z
+    java.util.Set alwaysInline -> B
+    com.android.tools.r8.graph.FieldAccessInfoCollectionImpl fieldAccessInfoCollection -> t
+    java.util.Map assumedValues -> A
+    java.util.Set keepConstantArguments -> G
+    java.util.Set reprocess -> I
+    com.android.tools.r8.utils.PredicateSet alwaysClassInline -> K
+    com.android.tools.r8.graph.MethodAccessInfoCollection methodAccessInfoCollection -> u
+    java.util.Set forceInline -> C
+    java.util.Set neverInlineDueToSingleCaller -> E
+    java.util.Set noVerticalClassMerging -> O
+    java.util.Set bootstrapMethods -> p
     java.util.Set lockCandidates -> Q
-    java.util.Set methodsTargetedByInvokeDynamic -> r
-    java.util.Set neverReprocess -> K
+    java.util.Set virtualMethodsTargetedByInvokeDirect -> r
     java.util.Set deadProtoTypes -> l
-    com.android.tools.r8.shaking.KeepInfoCollection keepInfo -> y
-    java.util.Set neverClassInline -> M
+    java.util.Set noClassMerging -> M
     java.util.Set targetedMethods -> n
-    1:1:void <clinit>():76:76 -> <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,com.android.tools.r8.shaking.MissingClasses,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,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,java.util.Set,java.util.Map):237:237 -> <init>
-    2:294:void <init>(com.android.tools.r8.synthesis.CommittedItems,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.shaking.MainDexClasses,java.util.Set,com.android.tools.r8.shaking.MissingClasses,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,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,java.util.Set,java.util.Map):192:484 -> <init>
-    295:332:void <init>(com.android.tools.r8.synthesis.CommittedItems,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.shaking.MainDexClasses,java.util.Set,com.android.tools.r8.shaking.MissingClasses,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,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,java.util.Set,java.util.Map):238:275 -> <init>
-    333:336:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map):419:422 -> <init>
-    337:337:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map):418:418 -> <init>
-    338:630:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map):192:484 -> <init>
-    631:669:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map):423:461 -> <init>
-    1:2:java.util.Set getPrunedTypes():1054:1055 -> A
-    1:1:java.util.Set getReprocessMethods():615:615 -> B
-    1:1:java.util.Set getVirtualMethodsTargetedByInvokeDirect():559:559 -> C
-    1:1:boolean hasNoAlwaysInlineMethods():567:567 -> D
-    1:1:boolean hasNoForceInlineMethods():575:575 -> E
-    1:1:boolean hasNoWhyAreYouNotInliningMethods():599:599 -> F
-    1:1:com.android.tools.r8.shaking.AppInfoWithLivenessModifier modifier():465:465 -> G
-    1:3:boolean verify():373:375 -> H
-    4:4:boolean verify():374:374 -> H
-    1:1:com.android.tools.r8.graph.AppInfo prunedCopyFrom(com.android.tools.r8.graph.PrunedItems):76:76 -> a
-    2:5:com.android.tools.r8.shaking.KeepInfoCollection extendPinnedItems(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Collection):381:384 -> a
+    1:1:void <clinit>():75:75 -> <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,com.android.tools.r8.shaking.MissingClasses,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,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,java.util.Set,java.util.Map):234:234 -> <init>
+    2:294:void <init>(com.android.tools.r8.synthesis.CommittedItems,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.shaking.MainDexClasses,java.util.Set,com.android.tools.r8.shaking.MissingClasses,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,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,java.util.Set,java.util.Map):189:481 -> <init>
+    295:332:void <init>(com.android.tools.r8.synthesis.CommittedItems,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.shaking.MainDexClasses,java.util.Set,com.android.tools.r8.shaking.MissingClasses,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,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,java.util.Set,java.util.Map):235:272 -> <init>
+    333:336:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map):415:418 -> <init>
+    337:337:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map):414:414 -> <init>
+    338:630:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map):189:481 -> <init>
+    631:669:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map):419:457 -> <init>
+    1:1:com.android.tools.r8.graph.ObjectAllocationInfoCollection getObjectAllocationInfoCollection():719:719 -> A
+    1:2:java.util.Set getPrunedTypes():1049:1050 -> B
+    1:1:java.util.Set getReprocessMethods():604:604 -> C
+    1:1:java.util.Set getVirtualMethodsTargetedByInvokeDirect():552:552 -> D
+    1:1:boolean hasNoAlwaysInlineMethods():560:560 -> E
+    1:1:boolean hasNoForceInlineMethods():568:568 -> F
+    1:1:boolean hasNoWhyAreYouNotInliningMethods():588:588 -> G
+    1:1:com.android.tools.r8.shaking.AppInfoWithLivenessModifier modifier():461:461 -> H
+    1:3:void verify():370:372 -> I
+    4:4:void verify():371:371 -> I
+    1:1:com.android.tools.r8.graph.AppInfo prunedCopyFrom(com.android.tools.r8.graph.PrunedItems):75:75 -> a
+    2:5:com.android.tools.r8.shaking.KeepInfoCollection extendPinnedItems(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Collection):377:380 -> a
     6:6:com.android.tools.r8.shaking.KeepInfoCollection com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection.mutate(java.util.function.Consumer):435:435 -> a
-    6:6:com.android.tools.r8.shaking.KeepInfoCollection extendPinnedItems(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Collection):384 -> a
-    7:7:com.android.tools.r8.shaking.KeepInfoCollection extendPinnedItems(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Collection):382:382 -> a
-    8:9:void lambda$extendPinnedItems$0(java.util.Collection,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):386:387 -> a
+    6:6:com.android.tools.r8.shaking.KeepInfoCollection extendPinnedItems(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Collection):380 -> a
+    7:7:com.android.tools.r8.shaking.KeepInfoCollection extendPinnedItems(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Collection):378:378 -> a
+    8:9:void lambda$extendPinnedItems$0(java.util.Collection,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):382:383 -> a
     10:10:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
-    10:10:void lambda$extendPinnedItems$0(java.util.Collection,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):387 -> a
-    11:26:void lambda$extendPinnedItems$0(java.util.Collection,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):389:404 -> a
-    27:27:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):282:282 -> a
-    27:27:void lambda$extendPinnedItems$0(java.util.Collection,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):406 -> a
-    28:28:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.toProgramFieldOrNull(com.android.tools.r8.graph.DexEncodedField):291:291 -> a
-    28:28:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):282 -> a
-    28:28:void lambda$extendPinnedItems$0(java.util.Collection,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):406 -> a
-    29:29:void lambda$extendPinnedItems$0(java.util.Collection,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):408:408 -> a
-    30:34:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):487:491 -> a
-    35:45:void computeLargestCfVersion():497:507 -> a
-    35:45:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):491 -> a
-    46:46:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):493:493 -> a
-    47:47:boolean isNeverInlineDueToSingleCallerMethod(com.android.tools.r8.graph.ProgramMethod):583:583 -> a
-    48:81:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):655:688 -> a
-    82:82:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):658:658 -> a
-    83:83:void removeFromSingleTargetLookupCache(com.android.tools.r8.graph.DexClass):737:737 -> a
-    84:85:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):762:763 -> a
-    86:86:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():714:714 -> a
-    86:86:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):764 -> a
-    87:91:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):764:768 -> a
+    10:10:void lambda$extendPinnedItems$0(java.util.Collection,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):383 -> a
+    11:26:void lambda$extendPinnedItems$0(java.util.Collection,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):385:400 -> a
+    27:27:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):232:232 -> a
+    27:27:void lambda$extendPinnedItems$0(java.util.Collection,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):402 -> a
+    28:28:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.toProgramFieldOrNull(com.android.tools.r8.graph.DexEncodedField):241:241 -> a
+    28:28:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):232 -> a
+    28:28:void lambda$extendPinnedItems$0(java.util.Collection,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):402 -> a
+    29:29:void lambda$extendPinnedItems$0(java.util.Collection,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):404:404 -> a
+    30:34:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):484:488 -> a
+    35:45:void computeLargestCfVersion():494:504 -> a
+    35:45:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):488 -> a
+    46:46:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):490:490 -> a
+    47:47:boolean isNeverInlineDueToSingleCallerMethod(com.android.tools.r8.graph.ProgramMethod):576:576 -> a
+    48:81:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):646:679 -> a
+    82:82:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):649:649 -> a
+    83:83:void removeFromSingleTargetLookupCache(com.android.tools.r8.graph.DexClass):728:728 -> a
+    84:85:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):753:754 -> a
+    86:86:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():705:705 -> a
+    86:86:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):755 -> a
+    87:91:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):755:759 -> a
     92:92:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexDefinitionSupplier):145:145 -> a
-    92:92:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):768 -> a
-    93:93:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):772:772 -> a
-    94:99:boolean isFieldOnlyWrittenInMethod(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):793:798 -> a
-    100:101:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndMember):847:848 -> a
-    102:102:boolean isClassInliningAllowed(com.android.tools.r8.graph.DexProgramClass):896:896 -> a
-    103:104:boolean isAccessModificationAllowed(com.android.tools.r8.graph.DexReference):905:906 -> a
-    105:108:com.android.tools.r8.utils.TraversalContinuation lambda$isRepackagingAllowed$2(com.android.tools.r8.graph.ProgramMember):919:922 -> a
-    109:110:boolean isPinned(com.android.tools.r8.graph.DexDefinition):933:934 -> a
-    111:111:void lambda$prunedCopyFrom$3(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder):974:974 -> a
-    112:112:void lambda$prunedCopyFrom$4(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):976:976 -> a
-    113:121:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):987:995 -> a
-    122:139:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):990:1007 -> a
-    140:144:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.graph.GraphLens.rewriteFields(java.util.Set):576:580 -> a
-    140:144:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):1008 -> a
-    145:171:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):1008:1034 -> a
-    172:174:java.util.Set com.android.tools.r8.graph.GraphLens.rewriteReferences(java.util.Set):546:548 -> a
-    172:174:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):1035 -> a
-    175:175:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):1035:1035 -> a
-    176:178: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):560:562 -> a
-    176:178:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):1036 -> a
-    179:184:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):1036:1041 -> a
-    185:190: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):1063:1068 -> a
-    185:190: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):1089 -> a
-    191:192: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):1106:1107 -> a
-    191:192: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):1070 -> a
-    191:192: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):1089 -> a
-    193:193:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):552:552 -> a
-    193:193: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):1078 -> a
-    193:193: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):1089 -> a
-    194:194: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):1078:1078 -> a
-    194:194: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):1089 -> a
-    195:195:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toMethodDefinitionOrNull(com.android.tools.r8.graph.DexClassAndMethod):333:333 -> a
-    195:195: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):1078 -> a
-    195:195: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):1089 -> a
-    196:196: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):1076:1076 -> a
-    196:196: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):1089 -> a
-    197:198: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):1106:1107 -> a
-    197:198: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):1072 -> a
-    197:198: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):1089 -> a
-    199:199: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):1074:1074 -> a
-    199:199: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):1089 -> a
-    200:200: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):1089:1089 -> a
-    201:201: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):476:476 -> a
-    201:201: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):1089 -> a
-    202:203:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean):1095:1096 -> a
-    204:235: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):1118:1149 -> a
-    236:236:boolean com.android.tools.r8.graph.DexClass.isFinal():575:575 -> a
-    236:236: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):1149 -> a
-    237:237:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():493:493 -> a
-    237:237: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):1150 -> a
-    238:239: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):1150:1151 -> a
-    240:248: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):1215:1223 -> a
-    240:248: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):1156 -> a
-    249:263: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):1221:1235 -> a
-    249:263: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):1156 -> a
-    264:276: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:1173 -> a
-    277:297: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):1172:1192 -> a
-    298:308: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):1191:1201 -> a
-    309:311:com.android.tools.r8.shaking.AppInfoWithLiveness withSwitchMaps(java.util.Map):1242:1244 -> a
-    312:337:void forEachTypeInHierarchyOfLiveProgramClasses(java.util.function.Consumer,java.util.Collection,java.util.Set,com.android.tools.r8.graph.AppInfoWithClassHierarchy):1276:1301 -> a
-    338:338:void lambda$forEachTypeInHierarchyOfLiveProgramClasses$7(java.util.Set,com.android.tools.r8.graph.DexProgramClass):1277:1277 -> a
-    339:339:void forEachInstantiatedSubType(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):1313:1313 -> a
-    340:341:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1323:1324 -> a
-    342:342:boolean isInstantiatedOrPinned(com.android.tools.r8.graph.DexProgramClass):1332:1332 -> a
-    342:342:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1325 -> a
-    343:344:boolean isInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):879:880 -> a
-    343:344:boolean isInstantiatedOrPinned(com.android.tools.r8.graph.DexProgramClass):1332 -> a
-    343:344:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1325 -> a
-    345:345:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1326:1326 -> a
-    346:353:boolean mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.ir.analysis.type.ClassTypeElement):1354:1361 -> a
-    354:354:boolean lambda$mayHaveFinalizeMethodDirectlyOrIndirectly$8(com.android.tools.r8.graph.DexType,java.lang.Boolean):1359:1359 -> a
-    355:355:com.android.tools.r8.utils.TraversalContinuation lambda$mayHaveFinalizer$10(com.android.tools.r8.ir.desugar.LambdaDescriptor):1384:1384 -> a
-    1:1:com.android.tools.r8.graph.AppInfoWithClassHierarchy prunedCopyFrom(com.android.tools.r8.graph.PrunedItems):76:76 -> b
-    2:19:void forEachReachableInterface(java.util.function.Consumer):619:636 -> b
-    20:24:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):741:745 -> b
-    25:25:boolean com.android.tools.r8.synthesis.SyntheticItems.isLegacySyntheticClass(com.android.tools.r8.graph.DexProgramClass):209:209 -> b
-    25:25:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):745 -> b
-    26:26:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):746:746 -> b
-    27:27:boolean com.android.tools.r8.graph.DexClass.isAnnotation():571:571 -> b
-    27:27:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):748 -> b
-    28:28:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):748:748 -> b
-    29:30:boolean isFieldWritten(com.android.tools.r8.graph.DexEncodedField):776:777 -> b
-    31:32:boolean isFieldOnlyWrittenInMethodIgnoringPinning(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):803:804 -> b
-    33:33:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():714:714 -> b
-    33:33:boolean isFieldOnlyWrittenInMethodIgnoringPinning(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):805 -> b
-    34:37:boolean isFieldOnlyWrittenInMethodIgnoringPinning(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):805:808 -> b
-    38:41:boolean lambda$isInstanceFieldWrittenOnlyInInstanceInitializers$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):824:827 -> b
-    42:46:boolean mayPropagateArgumentsTo(com.android.tools.r8.graph.ProgramMethod):839:843 -> b
-    47:47:boolean isMinificationAllowed(com.android.tools.r8.graph.DexReference):900:900 -> b
-    48:48:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():558:558 -> b
-    48:48:boolean isMinificationAllowed(com.android.tools.r8.graph.DexReference):900 -> b
-    49:50:boolean isMinificationAllowed(com.android.tools.r8.graph.DexReference):900:901 -> b
-    51:51:com.android.tools.r8.shaking.AppInfoWithLiveness rebuildWithLiveness(com.android.tools.r8.synthesis.CommittedItems):982:982 -> b
-    52:56:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.synthesis.CommittedItems):281:285 -> b
-    52:56:com.android.tools.r8.shaking.AppInfoWithLiveness rebuildWithLiveness(com.android.tools.r8.synthesis.CommittedItems):982 -> b
-    57:57:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.synthesis.CommittedItems):279:279 -> b
-    57:57:com.android.tools.r8.shaking.AppInfoWithLiveness rebuildWithLiveness(com.android.tools.r8.synthesis.CommittedItems):982 -> b
-    58:67:boolean isPinnedNotProgramOrLibraryOverride(com.android.tools.r8.graph.DexDefinition):1336:1345 -> b
-    1:6:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):470:475 -> c
-    7:7:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isCompanionClassType(com.android.tools.r8.graph.DexType):950:950 -> c
-    7:7:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):475 -> c
-    8:8:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isEmulatedLibraryClassType(com.android.tools.r8.graph.DexType):954:954 -> c
-    8:8:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):476 -> c
-    9:11:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):477:479 -> c
-    12:12:boolean com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter.isVivifiedType(com.android.tools.r8.graph.DexType):101:101 -> c
-    12:12:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):479 -> c
-    13:13:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):471:471 -> c
-    14:15:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexProgramClass):757:758 -> c
-    16:17:boolean isInstantiatedIndirectly(com.android.tools.r8.graph.DexProgramClass):752:753 -> c
-    16:17:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexProgramClass):758 -> c
-    18:19:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):781:782 -> c
-    20:20:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():714:714 -> c
-    20:20:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):783 -> c
-    21:27:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):783:789 -> c
-    28:29:boolean isPinned(com.android.tools.r8.graph.DexReference):928:929 -> c
-    30:30:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier):133:133 -> c
-    30:30:boolean isPinned(com.android.tools.r8.graph.DexReference):929 -> c
-    31:41:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems):965:975 -> c
-    42:42:com.android.tools.r8.shaking.KeepInfoCollection com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection.mutate(java.util.function.Consumer):435:435 -> c
-    42:42:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems):975 -> c
-    43:43:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems):978:978 -> c
-    44:85:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems):325:366 -> c
-    44:85:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems):978 -> c
-    86:86:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems):324:324 -> c
-    86:86:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems):978 -> c
-    87:91:void forEachTypeInHierarchyOfLiveProgramClasses(java.util.function.Consumer):1263:1263 -> c
-    1:1:boolean isAlwaysInlineMethod(com.android.tools.r8.graph.DexMethod):563:563 -> d
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getSwitchMap(com.android.tools.r8.graph.DexField):708:709 -> d
-    4:4:void mutateObjectAllocationInfoCollection(java.util.function.Consumer):733:733 -> d
-    5:6:boolean isInstantiatedIndirectly(com.android.tools.r8.graph.DexProgramClass):752:753 -> d
-    7:9:boolean isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexEncodedField):812:814 -> d
-    10:10:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():714:714 -> d
-    10:10:boolean isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexEncodedField):817 -> d
-    11:16:boolean isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexEncodedField):817:822 -> d
-    1:1:boolean isBootstrapMethod(com.android.tools.r8.graph.DexMethod):551:551 -> e
+    92:92:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):759 -> a
+    93:97:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):764:768 -> a
+    98:103:boolean isFieldOnlyWrittenInMethod(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):793:798 -> a
+    104:104:boolean isClassInliningAllowed(com.android.tools.r8.graph.DexProgramClass):896:896 -> a
+    105:106:boolean isAccessModificationAllowed(com.android.tools.r8.graph.DexReference):905:906 -> a
+    107:110:com.android.tools.r8.utils.TraversalContinuation lambda$isRepackagingAllowed$2(com.android.tools.r8.graph.ProgramMember):919:922 -> a
+    111:112:boolean isPinned(com.android.tools.r8.graph.DexDefinition):933:934 -> a
+    113:113:void lambda$prunedCopyFrom$3(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder):969:969 -> a
+    114:114:void lambda$prunedCopyFrom$4(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):971:971 -> a
+    115:123:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):982:990 -> a
+    124:168:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):985:1029 -> a
+    169:171:java.util.Set com.android.tools.r8.graph.GraphLens.rewriteReferences(java.util.Set):547:549 -> a
+    169:171:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):1030 -> a
+    172:172:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):1030:1030 -> a
+    173:175: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):561:563 -> a
+    173:175:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):1031 -> a
+    176:181:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):1031:1036 -> a
+    182:187: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):1058:1063 -> a
+    182:187: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):1084 -> a
+    188:189: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):1101:1102 -> a
+    188:189: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):1065 -> a
+    188:189: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):1084 -> a
+    190:190:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):502:502 -> a
+    190:190: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):1073 -> a
+    190:190: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):1084 -> a
+    191:191: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):1073:1073 -> a
+    191:191: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):1084 -> a
+    192:192:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toMethodDefinitionOrNull(com.android.tools.r8.graph.DexClassAndMethod):334:334 -> a
+    192:192: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):1073 -> a
+    192:192: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):1084 -> a
+    193:193: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):1071:1071 -> a
+    193:193: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):1084 -> a
+    194:195: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):1101:1102 -> a
+    194:195: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):1067 -> a
+    194:195: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):1084 -> a
+    196:196: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):1069:1069 -> a
+    196:196: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):1084 -> a
+    197:197: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):1084:1084 -> a
+    198:198: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):485:485 -> a
+    198:198: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):1084 -> a
+    199:200:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean):1090:1091 -> a
+    201:232: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):1113:1144 -> a
+    233:233:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():502:502 -> a
+    233:233: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):1145 -> a
+    234:235: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):1145:1146 -> a
+    236:244: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):1210:1218 -> a
+    236:244: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):1151 -> a
+    245:259: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):1216:1230 -> a
+    245:259: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):1151 -> a
+    260:272: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):1156:1168 -> a
+    273:293: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):1167:1187 -> a
+    294:304: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):1186:1196 -> a
+    305:307:com.android.tools.r8.shaking.AppInfoWithLiveness withSwitchMaps(java.util.Map):1237:1239 -> a
+    308:333:void forEachTypeInHierarchyOfLiveProgramClasses(java.util.function.Consumer,java.util.Collection,java.util.Set,com.android.tools.r8.graph.AppInfoWithClassHierarchy):1271:1296 -> a
+    334:334:void lambda$forEachTypeInHierarchyOfLiveProgramClasses$7(java.util.Set,com.android.tools.r8.graph.DexProgramClass):1272:1272 -> a
+    335:335:void forEachInstantiatedSubType(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):1308:1308 -> a
+    336:337:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1318:1319 -> a
+    338:338:boolean isInstantiatedOrPinned(com.android.tools.r8.graph.DexProgramClass):1327:1327 -> a
+    338:338:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1320 -> a
+    339:340:boolean isInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):879:880 -> a
+    339:340:boolean isInstantiatedOrPinned(com.android.tools.r8.graph.DexProgramClass):1327 -> a
+    339:340:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1320 -> a
+    341:341:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1321:1321 -> a
+    342:354:boolean mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.ir.analysis.type.ClassTypeElement):1349:1361 -> a
+    355:355:com.android.tools.r8.utils.TraversalContinuation lambda$mayHaveFinalizer$9(com.android.tools.r8.ir.desugar.LambdaDescriptor):1384:1384 -> a
+    1:1:com.android.tools.r8.graph.AppInfoWithClassHierarchy prunedCopyFrom(com.android.tools.r8.graph.PrunedItems):75:75 -> b
+    2:6:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):732:736 -> b
+    7:7:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):247:247 -> b
+    7:7:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):736 -> b
+    8:8:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):737:737 -> b
+    9:9:boolean com.android.tools.r8.graph.DexClass.isAnnotation():553:553 -> b
+    9:9:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):739 -> b
+    10:10:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):739:739 -> b
+    11:12:boolean isFieldWritten(com.android.tools.r8.graph.DexEncodedField):772:773 -> b
+    13:14:boolean isFieldOnlyWrittenInMethodIgnoringPinning(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):803:804 -> b
+    15:15:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():705:705 -> b
+    15:15:boolean isFieldOnlyWrittenInMethodIgnoringPinning(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):805 -> b
+    16:19:boolean isFieldOnlyWrittenInMethodIgnoringPinning(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):805:808 -> b
+    20:23:boolean lambda$isInstanceFieldWrittenOnlyInInstanceInitializers$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):824:827 -> b
+    24:28:boolean mayPropagateArgumentsTo(com.android.tools.r8.graph.ProgramMethod):839:843 -> b
+    29:29:boolean isMinificationAllowed(com.android.tools.r8.graph.DexReference):900:900 -> b
+    30:30:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():569:569 -> b
+    30:30:boolean isMinificationAllowed(com.android.tools.r8.graph.DexReference):900 -> b
+    31:32:boolean isMinificationAllowed(com.android.tools.r8.graph.DexReference):900:901 -> b
+    33:33:com.android.tools.r8.shaking.AppInfoWithLiveness rebuildWithLiveness(com.android.tools.r8.synthesis.CommittedItems):977:977 -> b
+    34:38:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.synthesis.CommittedItems):278:282 -> b
+    34:38:com.android.tools.r8.shaking.AppInfoWithLiveness rebuildWithLiveness(com.android.tools.r8.synthesis.CommittedItems):977 -> b
+    39:39:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.synthesis.CommittedItems):276:276 -> b
+    39:39:com.android.tools.r8.shaking.AppInfoWithLiveness rebuildWithLiveness(com.android.tools.r8.synthesis.CommittedItems):977 -> b
+    40:44:void forEachTypeInHierarchyOfLiveProgramClasses(java.util.function.Consumer):1258:1258 -> b
+    45:54:boolean isPinnedNotProgramOrLibraryOverride(com.android.tools.r8.graph.DexDefinition):1331:1340 -> b
+    1:6:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):466:471 -> c
+    7:7:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isCompanionClassType(com.android.tools.r8.graph.DexType):872:872 -> c
+    7:7:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):471 -> c
+    8:8:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isEmulatedLibraryClassType(com.android.tools.r8.graph.DexType):876:876 -> c
+    8:8:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):472 -> c
+    9:10:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):473:474 -> c
+    11:11:boolean com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter.isUtilityClassDescriptor(com.android.tools.r8.graph.DexType):80:80 -> c
+    11:11:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):474 -> c
+    12:12:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):476:476 -> c
+    13:13:boolean com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter.isVivifiedType(com.android.tools.r8.graph.DexType):101:101 -> c
+    13:13:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):476 -> c
+    14:14:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):467:467 -> c
+    15:15:void mutateObjectAllocationInfoCollection(java.util.function.Consumer):724:724 -> c
+    16:17:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexProgramClass):748:749 -> c
+    18:19:boolean isInstantiatedIndirectly(com.android.tools.r8.graph.DexProgramClass):743:744 -> c
+    18:19:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexProgramClass):749 -> c
+    20:21:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):777:778 -> c
+    22:22:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():705:705 -> c
+    22:22:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):779 -> c
+    23:33:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):779:789 -> c
+    34:35:boolean isPinned(com.android.tools.r8.graph.DexReference):928:929 -> c
+    36:36:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier):133:133 -> c
+    36:36:boolean isPinned(com.android.tools.r8.graph.DexReference):929 -> c
+    37:47:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems):960:970 -> c
+    48:48:com.android.tools.r8.shaking.KeepInfoCollection com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection.mutate(java.util.function.Consumer):435:435 -> c
+    48:48:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems):970 -> c
+    49:49:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems):973:973 -> c
+    50:91:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems):322:363 -> c
+    50:91:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems):973 -> c
+    92:92:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems):321:321 -> c
+    92:92:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems):973 -> c
+    1:1:boolean isAlwaysInlineMethod(com.android.tools.r8.graph.DexMethod):556:556 -> d
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getSwitchMap(com.android.tools.r8.graph.DexField):699:700 -> d
+    4:5:boolean isInstantiatedIndirectly(com.android.tools.r8.graph.DexProgramClass):743:744 -> d
+    6:8:boolean isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexEncodedField):812:814 -> d
+    9:9:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():705:705 -> d
+    9:9:boolean isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexEncodedField):817 -> d
+    10:15:boolean isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexEncodedField):817:822 -> d
+    1:1:boolean isBootstrapMethod(com.android.tools.r8.graph.DexMethod):544:544 -> e
     2:3:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexField):852:853 -> e
     4:5:boolean isPinned(com.android.tools.r8.graph.DexReference):928:929 -> e
     4:5:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexField):856 -> e
     6:6:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier):133:133 -> e
     6:6:boolean isPinned(com.android.tools.r8.graph.DexReference):929 -> e
     6:6:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexField):856 -> e
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():49:49 -> e
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():46:46 -> e
     7:7:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexField):856 -> e
     8:8:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexField):856:856 -> e
     9:9:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):874:874 -> e
@@ -72127,36 +72660,31 @@
     11:11:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> e
     11:11:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):875 -> e
     12:13:boolean isInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):879:880 -> e
-    1:1:boolean isLiveProgramClass(com.android.tools.r8.graph.DexProgramClass):511:511 -> f
-    2:2:boolean isFailedResolutionTarget(com.android.tools.r8.graph.DexMethod):539:539 -> f
+    1:1:boolean isLiveProgramClass(com.android.tools.r8.graph.DexProgramClass):508:508 -> f
+    2:2:boolean isFailedResolutionTarget(com.android.tools.r8.graph.DexMethod):536:536 -> f
     3:7:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):831:835 -> f
-    1:1:boolean isForceInlineMethod(com.android.tools.r8.graph.DexMethod):571:571 -> g
+    1:1:boolean isForceInlineMethod(com.android.tools.r8.graph.DexMethod):564:564 -> g
     2:8:boolean isRepackagingAllowed(com.android.tools.r8.graph.DexProgramClass):910:916 -> g
-    9:9:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexProgramClass.traverseProgramMembers(java.util.function.Function):305:305 -> g
-    9:9:boolean isRepackagingAllowed(com.android.tools.r8.graph.DexProgramClass):917 -> g
-    10:10:boolean com.android.tools.r8.utils.TraversalContinuation.shouldContinue():16:16 -> g
-    10:10:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexProgramClass.traverseProgramMembers(java.util.function.Function):306 -> g
-    10:10:boolean isRepackagingAllowed(com.android.tools.r8.graph.DexProgramClass):917 -> g
-    11:13:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexProgramClass.traverseProgramMembers(java.util.function.Function):307:309 -> g
-    11:13:boolean isRepackagingAllowed(com.android.tools.r8.graph.DexProgramClass):917 -> g
+    9:13:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexProgramClass.traverseProgramMembers(java.util.function.Function):255:259 -> g
+    9:13:boolean isRepackagingAllowed(com.android.tools.r8.graph.DexProgramClass):917 -> g
     14:14:boolean isRepackagingAllowed(com.android.tools.r8.graph.DexProgramClass):924:924 -> g
-    1:1:boolean isKeepConstantArgumentsMethod(com.android.tools.r8.graph.DexMethod):603:603 -> h
-    2:6:boolean hasPinnedInstanceInitializer(com.android.tools.r8.graph.DexType):943:947 -> h
-    7:17:com.android.tools.r8.utils.TraversalContinuation lambda$mayHaveFinalizer$9(com.android.tools.r8.graph.DexProgramClass):1370:1380 -> h
-    1:1:boolean isKeepUnusedArgumentsMethod(com.android.tools.r8.graph.DexMethod):607:607 -> i
-    2:2:boolean isLockCandidate(com.android.tools.r8.graph.DexType):700:700 -> i
+    1:1:boolean isKeepConstantArgumentsMethod(com.android.tools.r8.graph.DexMethod):592:592 -> h
+    2:6:boolean hasPinnedInstanceInitializer(com.android.tools.r8.graph.DexType):938:942 -> h
+    7:17:com.android.tools.r8.utils.TraversalContinuation lambda$mayHaveFinalizer$8(com.android.tools.r8.graph.DexProgramClass):1370:1380 -> h
+    1:1:boolean isKeepUnusedArgumentsMethod(com.android.tools.r8.graph.DexMethod):596:596 -> i
+    2:2:boolean isLockCandidate(com.android.tools.r8.graph.DexType):691:691 -> i
     3:3:boolean hasLiveness():885:885 -> i
-    1:1:boolean isLiveMethod(com.android.tools.r8.graph.DexMethod):531:531 -> j
+    1:1:boolean isLiveMethod(com.android.tools.r8.graph.DexMethod):528:528 -> j
     2:2:boolean isNoHorizontalClassMergingOfType(com.android.tools.r8.graph.DexType):1392:1392 -> j
-    1:1:boolean isMethodTargetedByInvokeDynamic(com.android.tools.r8.graph.DexMethod):555:555 -> k
+    1:1:boolean isMethodTargetedByInvokeDynamic(com.android.tools.r8.graph.DexMethod):548:548 -> k
     2:2:boolean isNoVerticalClassMergingOfType(com.android.tools.r8.graph.DexType):1397:1397 -> k
-    1:8:boolean isNonProgramTypeOrLiveProgramType(com.android.tools.r8.graph.DexType):520:527 -> l
-    9:9:boolean isNeverInlineMethod(com.android.tools.r8.graph.DexMethod):579:579 -> l
-    1:1:boolean isNeverReprocessMethod(com.android.tools.r8.graph.DexMethod):611:611 -> m
-    2:2:com.android.tools.r8.graph.DexProgramClass lambda$forEachTypeInHierarchyOfLiveProgramClasses$6(com.android.tools.r8.graph.DexType):1265:1265 -> m
+    1:8:boolean isNonProgramTypeOrLiveProgramType(com.android.tools.r8.graph.DexType):517:524 -> l
+    9:9:boolean isNeverInlineMethod(com.android.tools.r8.graph.DexMethod):572:572 -> l
+    1:1:boolean isNeverReprocessMethod(com.android.tools.r8.graph.DexMethod):600:600 -> m
+    2:2:com.android.tools.r8.graph.DexProgramClass lambda$forEachTypeInHierarchyOfLiveProgramClasses$6(com.android.tools.r8.graph.DexType):1260:1260 -> m
     boolean lambda$lookupSingleVirtualTarget$5(com.android.tools.r8.graph.DexType) -> n
-    1:1:boolean isTargetedMethod(com.android.tools.r8.graph.DexMethod):535:535 -> n
-    1:1:boolean isWhyAreYouNotInliningMethod(com.android.tools.r8.graph.DexMethod):595:595 -> o
+    1:1:boolean isTargetedMethod(com.android.tools.r8.graph.DexMethod):532:532 -> n
+    1:1:boolean isWhyAreYouNotInliningMethod(com.android.tools.r8.graph.DexMethod):584:584 -> o
     2:2:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():891:891 -> o
     3:24:boolean mayHaveFinalizer(com.android.tools.r8.graph.DexType):1366:1387 -> o
     1:2:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexMethod):863:864 -> p
@@ -72166,16 +72694,16 @@
     5:5:boolean isPinned(com.android.tools.r8.graph.DexReference):929 -> p
     5:5:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexMethod):867 -> p
     6:6:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexMethod):867:867 -> p
-    7:8:boolean wasPruned(com.android.tools.r8.graph.DexType):1049:1050 -> p
-    1:1:com.android.tools.r8.graph.SubtypingInfo computeSubtypingInfo():1349:1349 -> r
-    1:1:java.util.Set getDeadProtoTypes():704:704 -> s
-    1:1:java.util.Set getFailedFieldResolutionTargets():547:547 -> t
-    1:1:java.util.Set getFailedMethodResolutionTargets():543:543 -> u
-    1:1:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():714:714 -> v
-    1:1:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():956:956 -> w
-    1:1:com.android.tools.r8.graph.MethodAccessInfoCollection getMethodAccessInfoCollection():723:723 -> x
-    1:1:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl getMutableFieldAccessInfoCollection():718:718 -> y
-    1:1:com.android.tools.r8.graph.ObjectAllocationInfoCollection getObjectAllocationInfoCollection():728:728 -> z
+    7:8:boolean wasPruned(com.android.tools.r8.graph.DexType):1044:1045 -> p
+    1:19:java.util.Collection computeReachableInterfaces():608:626 -> r
+    1:1:com.android.tools.r8.graph.SubtypingInfo computeSubtypingInfo():1344:1344 -> s
+    1:1:java.util.Set getDeadProtoTypes():695:695 -> t
+    1:1:java.util.Set getFailedResolutionTargets():540:540 -> u
+    1:1:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():705:705 -> v
+    1:1:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():951:951 -> w
+    1:1:com.android.tools.r8.graph.MethodAccessInfoCollection getMethodAccessInfoCollection():714:714 -> x
+    1:1:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl getMutableFieldAccessInfoCollection():709:709 -> y
+    1:1:java.util.Set getNoStaticClassMergingSet():1405:1405 -> z
 com.android.tools.r8.shaking.AppInfoWithLivenessModifier -> com.android.tools.r8.shaking.f:
     java.util.Set noLongerInstantiatedClasses -> a
     java.util.Set noLongerWrittenFields -> b
@@ -72189,7 +72717,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.V5:
+com.android.tools.r8.shaking.ClassInitFieldSynthesizer -> com.android.tools.r8.internal.H5:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.graph.DexField clinitField -> c
     boolean $assertionsDisabled -> a
@@ -72199,23 +72727,38 @@
     2:6:void <init>(com.android.tools.r8.graph.AppView):29:33 -> <init>
     1:3:void run(java.util.concurrent.ExecutorService):37:37 -> a
     5:5:void run(java.util.concurrent.ExecutorService):39:39 -> a
-    6:13:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):43:50 -> a
-    14:25:boolean com.android.tools.r8.shaking.ClassInitFieldSynthesizer.isMinimumRequiredVisibility(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.utils.Visibility):94:105 -> a
-    14:25:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):52 -> a
-    26:26:boolean com.android.tools.r8.graph.DexEncodedField.isPackagePrivate():213:213 -> 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):273:273 -> 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():215:215 -> 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:25:boolean com.android.tools.r8.shaking.ClassInitFieldSynthesizer.isMinimumRequiredVisibility(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.utils.Visibility):97:105 -> a
+    17:25:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):52 -> a
+    26:26:boolean com.android.tools.r8.graph.DexEncodedField.isPackagePrivate():203:203 -> a
     26:26:boolean com.android.tools.r8.shaking.ClassInitFieldSynthesizer.isMinimumRequiredVisibility(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.utils.Visibility):101 -> a
     26:26:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):52 -> a
-    27:27:boolean com.android.tools.r8.graph.DexEncodedField.isProtected():217:217 -> a
+    27:27:boolean com.android.tools.r8.graph.DexEncodedField.isProtected():211:211 -> a
     27:27:boolean com.android.tools.r8.shaking.ClassInitFieldSynthesizer.isMinimumRequiredVisibility(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.utils.Visibility):101 -> a
     27:27:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):52 -> a
-    28:28:boolean com.android.tools.r8.graph.DexEncodedField.isProtected():217:217 -> a
+    28:28:boolean com.android.tools.r8.graph.DexEncodedField.isProtected():211:211 -> a
     28:28:boolean com.android.tools.r8.shaking.ClassInitFieldSynthesizer.isMinimumRequiredVisibility(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.utils.Visibility):99 -> a
     28:28:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):52 -> a
-    29:57:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):57:85 -> a
-    58:58: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):80:80 -> a
-    58:58:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):85 -> a
-    59:61:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):87:89 -> a
-com.android.tools.r8.shaking.ClassInitFieldSynthesizer$1 -> com.android.tools.r8.internal.U5:
+    29:29:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):57:57 -> a
+    30:30:com.android.tools.r8.graph.FieldAccessFlags com.android.tools.r8.graph.DexEncodedField.getAccessFlags():128:128 -> a
+    30:30:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):64 -> a
+    31:31:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):64:64 -> a
+    32:32:com.android.tools.r8.graph.FieldAccessFlags com.android.tools.r8.graph.DexEncodedField.getAccessFlags():128:128 -> a
+    32:32:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):65 -> a
+    33:33:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):65:65 -> a
+    34:34:boolean com.android.tools.r8.graph.DexEncodedField.isPublic():215:215 -> a
+    34:34:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):69 -> a
+    35:45:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):75:85 -> a
+    46:46: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):74:74 -> a
+    46:46:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):85 -> a
+    47:49:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):87:89 -> a
+com.android.tools.r8.shaking.ClassInitFieldSynthesizer$1 -> com.android.tools.r8.internal.G5:
     int[] $SwitchMap$com$android$tools$r8$utils$Visibility -> a
     1:1:void <clinit>():97:97 -> <clinit>
 com.android.tools.r8.shaking.ClassInlineRule -> com.android.tools.r8.shaking.i:
@@ -72239,7 +72782,7 @@
     3:3:void <clinit>():13:13 -> <clinit>
     1:1:void <init>(java.lang.String,int):13:13 -> <init>
     1:1:com.android.tools.r8.shaking.ClassInlineRule$Type[] values():13:13 -> a
-com.android.tools.r8.shaking.CollectingGraphConsumer -> com.android.tools.r8.internal.H7:
+com.android.tools.r8.shaking.CollectingGraphConsumer -> com.android.tools.r8.internal.q7:
     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>
@@ -72249,17 +72792,24 @@
     1:6:void acceptEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo):29:34 -> acceptEdge
     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.ConstantArgumentRule -> com.android.tools.r8.shaking.l:
+com.android.tools.r8.shaking.ConsequentRootSetBuilder -> com.android.tools.r8.shaking.j:
+    com.android.tools.r8.shaking.Enqueuer enqueuer -> N
+    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
+    2:2:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):25 -> a
+    3:5:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):26:26 -> a
+com.android.tools.r8.shaking.ConstantArgumentRule -> com.android.tools.r8.shaking.m:
     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.ConstantArgumentRule$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.ConstantArgumentRule$1 -> com.android.tools.r8.shaking.j:
-com.android.tools.r8.shaking.ConstantArgumentRule$Builder -> com.android.tools.r8.shaking.k:
+com.android.tools.r8.shaking.ConstantArgumentRule$1 -> com.android.tools.r8.shaking.k:
+com.android.tools.r8.shaking.ConstantArgumentRule$Builder -> com.android.tools.r8.shaking.l:
     1:1:void <init>(com.android.tools.r8.shaking.ConstantArgumentRule$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.DefaultEnqueuerUseRegistry -> com.android.tools.r8.shaking.m:
+com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry -> com.android.tools.r8.shaking.n:
     com.android.tools.r8.graph.AppView appView -> c
     com.android.tools.r8.shaking.Enqueuer enqueuer -> e
     com.android.tools.r8.graph.ProgramMethod context -> d
@@ -72288,30 +72838,30 @@
     2:2:void registerTypeReference(com.android.tools.r8.graph.DexType):137:137 -> f
     1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):116:116 -> g
     1:1:void registerStaticFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField):121:121 -> h
-com.android.tools.r8.shaking.DefaultTreePrunerConfiguration -> com.android.tools.r8.internal.m9:
+com.android.tools.r8.shaking.DefaultTreePrunerConfiguration -> com.android.tools.r8.internal.K8:
     com.android.tools.r8.shaking.DefaultTreePrunerConfiguration INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():14:14 -> <init>
     1:1:com.android.tools.r8.shaking.DefaultTreePrunerConfiguration getInstance():17:17 -> a
     2:2:boolean isReachableOrReferencedField(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):22:22 -> a
-com.android.tools.r8.shaking.DelayedRootSetActionItem -> com.android.tools.r8.shaking.n:
-    1:1:void <init>():11:11 -> <init>
-com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction -> com.android.tools.r8.shaking.n$a:
+com.android.tools.r8.shaking.DelayedRootSetActionItem -> com.android.tools.r8.shaking.o:
+    1:1:void <init>():10:10 -> <init>
+com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction -> com.android.tools.r8.shaking.o$a:
     java.util.function.Consumer action -> c
     com.android.tools.r8.graph.ProgramMethod singleTarget -> b
     com.android.tools.r8.graph.ProgramMethod methodToKeep -> a
-    1:4:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):27:30 -> <init>
-    1:1:java.util.function.Consumer getAction():42:42 -> a
-    1:1:com.android.tools.r8.graph.ProgramMethod getMethodToKeep():34:34 -> b
-    1:1:com.android.tools.r8.graph.ProgramMethod getSingleTarget():38:38 -> c
-com.android.tools.r8.shaking.DexStringCache -> com.android.tools.r8.shaking.o:
+    1:4:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):26:29 -> <init>
+    1:1:java.util.function.Consumer getAction():41:41 -> a
+    1:1:com.android.tools.r8.graph.ProgramMethod getMethodToKeep():33:33 -> b
+    1:1:com.android.tools.r8.graph.ProgramMethod getSingleTarget():37:37 -> c
+com.android.tools.r8.shaking.DexStringCache -> com.android.tools.r8.shaking.p:
     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.qa:
+com.android.tools.r8.shaking.DiscardedChecker -> com.android.tools.r8.internal.N9:
     java.util.Set checkDiscarded -> a
     java.lang.Iterable classes -> b
-    1:3:void <init>(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.lang.Iterable):20:22 -> <init>
+    1:3:void <init>(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.lang.Iterable):20:22 -> <init>
     1:3:java.util.List run():26:28 -> a
     4:6:void com.android.tools.r8.shaking.DiscardedChecker.checkItem(com.android.tools.r8.graph.DexDefinition,java.util.List):37:39 -> a
     4:6:java.util.List run():29 -> a
@@ -72320,1472 +72870,1451 @@
     9:11:void lambda$run$0(java.util.List,com.android.tools.r8.graph.DexEncodedMethod):30 -> a
     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.p:
-    java.util.Map activeIfRules -> a0
+com.android.tools.r8.shaking.Enqueuer -> com.android.tools.r8.shaking.q:
     com.android.tools.r8.shaking.EnqueuerUseRegistryFactory useRegistryFactory -> o
-    java.util.Set reportedMissing -> V
+    java.util.Set lockCandidates -> V
     com.android.tools.r8.shaking.MissingClasses$Builder missingClassesBuilder -> E
-    java.util.Map deferredAnnotations -> Z
+    java.util.Map scopedMethodsForLiveTypes -> Z
     com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason initializedClasses -> z
-    com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection keepInfo -> W
-    com.android.tools.r8.shaking.ProguardCompatibilityActions$Builder proguardCompatibilityActionsBuilder -> S
     com.android.tools.r8.shaking.AnnotationRemover$Builder annotationRemoverBuilder -> p
     java.util.Map superInvokeDependencies -> w
     java.util.Set exceptionGuardAnalyses -> g
-    com.android.tools.r8.utils.InternalOptions options -> m
-    java.util.Set classesWithSerializableLambdas -> m0
-    com.android.tools.r8.graph.SubtypingInfo subtypingInfo -> l
+    com.android.tools.r8.shaking.RootSetBuilder$RootSet rootSet -> m
     com.android.tools.r8.graph.MethodAccessInfoCollection$IdentityBuilder methodAccessInfoCollection -> s
     com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason liveTypes -> y
+    com.android.tools.r8.utils.collections.ProgramMethodSet pendingReflectiveUses -> R
     java.util.Set initialDeadProtoTypes -> F
     com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder objectAllocationInfoCollection -> t
-    java.util.Map lambdaClasses -> i0
-    java.util.Map methodsWithBackports -> k0
-    com.android.tools.r8.shaking.EnqueuerWorklist workList -> R
-    com.android.tools.r8.shaking.RootSetUtils$RootSet rootSet -> n
-    java.util.Set methodsTargetedByInvokeDynamic -> N
-    com.android.tools.r8.graph.analysis.DesugaredLibraryConversionWrapperAnalysis desugaredLibraryWrapperAnalysis -> h0
+    java.util.Map syntheticInterfaceMethodBridges -> i0
+    java.util.Map lambdaClasses -> e0
+    com.android.tools.r8.shaking.ProguardClassFilter dontWarnPatterns -> n
+    java.util.Map methodsWithBackports -> g0
+    java.util.Set virtualMethodsTargetedByInvokeDirect -> N
+    java.util.Map reachableVirtualTargets -> S
     com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason directlyInitializedInterfaces -> A
+    java.util.Map initClassReferences -> W
     java.util.Map reachableInstanceFields -> x
+    com.android.tools.r8.utils.InternalOptions options -> l
     java.util.Set initialPrunedTypes -> G
     java.util.Set checkCastAnalyses -> h
     java.util.Set liveNonProgramTypes -> C
     java.util.Set analyses -> d
-    java.util.Set virtualMethodsTargetedByInvokeDirect -> O
+    com.android.tools.r8.shaking.EnqueuerWorklist workList -> Q
     boolean $assertionsDisabled -> a
-    java.util.Set failedMethodResolutionTargets -> K
-    com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet liveMethods -> P
-    java.util.Set lockCandidates -> X
+    java.util.Set failedResolutionTargets -> K
     com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason indirectlyInitializedInterfaces -> B
-    java.util.Map scopedMethodsForLiveTypes -> b0
-    com.android.tools.r8.utils.collections.ProgramMethodSet pendingDesugaring -> n0
-    com.android.tools.r8.shaking.MainDexTracingResult previousMainDexTracingResult -> o0
+    java.util.Set reportedMissing -> T
+    com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection keepInfo -> U
     com.android.tools.r8.shaking.Enqueuer$SetWithReason targetedMethods -> J
     java.util.Map callSites -> u
-    com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring nestBasedAccessRewriter -> f0
-    com.android.tools.r8.utils.collections.ProgramMethodMap lambdaCallSites -> j0
+    java.util.Map deferredAnnotations -> X
     java.util.Set noClassMerging -> H
-    java.util.Map syntheticInterfaceMethodBridges -> p0
+    com.android.tools.r8.ir.desugar.BackportedMethodRewriter backportRewriter -> c0
+    com.android.tools.r8.utils.collections.ProgramMethodMap lambdaCallSites -> f0
     com.android.tools.r8.shaking.Enqueuer$Mode mode -> c
-    com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet liveFields -> Q
-    com.android.tools.r8.utils.collections.ProgramMethodSet pendingReflectiveUses -> T
-    java.util.concurrent.ExecutorService executorService -> k
     java.util.Set deadProtoTypeCandidates -> D
-    java.util.Map methodsWithTwrCloseResource -> l0
     java.util.Set invokeAnalyses -> e
-    com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter twrCloseResourceRewriter -> g0
+    java.util.Set classesWithSerializableLambdas -> h0
     boolean forceProguardCompatibility -> b
-    java.util.Set failedFieldResolutionTargets -> L
-    com.android.tools.r8.ir.desugar.BackportedMethodRewriter backportRewriter -> e0
+    java.util.Set bootstrapMethods -> L
+    com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet liveMethods -> O
+    com.android.tools.r8.graph.analysis.DesugaredLibraryConversionWrapperAnalysis desugaredLibraryWrapperAnalysis -> d0
     java.util.Set identifierNameStrings -> v
-    java.util.Map initClassReferences -> Y
+    java.util.Map activeIfRules -> Y
     com.android.tools.r8.graph.AppView appView -> j
-    java.util.Map reachableVirtualTargets -> U
-    com.android.tools.r8.ir.desugar.LambdaRewriter lambdaRewriter -> d0
     com.android.tools.r8.graph.FieldAccessInfoCollectionImpl fieldAccessInfoCollection -> r
+    com.android.tools.r8.ir.desugar.LambdaRewriter lambdaRewriter -> b0
     com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo -> i
+    com.android.tools.r8.graph.SubtypingInfo subtypingInfo -> k
+    com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet liveFields -> P
     java.util.Set instanceOfAnalyses -> f
     java.util.Map unusedInterfaceTypes -> I
+    com.android.tools.r8.shaking.GraphReporter graphReporter -> a0
     com.android.tools.r8.shaking.Enqueuer$EnqueuerDefinitionSupplier enqueuerDefinitionSupplier -> q
-    com.android.tools.r8.shaking.GraphReporter graphReporter -> c0
-    java.util.Set bootstrapMethods -> M
-    1:1:void <clinit>():173:173 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.MainDexTracingResult):409:409 -> <init>
-    2:3656:void <init>(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.MainDexTracingResult):214:3868 -> <init>
-    3657:3710:void <init>(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.MainDexTracingResult):410:463 -> <init>
-    com.android.tools.r8.shaking.KeepReason lambda$keepClassAndAllMembers$32(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness) -> a
-    1:1:com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection access$1000(com.android.tools.r8.shaking.Enqueuer):173:173 -> a
-    2:2:void access$1400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):173:173 -> a
-    3:3:void access$1500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):173:173 -> a
-    4:5:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):581:582 -> a
-    4:5:void access$1500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):173 -> a
-    6:6:com.android.tools.r8.graph.DexProgramClass access$1600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramDefinition):173:173 -> a
-    7:7:com.android.tools.r8.graph.DexProgramClass getProgramHolderOrNull(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramDefinition):680:680 -> a
-    7:7:com.android.tools.r8.graph.DexProgramClass access$1600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramDefinition):173 -> a
-    8:8:void access$1800(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):173:173 -> a
-    9:9:void access$2000(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):173:173 -> a
-    10:10:void access$2100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition):173:173 -> a
-    11:11:void access$2200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):173:173 -> a
-    12:12:void access$2300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):173:173 -> a
-    13:13:com.android.tools.r8.graph.DexClass access$2400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition,java.util.function.Consumer):173:173 -> a
-    14:14:boolean access$800(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):173:173 -> a
-    15:15:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():300:300 -> a
-    15:15:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1174 -> a
-    16:18:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1174:1176 -> a
-    19:19:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.methodHandleReferencedIn(com.android.tools.r8.graph.ProgramMethod):85:85 -> a
-    19:19:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1178 -> a
-    20:20:boolean com.android.tools.r8.graph.DexClass.isAnnotation():571:571 -> a
-    20:20:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1179 -> a
-    21:25:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1180:1184 -> a
-    26:26:void lambda$new$0(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):434:434 -> a
-    27:27:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):492:492 -> a
-    27:27:void lambda$new$0(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):434 -> a
-    28:28:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo():468:468 -> a
-    29:29:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory lambda$createUseRegistryFactory$1(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):482:482 -> a
-    30:30:com.android.tools.r8.shaking.Enqueuer registerInvokeAnalysis(com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):497:497 -> a
-    31:31:com.android.tools.r8.shaking.Enqueuer registerInstanceOfAnalysis(com.android.tools.r8.graph.analysis.EnqueuerInstanceOfAnalysis):502:502 -> a
-    32:32:com.android.tools.r8.shaking.Enqueuer registerCheckCastAnalysis(com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis):507:507 -> a
-    33:33:com.android.tools.r8.shaking.Enqueuer registerExceptionGuardAnalysis(com.android.tools.r8.graph.analysis.EnqueuerExceptionGuardAnalysis):512:512 -> a
-    34:34:void setAnnotationRemoverBuilder(com.android.tools.r8.shaking.AnnotationRemover$Builder):517:517 -> a
-    35:36:void setInitialDeadProtoTypes(java.util.Set):521:522 -> a
-    37:37:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):531:531 -> a
-    38:39:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):325:326 -> a
-    38:39:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):531 -> a
-    40:41:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):531:532 -> a
-    42:42:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexProgramClass):536:536 -> a
-    42:42:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):532 -> a
-    43:43:void recordMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition):568:568 -> a
-    44:47:void recordMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,java.util.function.Consumer):573:576 -> a
-    48:49:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):581:582 -> a
-    48:49:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):1976 -> a
-    50:51:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):1977:1978 -> a
-    52:52:void reportMissingField(com.android.tools.r8.graph.DexField):2264:2264 -> a
-    52:52:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):1979 -> a
+    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):374:374 -> <init>
+    2:3474: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:3664 -> <init>
+    3475:3515: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):375:415 -> <init>
+    1:1:com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection access$1000(com.android.tools.r8.shaking.Enqueuer):160:160 -> a
+    2:2:void access$1400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):160:160 -> a
+    3:3:void access$1500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):160:160 -> a
+    4:5:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):528:529 -> a
+    4:5:void access$1500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):160 -> a
+    6:6:com.android.tools.r8.graph.DexProgramClass access$1600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramDefinition):160:160 -> a
+    7:7:com.android.tools.r8.graph.DexProgramClass getProgramHolderOrNull(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramDefinition):627:627 -> a
+    7:7:com.android.tools.r8.graph.DexProgramClass access$1600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramDefinition):160 -> a
+    8:8:void access$1800(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):160:160 -> a
+    9:9:void access$2000(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):160:160 -> a
+    10:10:void access$2100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition):160:160 -> a
+    11:11:void access$2200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):160:160 -> a
+    12:12:void access$2300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):160:160 -> a
+    13:13:boolean access$800(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):160:160 -> a
+    14:14:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():300:300 -> a
+    14:14:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1117 -> a
+    15:17:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1117:1119 -> a
+    18:18:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.methodHandleReferencedIn(com.android.tools.r8.graph.ProgramMethod):85:85 -> a
+    18:18:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1121 -> a
+    19:19:boolean com.android.tools.r8.graph.DexClass.isAnnotation():553:553 -> a
+    19:19:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1122 -> a
+    20:24:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1123:1127 -> a
+    25:25:void lambda$new$0(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):393:393 -> a
+    26:26:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):444:444 -> a
+    26:26:void lambda$new$0(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):393 -> a
+    27:27:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo():420:420 -> a
+    28:28:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory lambda$createUseRegistryFactory$1(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):434:434 -> a
+    29:29:com.android.tools.r8.shaking.Enqueuer registerInvokeAnalysis(com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):449:449 -> a
+    30:30:com.android.tools.r8.shaking.Enqueuer registerInstanceOfAnalysis(com.android.tools.r8.graph.analysis.EnqueuerInstanceOfAnalysis):454:454 -> a
+    31:31:com.android.tools.r8.shaking.Enqueuer registerCheckCastAnalysis(com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis):459:459 -> a
+    32:32:com.android.tools.r8.shaking.Enqueuer registerExceptionGuardAnalysis(com.android.tools.r8.graph.analysis.EnqueuerExceptionGuardAnalysis):464:464 -> a
+    33:33:void setAnnotationRemoverBuilder(com.android.tools.r8.shaking.AnnotationRemover$Builder):469:469 -> a
+    34:35:void setInitialDeadProtoTypes(java.util.Set):473:474 -> a
+    36:36:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):483:483 -> a
+    37:37:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    37:37:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):358 -> a
+    37:37:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):483 -> a
+    38:38:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):359:359 -> a
+    38:38:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):483 -> a
+    39:40:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):483:484 -> a
+    41:41:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    41:41:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):484 -> a
+    42:42:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):484:484 -> a
+    43:43:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexProgramClass):488:488 -> a
+    43:43:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):484 -> a
+    44:47:void recordMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition):520:523 -> a
+    48:49:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):528:529 -> a
+    48:49:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):1858 -> a
+    50:51:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):1859:1860 -> a
+    52:52:void reportMissingField(com.android.tools.r8.graph.DexField):2142:2142 -> a
+    52:52:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):1861 -> a
     53:53:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    53:53:void reportMissingField(com.android.tools.r8.graph.DexField):2265 -> a
-    53:53:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):1979 -> a
-    54:54:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):1980:1980 -> a
-    55:55:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):594:594 -> a
-    56:62:com.android.tools.r8.graph.DexClass internalDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition,java.util.function.Consumer):604:610 -> a
-    56:62:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition,java.util.function.Consumer):599 -> a
-    63:71:void addLiveNonProgramType(com.android.tools.r8.graph.DexClass):620:628 -> a
-    72:73:void processNewLiveNonProgramType(com.android.tools.r8.graph.DexClass,java.util.Deque):634:635 -> a
-    72:73:void addLiveNonProgramType(com.android.tools.r8.graph.DexClass):629 -> a
-    74:74:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    74:74:void processNewLiveNonProgramType(com.android.tools.r8.graph.DexClass,java.util.Deque):635 -> a
-    74:74:void addLiveNonProgramType(com.android.tools.r8.graph.DexClass):629 -> a
-    75:77:void processNewLiveNonProgramType(com.android.tools.r8.graph.DexClass,java.util.Deque):637:639 -> a
-    75:77:void addLiveNonProgramType(com.android.tools.r8.graph.DexClass):629 -> a
-    78:82:void warnIfLibraryTypeInheritsFromProgramType(com.android.tools.r8.graph.DexLibraryClass):691:695 -> a
-    78:82:void processNewLiveNonProgramType(com.android.tools.r8.graph.DexClass,java.util.Deque):639 -> a
-    78:82:void addLiveNonProgramType(com.android.tools.r8.graph.DexClass):629 -> a
-    83:93:void processNewLiveNonProgramType(com.android.tools.r8.graph.DexClass,java.util.Deque):641:651 -> a
-    83:93:void addLiveNonProgramType(com.android.tools.r8.graph.DexClass):629 -> a
-    94:100:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,java.util.Deque):656:662 -> a
-    101:107:void reportMissingClass(com.android.tools.r8.graph.DexType):2247:2247 -> a
-    101:107:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,java.util.Deque):664 -> a
-    113:114:void reportMissingClass(com.android.tools.r8.graph.DexType):2253:2254 -> a
-    113:114:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,java.util.Deque):664 -> a
-    115:118:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,java.util.Deque):667:670 -> a
-    119:119:void enqueueRootItems(com.android.tools.r8.shaking.RootSetUtils$ItemsWithRules):727:727 -> a
-    120:120:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachField(java.util.function.BiConsumer):1685:1685 -> a
-    120:120:void enqueueRootItems(com.android.tools.r8.shaking.RootSetUtils$ItemsWithRules):727 -> a
-    121:121:void enqueueRootItems(com.android.tools.r8.shaking.RootSetUtils$ItemsWithRules):728:728 -> a
-    122:122:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachMethod(java.util.function.BiConsumer):1708:1708 -> a
-    122:122:void enqueueRootItems(com.android.tools.r8.shaking.RootSetUtils$ItemsWithRules):728 -> a
-    123:123:void enqueueRootItems(com.android.tools.r8.shaking.RootSetUtils$ItemsWithRules):729:729 -> a
-    124:124:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachClass(java.util.function.BiConsumer):1675:1675 -> a
-    124:124:void enqueueRootItems(com.android.tools.r8.shaking.RootSetUtils$ItemsWithRules):729 -> a
-    125:125:void enqueueRootClass(com.android.tools.r8.graph.DexType,java.util.Set):748:748 -> a
-    126:127:void enqueueRootClass(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):760:761 -> a
-    126:127:void enqueueRootClass(com.android.tools.r8.graph.DexProgramClass,java.util.Set):755 -> a
-    126:127:void enqueueRootClass(com.android.tools.r8.graph.DexType,java.util.Set):750 -> a
-    128:128:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):766:766 -> a
-    129:129:boolean com.android.tools.r8.graph.DexClass.isAnnotation():571:571 -> a
-    129:129:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):767 -> a
-    130:140:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):768:778 -> a
-    141:145:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):776:780 -> a
-    146:146:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):720:720 -> a
-    146:146:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):780 -> a
-    147:147:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isExternalizable(com.android.tools.r8.graph.DexType):368:368 -> a
-    147:147:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):720 -> a
-    147:147:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):780 -> a
-    148:148:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):781:781 -> a
-    149:149:void enqueueRootField(com.android.tools.r8.graph.DexField,java.util.Set):790:790 -> a
-    150:150:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):282:282 -> a
-    150:150:void enqueueRootField(com.android.tools.r8.graph.DexField,java.util.Set):792 -> a
-    151:151:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.toProgramFieldOrNull(com.android.tools.r8.graph.DexEncodedField):291:291 -> a
-    151:151:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):282 -> a
-    151:151:void enqueueRootField(com.android.tools.r8.graph.DexField,java.util.Set):792 -> a
-    152:154:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set,com.android.tools.r8.graph.DexDefinition):805:807 -> a
-    152:154:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set):800 -> a
-    152:154:void enqueueRootField(com.android.tools.r8.graph.DexField,java.util.Set):794 -> a
-    155:155:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set,com.android.tools.r8.graph.DexDefinition):806:806 -> a
-    155:155:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set):800 -> a
-    155:155:void enqueueRootField(com.android.tools.r8.graph.DexField,java.util.Set):794 -> a
-    156:158:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set,com.android.tools.r8.graph.DexDefinition):805:807 -> a
-    156:158:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set):800 -> a
-    156:158:void lambda$traceApplication$53(com.android.tools.r8.com.google.common.collect.ImmutableSet,com.android.tools.r8.graph.ProgramField):3081 -> a
-    159:159:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set,com.android.tools.r8.graph.DexDefinition):806:806 -> a
-    159:159:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set):800 -> a
-    159:159:void lambda$traceApplication$53(com.android.tools.r8.com.google.common.collect.ImmutableSet,com.android.tools.r8.graph.ProgramField):3081 -> a
-    160:164:void enqueueRootMethod(com.android.tools.r8.graph.DexMethod,java.util.Set):813:817 -> a
-    165:165:void enqueueRootMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Set):823:823 -> a
-    165:165:void lambda$traceApplication$52(com.android.tools.r8.com.google.common.collect.ImmutableSet,com.android.tools.r8.graph.ProgramMethod):3080 -> a
-    166:168:void enqueueRootMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.graph.DexDefinition):828:830 -> a
-    169:169:void enqueueRootMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.graph.DexDefinition):829:829 -> a
-    170:173:void internalEnqueueRootItem(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):839:842 -> a
-    170:173:void enqueueDependentMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.ProgramMember,java.util.Set):1925 -> a
-    174:176:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set,com.android.tools.r8.graph.DexDefinition):805:807 -> a
-    174:176:void internalEnqueueRootItem(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):842 -> a
-    174:176:void enqueueDependentMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.ProgramMember,java.util.Set):1925 -> a
-    177:177:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set,com.android.tools.r8.graph.DexDefinition):806:806 -> a
-    177:177:void internalEnqueueRootItem(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):842 -> a
-    177:177:void enqueueDependentMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.ProgramMember,java.util.Set):1925 -> a
-    178:181:void internalEnqueueRootItem(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):843:846 -> a
-    178:181:void enqueueDependentMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.ProgramMember,java.util.Set):1925 -> a
-    182:184:boolean enqueueMarkMethodLiveAction(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):870:872 -> a
-    185:189:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexProgramClass,java.util.Set):880:884 -> a
-    190:193:boolean registerMethodWithTargetAndContext(java.util.function.BiPredicate,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):894:897 -> a
-    194:194:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):903:903 -> a
-    194:194:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1440 -> a
-    195:196:void markFieldAsTargeted(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):2648:2649 -> a
-    195:196:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1445 -> a
-    197:221:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1447:1471 -> a
-    222:222:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    222:222:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1471 -> a
-    223:229:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1476:1482 -> a
-    230:230:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):61:61 -> a
-    230:230:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1483 -> a
-    231:231:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1482:1482 -> a
-    232:233:boolean registerReflectiveFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):919:920 -> a
-    234:265:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):926:957 -> a
-    266:268:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):963:965 -> a
-    269:269:com.android.tools.r8.graph.DexProgramClass getProgramHolderOrNull(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramDefinition):680:680 -> a
-    269:269:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):965 -> a
-    270:290:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):967:987 -> a
-    291:291:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2361:2361 -> a
-    291:291:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):991 -> a
-    292:310:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2368:2386 -> a
-    292:310:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2362 -> a
-    292:310:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):991 -> a
-    311:311:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2363:2363 -> a
-    311:311:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):991 -> a
-    312:312:com.android.tools.r8.shaking.InstantiatedObject com.android.tools.r8.shaking.InstantiatedObject.of(com.android.tools.r8.ir.desugar.LambdaDescriptor):16:16 -> a
-    312:312:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2393 -> a
-    312:312:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):992 -> a
-    313:313:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2394:2394 -> a
-    313:313:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):992 -> a
-    314:314:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2392:2392 -> a
-    314:314:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):992 -> a
-    315:346:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):993:1024 -> a
-    347:347:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):57:57 -> a
-    347:347:void traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1258 -> a
-    347:347:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1012 -> a
-    348:348:void traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1258:1258 -> a
-    348:348:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1012 -> a
-    349:349:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):57:57 -> a
-    349:349:void traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1234 -> a
-    349:349:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1018 -> a
-    350:350:void traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1234:1234 -> a
-    350:350:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1018 -> a
-    351:351:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1021:1021 -> a
-    352:352:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1411:1411 -> a
-    352:352:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1021 -> a
-    353:353:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):57:57 -> a
-    353:353:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1412 -> a
-    353:353:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1021 -> a
-    354:354:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1411:1411 -> a
-    354:354:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1021 -> a
-    355:355:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):57:57 -> a
-    355:355:void traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1365 -> a
-    355:355:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1015 -> a
-    356:356:void traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1365:1365 -> a
-    356:356:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1015 -> a
-    357:357:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):57:57 -> a
-    357:357:void traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1283 -> a
-    357:357:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1009 -> a
-    358:358:void traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1283:1283 -> a
-    358:358:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1009 -> a
-    359:359:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$traceCallSite$3(com.android.tools.r8.graph.DexCallSite):993:993 -> a
-    360:360:void lambda$traceCheckCast$4(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis):1029:1029 -> a
-    361:365:void handleLockCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1047:1051 -> a
-    361:365:void traceConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1037 -> a
-    366:366:void traceConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1038:1038 -> a
-    367:369:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1067:1069 -> a
-    370:372:java.lang.Object com.android.tools.r8.utils.IteratorUtils.nextUntil(java.util.Iterator,java.util.function.Predicate):54:56 -> a
-    370:372:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1069 -> a
-    373:380:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1069:1076 -> a
-    381:381:boolean com.android.tools.r8.cf.code.CfInstruction.isInvoke():0:0 -> a
-    381:381:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1076 -> a
-    382:384:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1077:1079 -> a
-    385:385:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1318:1318 -> a
-    385:385:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1080 -> a
-    386:393:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1080:1087 -> a
-    394:394:boolean lambda$isConstClassMaybeUsedAsLock$5(com.android.tools.r8.code.CfOrDexInstruction):1072:1072 -> a
-    395:395:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
-    395:395:boolean lambda$isConstClassMaybeUsedAsLock$5(com.android.tools.r8.code.CfOrDexInstruction):1072 -> a
-    396:396:boolean lambda$isConstClassMaybeUsedAsLock$5(com.android.tools.r8.code.CfOrDexInstruction):1073:1073 -> a
-    397:397:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
-    397:397:boolean lambda$isConstClassMaybeUsedAsLock$5(com.android.tools.r8.code.CfOrDexInstruction):1073 -> a
-    398:398:com.android.tools.r8.shaking.KeepReason lambda$traceConstClassOrCheckCast$6(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):1103:1103 -> a
-    399:405:com.android.tools.r8.utils.Visibility computeMinimumRequiredVisibilityForInitClassField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1157:1163 -> a
-    406:406:void lambda$traceInstanceOf$7(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInstanceOfAnalysis):1196:1196 -> a
-    407:407:void lambda$traceExceptionGuard$8(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerExceptionGuardAnalysis):1201:1201 -> a
-    408:408:void lambda$traceInvokeDirect$9(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1210:1210 -> a
-    409:415:boolean registerDeferredActionForDeadProtoBuilder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Action):1222:1228 -> a
-    416:416:boolean registerDeferredActionForDeadProtoBuilder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Action):1224:1224 -> a
-    417:417: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):1226:1226 -> a
-    418:418:boolean lambda$registerDeferredActionForDeadProtoBuilder$10(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.Action):1227:1227 -> a
-    419:427:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1239:1247 -> a
-    428:428:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    428:428:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1247 -> a
-    429:430:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1249:1250 -> a
-    431:431:void lambda$traceInvokeDirect$12(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1250:1250 -> a
-    432:432:void lambda$traceNewInstance$17(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1397:1397 -> a
-    433:433: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):1420:1420 -> a
-    434:434:boolean com.android.tools.r8.graph.DexClass.isAnnotation():571:571 -> a
-    434:434: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):1422 -> a
-    435:438: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):1422:1425 -> a
-    439:439: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):1423:1423 -> a
-    440:440:void lambda$traceStaticFieldRead$18(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1564:1564 -> a
-    441:441:java.lang.Boolean lambda$traceStaticFieldRead$19(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1593:1593 -> a
-    442:454:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):1721:1733 -> a
-    455:455:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1737:1737 -> a
-    456:460:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1751:1755 -> a
-    461:461:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isFinalMainDexTracing():199:199 -> a
-    461:461:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1755 -> a
-    462:466:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1755:1755 -> a
-    470:495:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1759:1784 -> a
-    496:502:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1783:1789 -> a
-    503:503:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    503:503:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1789 -> a
-    504:515:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1792:1803 -> a
-    516:524:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):700:708 -> a
-    516:524:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1807 -> a
-    525:542:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):703:720 -> a
-    525:542:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1807 -> a
-    543:543:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):715:715 -> a
-    543:543:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1807 -> a
-    544:563:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1811:1830 -> a
-    564:575:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):852:863 -> a
-    564:575:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1831 -> a
-    576:576:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1834:1834 -> a
-    577:577:boolean com.android.tools.r8.graph.DexClass.isAnnotation():571:571 -> a
-    577:577:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1837 -> a
-    578:589:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1838:1849 -> a
-    590:590:java.util.Set com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentKeepClassCompatRule(com.android.tools.r8.graph.DexType):1533:1533 -> a
-    590:590:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1849 -> a
-    591:594:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1848:1851 -> a
-    595:595:boolean lambda$markTypeAsLive$23(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1840:1840 -> a
-    596:596:void lambda$markTypeAsLive$25(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1851:1851 -> a
-    597:597:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1863:1863 -> a
-    598:600:boolean lambda$ensureMethodsContinueToWidenAccess$27(com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):1865:1867 -> a
-    601:606:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.methodDefinedInInterfaces(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):435:440 -> a
-    601:606:boolean lambda$ensureMethodsContinueToWidenAccess$27(com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):1867 -> a
-    607:607:void lambda$ensureMethodsContinueToWidenAccess$28(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod):1868:1868 -> a
-    608:609:void enqueueHolderWithDependentInstanceConstructor(com.android.tools.r8.graph.ProgramMethod,java.util.Set):1930:1931 -> a
-    610:624:void processAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation):1952:1966 -> a
-    625:625:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.annotatedOn(com.android.tools.r8.graph.DexDefinition):25:25 -> a
-    625:625:void processAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation):1966 -> a
-    626:630:void processAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation):1967:1971 -> a
-    631:663:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2135:2167 -> a
-    664:688:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2172:2196 -> a
-    689:689:boolean com.android.tools.r8.errors.dontwarn.DontWarnConfiguration.matches(com.android.tools.r8.graph.DexClass):30:30 -> a
-    689:689:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2196 -> a
-    690:701:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2201:2212 -> a
-    702:704:void lambda$ensureFromLibraryOrThrow$31(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):2190:2192 -> a
-    705:707:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2224:2226 -> a
-    708:708:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():594:594 -> a
-    708:708:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2227 -> a
-    709:716:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2227:2234 -> a
-    717:719:void lambda$keepClassAndAllMembers$33(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2230:2232 -> a
-    720:722:void lambda$keepClassAndAllMembers$34(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2236:2238 -> a
-    723:723:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2243:2243 -> a
-    723:723:void access$2500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType):173 -> a
-    724:724:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):2258:2258 -> a
-    725:725:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    725:725:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):2259 -> a
-    726:726: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):2303:2303 -> a
-    727:727:boolean com.android.tools.r8.graph.DexClass.isAnnotation():571:571 -> a
-    727:727: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):2303 -> a
-    728:734: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):2303:2309 -> a
-    735:736: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):2338:2339 -> a
-    735:736: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):2312 -> a
-    737:738: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):2316:2317 -> a
-    739:739:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    739:739: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):2317 -> a
-    740:742: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):2320:2322 -> a
-    743:743:boolean com.android.tools.r8.graph.DexClass.isAnnotation():571:571 -> a
-    743:743:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2399 -> a
-    743:743: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):2325 -> a
-    744:745:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2399:2400 -> a
-    744:745: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):2325 -> a
-    746:746:com.android.tools.r8.shaking.InstantiatedObject com.android.tools.r8.shaking.InstantiatedObject.of(com.android.tools.r8.graph.DexProgramClass):12:12 -> a
-    746:746:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2402 -> a
-    746:746: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):2325 -> a
-    747:747:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2402:2402 -> a
-    747:747: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):2325 -> a
-    748:748:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2401:2401 -> a
-    748:748: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):2325 -> a
-    749:758:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2598:2607 -> a
-    749:758: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):2327 -> a
-    759:759:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2611:2611 -> a
-    759:759: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):2329 -> a
-    760:760:boolean com.android.tools.r8.graph.DexClass.isAnnotation():571:571 -> a
-    760:760:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2611 -> a
-    760:760: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):2329 -> a
-    761:763:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2611:2613 -> a
-    761:763: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):2329 -> a
-    764:764:void lambda$processNewlyInstantiatedClass$36(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2310:2310 -> a
-    765:765:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2344:2344 -> a
-    766:766:boolean com.android.tools.r8.graph.DexClass.isAnnotation():571:571 -> a
-    766:766:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2344 -> a
-    767:768:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2344:2345 -> a
-    769:770:void transitionDependentItemsForInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):2617:2618 -> a
-    769:770:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2346 -> a
-    771:802:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,java.util.List):2414:2445 -> a
-    803:803:java.util.Set getReachableVirtualTargets(com.android.tools.r8.graph.DexProgramClass):2450:2450 -> a
-    803:803:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):2458 -> a
-    804:821:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):2458:2475 -> a
-    822:822:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):2474:2474 -> a
-    823:827:void markLiveOverrides(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):2489:2493 -> a
-    828:828:void markLiveOverrides(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):2492:2492 -> a
-    829:840:void markLiveOverrides(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):2490:2501 -> a
-    841:843: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):555:557 -> a
-    841:843:void markLiveOverrides(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):2501 -> a
-    844:844:void markLiveOverrides(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):2503:2503 -> a
-    845:847:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markLiveOverrides$37(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):2506:2506 -> a
-    848:860:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2513:2525 -> a
-    861:869:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2524:2532 -> a
-    870:870:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
-    870:870:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2532 -> a
-    871:875:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2532:2536 -> a
-    876:882:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2535:2541 -> a
-    883:883:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2538:2538 -> a
-    884:884:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):2550:2550 -> a
-    885:927:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):3952:3994 -> a
-    885:927:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):2554 -> a
-    928:933:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):2557:2562 -> a
-    934:934:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
-    934:934:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):2562 -> a
-    935:935:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):2565:2565 -> a
-    936:936:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):2564:2564 -> a
-    937:937: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):2560:2560 -> a
-    938:949:void markOverridesAsLibraryMethodOverrides(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):2571:2582 -> a
-    950:952:void lambda$markOverridesAsLibraryMethodOverrides$39(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexType):2584:2586 -> a
-    953:956:void markInstanceFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2690:2693 -> a
-    957:957:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    957:957:void markInstanceFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2693 -> a
-    958:967:void markInstanceFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2695:2704 -> a
-    968:968:void lambda$markInstanceFieldAsLive$41(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2704:2704 -> a
-    969:974:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2708:2713 -> a
-    975:977:boolean verifyMethodIsTargeted(com.android.tools.r8.graph.ProgramMethod):1693:1695 -> a
-    975:977:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2713 -> a
-    978:978:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2714:2714 -> a
-    979:979:boolean verifyTypeIsLive(com.android.tools.r8.graph.DexProgramClass):1700:1700 -> a
-    979:979:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2714 -> a
-    980:981:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2715:2716 -> a
-    982:982:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    982:982:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2716 -> a
-    983:983:boolean isFieldLive(com.android.tools.r8.graph.ProgramField):2739:2739 -> a
-    984:984:boolean isFieldLive(com.android.tools.r8.graph.DexEncodedField):2743:2743 -> a
-    985:986:boolean isFieldWrittenInMethodSatisfying(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):2753:2754 -> a
-    987:988:boolean isMemberLive(com.android.tools.r8.graph.DexEncodedMember):2769:2770 -> a
-    989:989:boolean com.android.tools.r8.graph.DexDefinition.isDexEncodedField():0:0 -> a
-    989:989:boolean isMemberLive(com.android.tools.r8.graph.DexEncodedMember):2770 -> a
-    990:991:boolean isMemberLive(com.android.tools.r8.graph.DexEncodedMember):2771:2772 -> a
-    992:992:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):2776:2776 -> a
-    993:993:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):2790:2790 -> a
-    993:993:void lambda$addConsequentRootSet$65(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3789 -> a
-    994:998:void lambda$addConsequentRootSet$65(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3790:3794 -> a
-    999:1000:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl.isInstantiatedDirectlyOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):92:93 -> a
-    999:1000:void lambda$addConsequentRootSet$65(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3794 -> a
-    1001:1004:void lambda$addConsequentRootSet$65(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3796:3799 -> a
-    1005:1005:java.util.Set com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentKeepClassCompatRule(com.android.tools.r8.graph.DexType):1533:1533 -> a
-    1005:1005:void lambda$addConsequentRootSet$65(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3800 -> a
-    1006:1006:void lambda$addConsequentRootSet$65(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3799:3799 -> a
-    1007:1007:void forAllLiveClasses(java.util.function.Consumer):2799:2799 -> a
-    1008:1024:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2831:2847 -> a
-    1025:1026:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,boolean):2001:2002 -> a
-    1025:1026:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2851 -> a
-    1027:1028:com.android.tools.r8.graph.ResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveMethod(com.android.tools.r8.graph.DexMethod,boolean):599:600 -> a
-    1027:1028:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,boolean):2002 -> a
-    1027:1028:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2851 -> a
-    1029:1032:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,boolean):2003:2006 -> a
-    1029:1032:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2851 -> a
-    1033:1036:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,boolean):2005:2008 -> a
-    1033:1036:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2851 -> a
-    1037:1037:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2856:2856 -> a
-    1038:1038:java.util.Set getReachableVirtualTargets(com.android.tools.r8.graph.DexProgramClass):2450:2450 -> a
-    1038:1038:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2865 -> a
-    1039:1045:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2865:2871 -> a
-    1046:1046:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    1046:1046:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2871 -> a
-    1047:1068:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2876:2897 -> a
-    1069:1069:void lambda$markVirtualMethodAsReachable$44(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):2894:2894 -> a
-    1070:1070:boolean lambda$markVirtualMethodAsReachable$45(com.android.tools.r8.graph.DexDefinition):2896:2896 -> a
-    1071:1071:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier):133:133 -> a
-    1071:1071:boolean lambda$markVirtualMethodAsReachable$45(com.android.tools.r8.graph.DexDefinition):2896 -> a
-    1072:1072:void lambda$markVirtualMethodAsReachable$47(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.LookupTarget):2899:2899 -> a
-    1073:1073:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markVirtualMethodAsReachable$46(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):2902:2902 -> a
-    1074:1075:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget,java.util.function.Function):2908:2909 -> a
-    1076:1078:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.DexClassAndMethod,java.util.function.Function):2918:2920 -> a
-    1076:1078:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget,java.util.function.Function):2909 -> a
-    1079:1080:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget,java.util.function.Function):2911:2912 -> a
-    1081:1084:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupLambdaTarget,java.util.function.Function):2926:2929 -> a
-    1081:1084:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget,java.util.function.Function):2912 -> a
-    1085:1085:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupLambdaTarget,java.util.function.Function):2928:2928 -> a
-    1085:1085:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget,java.util.function.Function):2912 -> a
-    1086:1087:void markFailedMethodResolutionTargets(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2938:2939 -> a
-    1088:1091:void lambda$markFailedMethodResolutionTargets$48(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod):2941:2944 -> a
-    1092:1092:void lambda$markEnumValuesAsReachable$49(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):2967:2967 -> a
-    1093:1097:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3034:3038 -> a
-    1098:1098:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):492:492 -> a
-    1098:1098:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3038 -> a
-    1099:1101:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3042:3044 -> a
-    1102:1102:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):492:492 -> a
-    1102:1102:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3044 -> a
-    1103:1105:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3046:3048 -> a
-    1106:1106:com.android.tools.r8.shaking.Enqueuer registerInvokeAnalysis(com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):497:497 -> a
-    1106:1106:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3047 -> a
-    1107:1107:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3052:3052 -> a
-    1108:1108:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():558:558 -> a
-    1108:1108:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3052 -> a
-    1109:1132:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3052:3075 -> a
-    1133:1133:boolean com.android.tools.r8.synthesis.SyntheticItems.isNonLegacySynthetic(com.android.tools.r8.graph.DexProgramClass):213:213 -> a
-    1133:1133:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3075 -> a
-    1134:1135:void enqueueRootClass(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):760:761 -> a
-    1134:1135:void enqueueRootClass(com.android.tools.r8.graph.DexProgramClass,java.util.Set):755 -> a
-    1134:1135:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3079 -> a
-    1136:1137:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3080:3081 -> a
-    1138:1155:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3068:3085 -> a
-    1156:1159:void finalizeLibraryMethodOverrideInformation():3427:3430 -> a
-    1156:1159:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3086 -> a
-    1160:1161:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3087:3088 -> a
-    1162:1164:boolean verifyKeptGraph():3437:3439 -> a
-    1162:1164:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3088 -> a
-    1165:1170:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3089:3094 -> a
-    1171:1171:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isWhyAreYouKeeping():207:207 -> a
-    1171:1171:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3094 -> a
-    1172:1174:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3099:3101 -> a
-    1175:1176:void lambda$traceApplication$51(com.android.tools.r8.graph.DexReference,java.util.List):3062:3063 -> a
-    1177:1177:void lambda$traceApplication$54(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3087:3087 -> a
-    1178:1178:void lambda$keepClassWithRules$55(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3111:3111 -> a
-    1179:1179:void lambda$keepMethodWithRules$56(com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3115:3115 -> a
-    1180:1180:void keepFieldWithRules(com.android.tools.r8.graph.ProgramField,java.util.Set):3119:3119 -> a
-    1181:1181:void lambda$keepFieldWithRules$57(com.android.tools.r8.graph.ProgramField,java.util.Set,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3119:3119 -> a
-    1182:1184:void applyKeepRules(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.shaking.KeepInfo$Joiner):3126:3128 -> a
-    1185:1185:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isProguardIfRule():0:0 -> a
-    1185:1185:void applyKeepRules(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.shaking.KeepInfo$Joiner):3128 -> a
-    1186:1186:void applyKeepRules(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.shaking.KeepInfo$Joiner):3128:3128 -> a
-    1187:1187:com.android.tools.r8.shaking.ProguardKeepRule com.android.tools.r8.shaking.ProguardIfRule.getSubsequentRule():42:42 -> a
-    1187:1187:void applyKeepRules(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.shaking.KeepInfo$Joiner):3128 -> a
-    1188:1192:void applyKeepRules(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.shaking.KeepInfo$Joiner):3129:3133 -> a
-    1193:1193:boolean com.android.tools.r8.graph.AccessFlags.isPackagePrivateOrProtected():145:145 -> a
-    1193:1193:void applyKeepRules(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.shaking.KeepInfo$Joiner):3133 -> a
-    1194:1201:void applyKeepRules(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.shaking.KeepInfo$Joiner):3134:3141 -> a
-    1202:1202:com.android.tools.r8.graph.DexApplication lambda$synthesize$58(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.graph.DexApplication):3296:3296 -> a
-    1203:1205:void com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions.amendApplication(com.android.tools.r8.graph.DirectMappedDexApplication$Builder):3208:3210 -> a
-    1203:1205:com.android.tools.r8.graph.DexApplication lambda$synthesize$58(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.graph.DexApplication):3297 -> a
-    1206:1206:com.android.tools.r8.graph.DexApplication lambda$synthesize$58(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.graph.DexApplication):3298:3298 -> a
-    1207:1209:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3310:3312 -> a
-    1210:1219:void desugar(com.android.tools.r8.graph.ProgramMethod):3316:3325 -> a
-    1220:1231:void desugar(com.android.tools.r8.graph.ProgramMethod):3321:3332 -> a
-    1232:1250:void desugar(com.android.tools.r8.graph.ProgramMethod):3331:3349 -> a
-    1251:1253:java.util.List lambda$desugar$59(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.code.CfInstruction):3336:3338 -> a
-    1254:1285:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3450:3481 -> a
-    1286:1286:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    1286:1286:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3481 -> a
-    1287:1287:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3482:3482 -> a
-    1288:1288:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
-    1288:1288:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3483 -> a
-    1289:1311:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3484:3506 -> a
-    1312:1312:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():451:451 -> a
-    1312:1312:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3506 -> a
-    1313:1327:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3506:3520 -> a
-    1328:1333:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):3680:3685 -> a
-    1328:1333:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3541 -> a
-    1334:1338:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3542:3546 -> a
-    1339:1339:void lambda$createAppInfo$60(java.util.Set,com.android.tools.r8.graph.DexProgramClass):3456:3456 -> a
-    1340:1340:boolean lambda$createAppInfo$61(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):3462:3462 -> a
-    1341:1353:void lambda$ensureLambdaAccessibility$62(com.android.tools.r8.ir.desugar.LambdaClass):3558:3570 -> a
-    1354:1354:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.fakeReportShouldNotBeUsed():73:73 -> a
-    1354:1354:void lambda$ensureLambdaAccessibility$62(com.android.tools.r8.ir.desugar.LambdaClass):3570 -> a
-    1355:1355:void lambda$ensureLambdaAccessibility$62(com.android.tools.r8.ir.desugar.LambdaClass):3570:3570 -> a
-    1356:1362:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3586:3592 -> a
-    1363:1374:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3622:3633 -> a
-    1363:1374:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3592 -> a
-    1375:1375:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2780:2780 -> a
-    1375:1375:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3633 -> a
-    1375:1375:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3592 -> a
-    1376:1376:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3634:3634 -> a
-    1376:1376:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3592 -> a
-    1377:1379:boolean verifyReferencedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3642:3644 -> a
-    1377:1379:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3634 -> a
-    1377:1379:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3592 -> a
-    1380:1396:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3599:3615 -> a
-    1397:1399:void rewriteLambdaCallSites(com.android.tools.r8.graph.ProgramMethod,java.util.Map):3664:3666 -> a
-    1400:1422:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3691:3713 -> a
-    1423:1423:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSetBuilder com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet.builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.Enqueuer):2193:2193 -> a
-    1423:1423:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3714 -> a
-    1424:1483:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3715:3774 -> a
-    1484:1484:java.util.Set lambda$trace$63(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):3710:3710 -> a
-    1485:1485:void lambda$trace$64(com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3742:3742 -> a
-    1486:1486:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,boolean):3786:3786 -> a
-    1487:1488:void com.android.tools.r8.shaking.RootSetUtils$RootSetBase.forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):1433:1434 -> a
-    1487:1488:void com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet.forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):2163 -> a
-    1487:1488:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,boolean):3786 -> a
-    1489:1489:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
-    1489:1489:void com.android.tools.r8.shaking.RootSetUtils$RootSetBase.forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):1434 -> a
-    1489:1489:void com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet.forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):2163 -> a
-    1489:1489:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,boolean):3786 -> a
-    1490:1493:void com.android.tools.r8.shaking.RootSetUtils$RootSetBase.forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):1435:1438 -> a
-    1490:1493:void com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet.forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):2163 -> a
-    1490:1493:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,boolean):3786 -> a
-    1494:1519:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,boolean):3803:3828 -> a
-    1520:1520:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachClass(java.util.function.Consumer):1670:1670 -> a
-    1520:1520:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachReference(java.util.function.Consumer):1664 -> a
-    1520:1520:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,boolean):3828 -> a
-    1521:1521:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachField(java.util.function.Consumer):1680:1680 -> a
-    1521:1521:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachMember(java.util.function.Consumer):1690 -> a
-    1521:1521:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachReference(java.util.function.Consumer):1665 -> a
-    1521:1521:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,boolean):3828 -> a
-    1522:1522:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachMethod(java.util.function.Consumer):1703:1703 -> a
-    1522:1522:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachMember(java.util.function.Consumer):1691 -> a
-    1522:1522:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachReference(java.util.function.Consumer):1665 -> a
-    1522:1522:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,boolean):3828 -> a
-    1523:1526:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,boolean):3831:3834 -> a
-    1527:1528:void lambda$addConsequentRootSet$66(com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.shaking.RootSetUtils$ItemsWithRules):3806:3807 -> a
-    1529:1530:void lambda$addConsequentRootSet$68(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules):3812:3813 -> a
-    1531:1531:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachClass(java.util.function.Consumer):1670:1670 -> a
-    1531:1531:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachReference(java.util.function.Consumer):1664 -> a
-    1531:1531:void lambda$addConsequentRootSet$68(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules):3813 -> a
-    1532:1532:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachField(java.util.function.Consumer):1680:1680 -> a
-    1532:1532:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachMember(java.util.function.Consumer):1690 -> a
-    1532:1532:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachReference(java.util.function.Consumer):1665 -> a
-    1532:1532:void lambda$addConsequentRootSet$68(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules):3813 -> a
-    1533:1533:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachMethod(java.util.function.Consumer):1703:1703 -> a
-    1533:1533:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachMember(java.util.function.Consumer):1691 -> a
-    1533:1533:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachReference(java.util.function.Consumer):1665 -> a
-    1533:1533:void lambda$addConsequentRootSet$68(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules):3813 -> a
-    1534:1534:boolean isLiveProgramReference(com.android.tools.r8.graph.DexReference):3845:3845 -> a
-    1535:1535:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
-    1535:1535:boolean isLiveProgramReference(com.android.tools.r8.graph.DexReference):3845 -> a
-    1536:1536:boolean isLiveProgramReference(com.android.tools.r8.graph.DexReference):3847:3847 -> a
-    1537:1537:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):2790:2790 -> a
-    1537:1537:boolean isLiveProgramReference(com.android.tools.r8.graph.DexReference):3848 -> a
-    1538:1542:boolean isLiveProgramReference(com.android.tools.r8.graph.DexReference):3850:3854 -> a
-    1543:1545:void retainAnnotationForFinalTreeShaking(java.util.List):3900:3902 -> a
-    1546:1546:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):3944:3944 -> a
-    1547:1547:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():209:209 -> a
-    1547:1547:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):3944 -> a
-    1548:1550:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):3945:3947 -> a
-    1551:1559:java.util.Set getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexProgramClass):4003:4011 -> a
-    1560:1573:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4019:4032 -> a
-    1574:1574:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    1574:1574:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4032 -> a
-    1575:1575:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):41:41 -> a
-    1575:1575:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4034 -> a
-    1576:1576:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4034:4034 -> a
-    1577:1577:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):41:41 -> a
-    1577:1577:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4035 -> a
-    1578:1583:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4035:4040 -> a
-    1584:1584:com.android.tools.r8.shaking.Enqueuer$Mode getMode():472:472 -> a
-    1584:1584:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4055 -> a
-    1584:1584:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4043 -> a
-    1585:1587:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4055:4057 -> a
-    1585:1587:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4043 -> a
-    1588:1588:void traceCode(com.android.tools.r8.graph.ProgramMethod):4066:4066 -> a
-    1588:1588:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4062 -> a
-    1588:1588:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4043 -> a
-    1589:1594:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4046:4051 -> a
-    1595:1595:void lambda$markMethodAsLive$71(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexAnnotation):4041:4041 -> a
-    1596:1596:void lambda$markMethodAsLive$72(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):4051:4051 -> a
-    1597:1607:void checkMemberForSoftPinning(com.android.tools.r8.graph.ProgramMember):4070:4080 -> a
-    1608:1610:void checkMemberForSoftPinning(com.android.tools.r8.graph.ProgramMember):4079:4081 -> a
-    1611:1611:boolean lambda$checkMemberForSoftPinning$73(com.android.tools.r8.shaking.ProguardKeepRuleBase):4073:4073 -> a
-    1612:1623:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4108:4119 -> a
-    1624:1624:boolean com.android.tools.r8.graph.DexClass.isAnnotation():571:571 -> a
-    1624:1624:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4120 -> a
-    1625:1635:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4121:4131 -> a
-    1636:1636:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4128:4128 -> a
-    1637:1643:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4150:4156 -> a
-    1644:1651:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4258:4265 -> a
-    1644:1651:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4157 -> a
-    1652:1664:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4264:4276 -> a
-    1652:1664:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4157 -> a
-    1665:1665:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> a
-    1665:1665:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4278 -> a
-    1665:1665:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4157 -> a
-    1666:1668:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4279:4281 -> a
-    1666:1668:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4157 -> a
-    1669:1669:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4160:4160 -> a
-    1670:1691:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4288:4309 -> a
-    1670:1691:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4161 -> a
-    1692:1705:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4308:4321 -> a
-    1692:1705:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4161 -> a
-    1706:1706:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> a
-    1706:1706:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4321 -> a
-    1706:1706:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4161 -> a
-    1707:1755:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4326:4374 -> a
-    1707:1755:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4161 -> a
-    1756:1756:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> a
-    1756:1756:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4379 -> a
-    1756:1756:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4161 -> a
-    1757:1759:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4380:4382 -> a
-    1757:1759:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4161 -> a
-    1760:1760:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4164:4164 -> a
-    1761:1764:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4439:4442 -> a
-    1761:1764:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4165 -> a
-    1765:1765:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):53:53 -> a
-    1765:1765:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4443 -> a
-    1765:1765:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4165 -> a
-    1766:1766: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 -> a
-    1766:1766:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):53 -> a
-    1766:1766:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4443 -> a
-    1766:1766:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4165 -> a
-    1767:1767:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4443:4443 -> a
-    1767:1767:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4165 -> a
-    1768:1772:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4168:4172 -> a
-    1773:1779:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4449:4455 -> a
-    1773:1779:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4173 -> a
-    1780:1780:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
-    1780:1780:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4455 -> a
-    1780:1780:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4173 -> a
-    1781:1792:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4456:4467 -> a
-    1781:1792:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4173 -> a
-    1793:1793:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4460:4460 -> a
-    1793:1793:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4173 -> a
-    1794:1794:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> a
-    1794:1794:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4472 -> a
-    1794:1794:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4173 -> a
-    1795:1795:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4472:4472 -> a
-    1795:1795:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4173 -> a
-    1796:1796:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> a
-    1796:1796:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4474 -> a
-    1796:1796:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4173 -> a
-    1797:1798:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4475:4476 -> a
-    1797:1798:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4173 -> a
-    1799:1808:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4176:4185 -> a
-    1809:1809:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
-    1809:1809:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4185 -> a
-    1810:1814:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4186:4190 -> a
-    1815:1815:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> a
-    1815:1815:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4194 -> a
-    1816:1816:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4194:4194 -> a
-    1817:1817:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():563:563 -> a
-    1817:1817:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4195 -> a
-    1818:1818:boolean com.android.tools.r8.graph.DexClass.isAnnotation():571:571 -> a
-    1818:1818:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():563 -> a
-    1818:1818:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4195 -> a
-    1819:1819:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():563:563 -> a
-    1819:1819:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4195 -> a
-    1820:1837:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4195:4212 -> a
-    1838:1838:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():209:209 -> a
-    1838:1838:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4222 -> a
-    1839:1842:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4222:4225 -> a
-    1843:1843:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> a
-    1843:1843:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4226 -> a
-    1844:1849:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4225:4230 -> a
-    1850:1850:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> a
-    1850:1850:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4231 -> a
-    1851:1865:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4231:4245 -> a
-    1866:1866:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> a
-    1866:1866:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4246 -> a
-    1867:1871:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4247:4251 -> a
-    1872:1873:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4248:4249 -> a
-    1874:1880:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4392:4398 -> a
-    1881:1881:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> a
-    1881:1881:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4398 -> a
-    1882:1898:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4403:4419 -> a
-    1899:1899:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> a
-    1899:1899:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4420 -> a
-    1900:1904:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4421:4425 -> a
-    1905:1905:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):249:249 -> a
-    1905:1905:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4425 -> a
-    1906:1907:void lambda$handleJavaLangReflectProxyNewProxyInstance$76(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod):4427:4428 -> a
-    1908:1919:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4483:4494 -> a
+    53:53:void reportMissingField(com.android.tools.r8.graph.DexField):2143 -> a
+    53:53:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):1861 -> a
+    54:54:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):541:541 -> a
+    55:61:com.android.tools.r8.graph.DexClass internalDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition,java.util.function.Consumer):551:557 -> a
+    55:61:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition,java.util.function.Consumer):546 -> a
+    62:70:void addLiveNonProgramType(com.android.tools.r8.graph.DexClass):567:575 -> a
+    71:72:void processNewLiveNonProgramType(com.android.tools.r8.graph.DexClass,java.util.Deque):581:582 -> a
+    71:72:void addLiveNonProgramType(com.android.tools.r8.graph.DexClass):576 -> a
+    73:73:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    73:73:void processNewLiveNonProgramType(com.android.tools.r8.graph.DexClass,java.util.Deque):582 -> a
+    73:73:void addLiveNonProgramType(com.android.tools.r8.graph.DexClass):576 -> a
+    74:76:void processNewLiveNonProgramType(com.android.tools.r8.graph.DexClass,java.util.Deque):584:586 -> a
+    74:76:void addLiveNonProgramType(com.android.tools.r8.graph.DexClass):576 -> a
+    77:81:void warnIfLibraryTypeInheritsFromProgramType(com.android.tools.r8.graph.DexLibraryClass):638:642 -> a
+    77:81:void processNewLiveNonProgramType(com.android.tools.r8.graph.DexClass,java.util.Deque):586 -> a
+    77:81:void addLiveNonProgramType(com.android.tools.r8.graph.DexClass):576 -> a
+    82:92:void processNewLiveNonProgramType(com.android.tools.r8.graph.DexClass,java.util.Deque):588:598 -> a
+    82:92:void addLiveNonProgramType(com.android.tools.r8.graph.DexClass):576 -> a
+    93:99:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,java.util.Deque):603:609 -> a
+    100:100:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    100:100:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,java.util.Deque):609 -> a
+    101:107:void reportMissingClass(com.android.tools.r8.graph.DexType):2125:2125 -> a
+    101:107:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,java.util.Deque):611 -> a
+    113:114:void reportMissingClass(com.android.tools.r8.graph.DexType):2131:2132 -> a
+    113:114:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,java.util.Deque):611 -> a
+    115:118:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,java.util.Deque):614:617 -> a
+    119:119:void enqueueRootItems(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):674:674 -> a
+    120:120:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachField(java.util.function.BiConsumer):1629:1629 -> a
+    120:120:void enqueueRootItems(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):674 -> a
+    121:121:void enqueueRootItems(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):675:675 -> a
+    122:122:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMethod(java.util.function.BiConsumer):1652:1652 -> a
+    122:122:void enqueueRootItems(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):675 -> a
+    123:123:void enqueueRootItems(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):676:676 -> a
+    124:124:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachClass(java.util.function.BiConsumer):1619:1619 -> a
+    124:124:void enqueueRootItems(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):676 -> a
+    125:125:void enqueueRootClass(com.android.tools.r8.graph.DexType,java.util.Set):695:695 -> a
+    126:126:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    126:126:void enqueueRootClass(com.android.tools.r8.graph.DexType,java.util.Set):695 -> a
+    127:127:void enqueueRootClass(com.android.tools.r8.graph.DexType,java.util.Set):695:695 -> a
+    128:129:void enqueueRootClass(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):707:708 -> a
+    128:129:void enqueueRootClass(com.android.tools.r8.graph.DexProgramClass,java.util.Set):702 -> a
+    128:129:void enqueueRootClass(com.android.tools.r8.graph.DexType,java.util.Set):697 -> a
+    130:130:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):713:713 -> a
+    131:131:boolean com.android.tools.r8.graph.DexClass.isAnnotation():553:553 -> a
+    131:131:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):714 -> a
+    132:142:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):715:725 -> a
+    143:147:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):723:727 -> a
+    148:148:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):702:702 -> a
+    148:148:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):727 -> a
+    149:149:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isExternalizable(com.android.tools.r8.graph.DexType):318:318 -> a
+    149:149:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):702 -> a
+    149:149:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):727 -> a
+    150:150:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):728:728 -> a
+    151:151:void enqueueRootField(com.android.tools.r8.graph.DexField,java.util.Set):737:737 -> a
+    152:152:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):232:232 -> a
+    152:152:void enqueueRootField(com.android.tools.r8.graph.DexField,java.util.Set):739 -> a
+    153:153:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.toProgramFieldOrNull(com.android.tools.r8.graph.DexEncodedField):241:241 -> a
+    153:153:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):232 -> a
+    153:153:void enqueueRootField(com.android.tools.r8.graph.DexField,java.util.Set):739 -> a
+    154:156:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set,com.android.tools.r8.graph.DexDefinition):752:754 -> a
+    154:156:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set):747 -> a
+    154:156:void enqueueRootField(com.android.tools.r8.graph.DexField,java.util.Set):741 -> a
+    157:157:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set,com.android.tools.r8.graph.DexDefinition):753:753 -> a
+    157:157:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set):747 -> a
+    157:157:void enqueueRootField(com.android.tools.r8.graph.DexField,java.util.Set):741 -> a
+    158:160:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set,com.android.tools.r8.graph.DexDefinition):752:754 -> a
+    158:160:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set):747 -> a
+    158:160:void lambda$traceApplication$51(com.android.tools.r8.com.google.common.collect.ImmutableSet,com.android.tools.r8.graph.ProgramField):2953 -> a
+    161:161:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set,com.android.tools.r8.graph.DexDefinition):753:753 -> a
+    161:161:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set):747 -> a
+    161:161:void lambda$traceApplication$51(com.android.tools.r8.com.google.common.collect.ImmutableSet,com.android.tools.r8.graph.ProgramField):2953 -> a
+    162:166:void enqueueRootMethod(com.android.tools.r8.graph.DexMethod,java.util.Set):760:764 -> a
+    167:167:void enqueueRootMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Set):770:770 -> a
+    167:167:void lambda$traceApplication$50(com.android.tools.r8.com.google.common.collect.ImmutableSet,com.android.tools.r8.graph.ProgramMethod):2952 -> a
+    168:170:void enqueueRootMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.graph.DexDefinition):775:777 -> a
+    171:171:void enqueueRootMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.graph.DexDefinition):776:776 -> a
+    172:175:void internalEnqueueRootItem(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):786:789 -> a
+    172:175:void enqueueDependentMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.ProgramMember,java.util.Set):1807 -> a
+    176:178:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set,com.android.tools.r8.graph.DexDefinition):752:754 -> a
+    176:178:void internalEnqueueRootItem(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):789 -> a
+    176:178:void enqueueDependentMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.ProgramMember,java.util.Set):1807 -> a
+    179:179:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set,com.android.tools.r8.graph.DexDefinition):753:753 -> a
+    179:179:void internalEnqueueRootItem(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):789 -> a
+    179:179:void enqueueDependentMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.ProgramMember,java.util.Set):1807 -> a
+    180:183:void internalEnqueueRootItem(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):790:793 -> a
+    180:183:void enqueueDependentMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.ProgramMember,java.util.Set):1807 -> a
+    184:186:boolean enqueueMarkMethodLiveAction(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):817:819 -> a
+    187:191:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexProgramClass,java.util.Set):827:831 -> a
+    192:195:boolean registerMethodWithTargetAndContext(java.util.function.BiPredicate,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):841:844 -> a
+    196:196:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):850:850 -> a
+    196:196:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1371 -> a
+    197:198:void markFieldAsTargeted(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):2522:2523 -> a
+    197:198:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1376 -> a
+    199:217:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1378:1396 -> a
+    218:218:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    218:218:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1396 -> a
+    219:225:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1401:1407 -> a
+    226:226:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):61:61 -> a
+    226:226:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1408 -> a
+    227:227:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1407:1407 -> a
+    228:229:boolean registerReflectiveFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):866:867 -> a
+    230:261:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):873:904 -> a
+    262:263:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):908:909 -> a
+    264:264:com.android.tools.r8.graph.DexProgramClass getProgramHolderOrNull(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramDefinition):627:627 -> a
+    264:264:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):909 -> a
+    265:284:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):911:930 -> a
+    285:285:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2239:2239 -> a
+    285:285:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):934 -> a
+    286:301:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2246:2261 -> a
+    286:301:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2240 -> a
+    286:301:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):934 -> a
+    302:302:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2241:2241 -> a
+    302:302:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):934 -> a
+    303:303:com.android.tools.r8.shaking.InstantiatedObject com.android.tools.r8.shaking.InstantiatedObject.of(com.android.tools.r8.ir.desugar.LambdaDescriptor):16:16 -> a
+    303:303:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2267 -> a
+    303:303:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):935 -> a
+    304:304:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2268:2268 -> a
+    304:304:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):935 -> a
+    305:305:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2266:2266 -> a
+    305:305:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):935 -> a
+    306:337:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):936:967 -> a
+    338:338:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):57:57 -> a
+    338:338:void traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1201 -> a
+    338:338:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):955 -> a
+    339:339:void traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1201:1201 -> a
+    339:339:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):955 -> a
+    340:340:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):57:57 -> a
+    340:340:void traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1177 -> a
+    340:340:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):961 -> a
+    341:341:void traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1177:1177 -> a
+    341:341:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):961 -> a
+    342:342:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):964:964 -> a
+    343:343:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1342:1342 -> a
+    343:343:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):964 -> a
+    344:344:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):57:57 -> a
+    344:344:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1343 -> a
+    344:344:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):964 -> a
+    345:345:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1342:1342 -> a
+    345:345:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):964 -> a
+    346:346:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):57:57 -> a
+    346:346:void traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1296 -> a
+    346:346:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):958 -> a
+    347:347:void traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1296:1296 -> a
+    347:347:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):958 -> a
+    348:348:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):57:57 -> a
+    348:348:void traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1226 -> a
+    348:348:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):952 -> a
+    349:349:void traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1226:1226 -> a
+    349:349:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):952 -> a
+    350:350:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$traceCallSite$3(com.android.tools.r8.graph.DexCallSite):936:936 -> a
+    351:351:void lambda$traceCheckCast$4(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis):972:972 -> a
+    352:356:void handleLockCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):990:994 -> a
+    352:356:void traceConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):980 -> a
+    357:357:void traceConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):981:981 -> a
+    358:360:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1010:1012 -> a
+    361:363:java.lang.Object com.android.tools.r8.utils.IteratorUtils.nextUntil(java.util.Iterator,java.util.function.Predicate):54:56 -> a
+    361:363:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1012 -> a
+    364:371:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1012:1019 -> a
+    372:372:boolean com.android.tools.r8.cf.code.CfInstruction.isInvoke():0:0 -> a
+    372:372:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1019 -> a
+    373:375:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1020:1022 -> a
+    376:376:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1295:1295 -> a
+    376:376:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1023 -> a
+    377:384:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1023:1030 -> a
+    385:385:boolean lambda$isConstClassMaybeUsedAsLock$5(com.android.tools.r8.code.CfOrDexInstruction):1015:1015 -> a
+    386:386:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
+    386:386:boolean lambda$isConstClassMaybeUsedAsLock$5(com.android.tools.r8.code.CfOrDexInstruction):1015 -> a
+    387:387:boolean lambda$isConstClassMaybeUsedAsLock$5(com.android.tools.r8.code.CfOrDexInstruction):1016:1016 -> a
+    388:388:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
+    388:388:boolean lambda$isConstClassMaybeUsedAsLock$5(com.android.tools.r8.code.CfOrDexInstruction):1016 -> a
+    389:395:com.android.tools.r8.utils.Visibility computeMinimumRequiredVisibilityForInitClassField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1100:1106 -> a
+    396:396:void lambda$traceInstanceOf$6(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInstanceOfAnalysis):1139:1139 -> a
+    397:397:void lambda$traceExceptionGuard$7(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerExceptionGuardAnalysis):1144:1144 -> a
+    398:398:void lambda$traceInvokeDirect$8(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1153:1153 -> a
+    399:405:boolean registerDeferredActionForDeadProtoBuilder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Action):1165:1171 -> a
+    406:406:boolean registerDeferredActionForDeadProtoBuilder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Action):1167:1167 -> a
+    407:407: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):1169:1169 -> a
+    408:408:boolean lambda$registerDeferredActionForDeadProtoBuilder$9(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.Action):1170:1170 -> a
+    409:417:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1182:1190 -> a
+    418:418:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    418:418:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1190 -> a
+    419:420:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1192:1193 -> a
+    421:421:void lambda$traceInvokeDirect$11(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1193:1193 -> a
+    422:422:void lambda$traceNewInstance$16(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1328:1328 -> a
+    423:423: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):1351:1351 -> a
+    424:424:boolean com.android.tools.r8.graph.DexClass.isAnnotation():553:553 -> a
+    424:424: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):1353 -> a
+    425:428: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):1353:1356 -> a
+    429:429: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):1354:1354 -> a
+    430:430:void lambda$traceStaticFieldRead$17(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1483:1483 -> a
+    431:431:java.lang.Boolean lambda$traceStaticFieldRead$18(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1506:1506 -> a
+    432:444:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):1628:1640 -> a
+    445:445:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1644:1644 -> a
+    446:466:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1658:1678 -> a
+    467:467:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    467:467:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1678 -> a
+    468:479:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1681:1692 -> a
+    480:488:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):647:655 -> a
+    480:488:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1696 -> a
+    489:506:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):650:667 -> a
+    489:506:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1696 -> a
+    507:507:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):662:662 -> a
+    507:507:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1696 -> a
+    508:527:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1700:1719 -> a
+    528:539:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):799:810 -> a
+    528:539:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1720 -> a
+    540:540:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1723:1723 -> a
+    541:541:boolean com.android.tools.r8.graph.DexClass.isAnnotation():553:553 -> a
+    541:541:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1726 -> a
+    542:553:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1727:1738 -> a
+    554:554:java.util.Set com.android.tools.r8.shaking.RootSetBuilder$RootSetBase.getDependentKeepClassCompatRule(com.android.tools.r8.graph.DexType):1477:1477 -> a
+    554:554:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1738 -> a
+    555:558:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1737:1740 -> a
+    559:559:boolean lambda$markTypeAsLive$22(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1729:1729 -> a
+    560:560:void lambda$markTypeAsLive$24(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1740:1740 -> a
+    561:561:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1752:1752 -> a
+    562:564:boolean lambda$ensureMethodsContinueToWidenAccess$26(com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):1754:1756 -> a
+    565:570:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.methodDefinedInInterfaces(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):385:390 -> a
+    565:570:boolean lambda$ensureMethodsContinueToWidenAccess$26(com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):1756 -> a
+    571:571:void lambda$ensureMethodsContinueToWidenAccess$27(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod):1757:1757 -> a
+    572:573:void enqueueHolderWithDependentInstanceConstructor(com.android.tools.r8.graph.ProgramMethod,java.util.Set):1812:1813 -> a
+    574:578:void processAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation):1834:1838 -> a
+    579:579:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    579:579:void processAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation):1838 -> a
+    580:589:void processAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation):1839:1848 -> a
+    590:590:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.annotatedOn(com.android.tools.r8.graph.DexDefinition):25:25 -> a
+    590:590:void processAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation):1848 -> a
+    591:595:void processAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation):1849:1853 -> a
+    596:627:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2014:2045 -> a
+    628:668:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2050:2090 -> a
+    669:671:void lambda$ensureFromLibraryOrThrow$30(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):2068:2070 -> a
+    672:674:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2102:2104 -> a
+    675:675:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():576:576 -> a
+    675:675:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2105 -> a
+    676:683:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2105:2112 -> a
+    684:686:void lambda$keepClassAndAllMembers$31(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2108:2110 -> a
+    687:689:void lambda$keepClassAndAllMembers$32(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2114:2116 -> a
+    690:690:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):2136:2136 -> a
+    691:691:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    691:691:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):2137 -> a
+    692:692: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:2181 -> a
+    693:693:boolean com.android.tools.r8.graph.DexClass.isAnnotation():553:553 -> a
+    693:693: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
+    694:700: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:2187 -> a
+    701:702: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):2216:2217 -> a
+    701:702: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):2190 -> a
+    703:704: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):2194:2195 -> a
+    705:705:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    705:705: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):2195 -> a
+    706:708: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):2198:2200 -> a
+    709:709:boolean com.android.tools.r8.graph.DexClass.isAnnotation():553:553 -> a
+    709:709:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2273 -> a
+    709:709: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):2203 -> a
+    710:711:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2273:2274 -> a
+    710:711: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):2203 -> a
+    712:712:com.android.tools.r8.shaking.InstantiatedObject com.android.tools.r8.shaking.InstantiatedObject.of(com.android.tools.r8.graph.DexProgramClass):12:12 -> a
+    712:712:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2276 -> a
+    712:712: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):2203 -> a
+    713:713:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2276:2276 -> a
+    713:713: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):2203 -> a
+    714:714:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2275:2275 -> a
+    714:714: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):2203 -> a
+    715:724:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2472:2481 -> a
+    715:724: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):2205 -> a
+    725:725:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2485:2485 -> a
+    725:725: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):2207 -> a
+    726:726:boolean com.android.tools.r8.graph.DexClass.isAnnotation():553:553 -> a
+    726:726:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2485 -> a
+    726:726: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):2207 -> a
+    727:729:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2485:2487 -> a
+    727:729: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):2207 -> a
+    730:730:void lambda$processNewlyInstantiatedClass$34(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2188:2188 -> a
+    731:731:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2222:2222 -> a
+    732:732:boolean com.android.tools.r8.graph.DexClass.isAnnotation():553:553 -> a
+    732:732:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2222 -> a
+    733:734:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2222:2223 -> a
+    735:736:void transitionDependentItemsForInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):2491:2492 -> a
+    735:736:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2224 -> a
+    737:768:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,java.util.List):2288:2319 -> a
+    769:769:java.util.Set getReachableVirtualTargets(com.android.tools.r8.graph.DexProgramClass):2324:2324 -> a
+    769:769:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):2332 -> a
+    770:787:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):2332:2349 -> a
+    788:788:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):2348:2348 -> a
+    789:793:void markLiveOverrides(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):2363:2367 -> a
+    794:794:void markLiveOverrides(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):2366:2366 -> a
+    795:806:void markLiveOverrides(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):2364:2375 -> a
+    807:809: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):555:557 -> a
+    807:809:void markLiveOverrides(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):2375 -> a
+    810:810:void markLiveOverrides(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):2377:2377 -> a
+    811:813:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markLiveOverrides$35(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):2380:2380 -> a
+    814:826:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2387:2399 -> a
+    827:835:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2398:2406 -> a
+    836:836:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
+    836:836:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2406 -> a
+    837:841:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2406:2410 -> a
+    842:848:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2409:2415 -> a
+    849:849:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2412:2412 -> a
+    850:850:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):2424:2424 -> a
+    851:893:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):3748:3790 -> a
+    851:893:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):2428 -> a
+    894:899:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):2431:2436 -> a
+    900:900:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
+    900:900:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):2436 -> a
+    901:901:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):2439:2439 -> a
+    902:902:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):2438:2438 -> a
+    903:903:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markLibraryOrClasspathOverrideLive$36(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod):2434:2434 -> a
+    904:915:void markOverridesAsLibraryMethodOverrides(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):2445:2456 -> a
+    916:918:void lambda$markOverridesAsLibraryMethodOverrides$37(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexType):2458:2460 -> a
+    919:919:void markInstanceFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2564:2564 -> a
+    920:920:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndField.getType():28:28 -> a
+    920:920:void markInstanceFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2565 -> a
+    921:921:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():46:46 -> a
+    921:921:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndField.getType():28 -> a
+    921:921:void markInstanceFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2565 -> a
+    922:924:void markInstanceFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2565:2567 -> a
+    925:925:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    925:925:void markInstanceFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2567 -> a
+    926:935:void markInstanceFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2569:2578 -> a
+    936:936:void lambda$markInstanceFieldAsLive$39(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2578:2578 -> a
+    937:942:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2582:2587 -> a
+    943:945:boolean verifyMethodIsTargeted(com.android.tools.r8.graph.ProgramMethod):1600:1602 -> a
+    943:945:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2587 -> a
+    946:946:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2588:2588 -> a
+    947:947:boolean verifyTypeIsLive(com.android.tools.r8.graph.DexProgramClass):1607:1607 -> a
+    947:947:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2588 -> a
+    948:949:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2589:2590 -> a
+    950:950:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    950:950:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2590 -> a
+    951:951:boolean isFieldLive(com.android.tools.r8.graph.ProgramField):2613:2613 -> a
+    952:952:boolean isFieldLive(com.android.tools.r8.graph.DexEncodedField):2617:2617 -> a
+    953:954:boolean isFieldWrittenInMethodSatisfying(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):2627:2628 -> a
+    955:956:boolean isMemberLive(com.android.tools.r8.graph.DexEncodedMember):2643:2644 -> a
+    957:957:boolean com.android.tools.r8.graph.DexDefinition.isDexEncodedField():0:0 -> a
+    957:957:boolean isMemberLive(com.android.tools.r8.graph.DexEncodedMember):2644 -> a
+    958:959:boolean isMemberLive(com.android.tools.r8.graph.DexEncodedMember):2645:2646 -> a
+    960:960:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):2650:2650 -> a
+    961:961:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):2664:2664 -> a
+    961:961:void lambda$addConsequentRootSet$62(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3585 -> a
+    962:966:void lambda$addConsequentRootSet$62(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3586:3590 -> a
+    967:968:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl.isInstantiatedDirectlyOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):92:93 -> a
+    967:968:void lambda$addConsequentRootSet$62(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3590 -> a
+    969:972:void lambda$addConsequentRootSet$62(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3592:3595 -> a
+    973:973:java.util.Set com.android.tools.r8.shaking.RootSetBuilder$RootSetBase.getDependentKeepClassCompatRule(com.android.tools.r8.graph.DexType):1477:1477 -> a
+    973:973:void lambda$addConsequentRootSet$62(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3596 -> a
+    974:974:void lambda$addConsequentRootSet$62(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3595:3595 -> a
+    975:975:void forAllLiveClasses(java.util.function.Consumer):2673:2673 -> a
+    976:992:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2705:2721 -> a
+    993:994:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,boolean):1881:1882 -> a
+    993:994:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2725 -> a
+    995:996:com.android.tools.r8.graph.ResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveMethod(com.android.tools.r8.graph.DexMethod,boolean):549:550 -> a
+    995:996:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,boolean):1882 -> a
+    995:996:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2725 -> a
+    997:1001:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,boolean):1883:1887 -> a
+    997:1001:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2725 -> a
+    1002:1002:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2730:2730 -> a
+    1003:1003:java.util.Set getReachableVirtualTargets(com.android.tools.r8.graph.DexProgramClass):2324:2324 -> a
+    1003:1003:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2739 -> a
+    1004:1010:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2739:2745 -> a
+    1011:1011:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    1011:1011:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2745 -> a
+    1012:1033:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2750:2771 -> a
+    1034:1034:void lambda$markVirtualMethodAsReachable$42(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):2768:2768 -> a
+    1035:1035:boolean lambda$markVirtualMethodAsReachable$43(com.android.tools.r8.graph.DexDefinition):2770:2770 -> a
+    1036:1036:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier):133:133 -> a
+    1036:1036:boolean lambda$markVirtualMethodAsReachable$43(com.android.tools.r8.graph.DexDefinition):2770 -> a
+    1037:1037:void lambda$markVirtualMethodAsReachable$45(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.LookupTarget):2773:2773 -> a
+    1038:1038:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markVirtualMethodAsReachable$44(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):2776:2776 -> a
+    1039:1040:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget,java.util.function.Function):2782:2783 -> a
+    1041:1043:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.DexClassAndMethod,java.util.function.Function):2792:2794 -> a
+    1041:1043:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget,java.util.function.Function):2783 -> a
+    1044:1045:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget,java.util.function.Function):2785:2786 -> a
+    1046:1049:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupLambdaTarget,java.util.function.Function):2800:2803 -> a
+    1046:1049:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget,java.util.function.Function):2786 -> a
+    1050:1050:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupLambdaTarget,java.util.function.Function):2802:2802 -> a
+    1050:1050:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget,java.util.function.Function):2786 -> a
+    1051:1052:void markFailedResolutionTargets(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2812:2813 -> a
+    1053:1056:void lambda$markFailedResolutionTargets$46(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod):2815:2818 -> a
+    1057:1057:void lambda$markEnumValuesAsReachable$47(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):2841:2841 -> a
+    1058:1065:java.util.Set traceMainDex(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2893:2900 -> a
+    1066:1071: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):2909:2914 -> a
+    1072:1072:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):444:444 -> a
+    1072:1072: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):2914 -> a
+    1073:1075: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):2918:2920 -> a
+    1076:1076:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):444:444 -> a
+    1076:1076: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):2920 -> a
+    1077:1079: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):2922:2924 -> a
+    1080:1080:com.android.tools.r8.shaking.Enqueuer registerInvokeAnalysis(com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):449:449 -> a
+    1080:1080: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):2923 -> a
+    1081:1081: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):2928:2928 -> a
+    1082:1082:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():569:569 -> a
+    1082:1082: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):2928 -> a
+    1083:1105: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):2928:2950 -> a
+    1106:1107:void enqueueRootClass(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):707:708 -> a
+    1106:1107:void enqueueRootClass(com.android.tools.r8.graph.DexProgramClass,java.util.Set):702 -> a
+    1106:1107: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):2951 -> a
+    1108:1109: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):2952:2953 -> a
+    1110:1123: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):2944:2957 -> a
+    1124:1127:void finalizeLibraryMethodOverrideInformation():3222:3225 -> a
+    1124:1127: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):2958 -> a
+    1128:1129: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):2959:2960 -> a
+    1130:1132:boolean verifyKeptGraph():3232:3234 -> a
+    1130:1132: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):2960 -> a
+    1133:1133: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):2961:2961 -> a
+    1134:1134:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isWhyAreYouKeeping():185:185 -> a
+    1134:1134: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):2961 -> a
+    1135:1137: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):2966:2968 -> a
+    1138:1139:void lambda$traceApplication$49(com.android.tools.r8.graph.DexReference,java.util.List):2938:2939 -> a
+    1140:1140:void lambda$traceApplication$52(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2959:2959 -> a
+    1141:1141:void lambda$keepClassWithRules$53(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.shaking.KeepClassInfo$Joiner):2978:2978 -> a
+    1142:1142:void lambda$keepMethodWithRules$54(com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):2982:2982 -> a
+    1143:1143:void keepFieldWithRules(com.android.tools.r8.graph.ProgramField,java.util.Set):2986:2986 -> a
+    1144:1144:void lambda$keepFieldWithRules$55(com.android.tools.r8.graph.ProgramField,java.util.Set,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):2986:2986 -> a
+    1145:1147:void applyKeepRules(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.shaking.KeepInfo$Joiner):2993:2995 -> a
+    1148:1148:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isProguardIfRule():0:0 -> a
+    1148:1148:void applyKeepRules(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.shaking.KeepInfo$Joiner):2995 -> a
+    1149:1149:void applyKeepRules(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.shaking.KeepInfo$Joiner):2995:2995 -> a
+    1150:1150:com.android.tools.r8.shaking.ProguardKeepRule com.android.tools.r8.shaking.ProguardIfRule.getSubsequentRule():42:42 -> a
+    1150:1150:void applyKeepRules(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.shaking.KeepInfo$Joiner):2995 -> a
+    1151:1155:void applyKeepRules(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.shaking.KeepInfo$Joiner):2996:3000 -> a
+    1156:1156:boolean com.android.tools.r8.graph.AccessFlags.isPackagePrivateOrProtected():145:145 -> a
+    1156:1156:void applyKeepRules(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.shaking.KeepInfo$Joiner):3000 -> a
+    1157:1164:void applyKeepRules(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.shaking.KeepInfo$Joiner):3001:3008 -> a
+    1165:1165:com.android.tools.r8.graph.DexApplication lambda$synthesize$56(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.graph.DexApplication):3151:3151 -> a
+    1166:1171:void com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions.amendApplication(com.android.tools.r8.graph.DirectMappedDexApplication$Builder):3068:3073 -> a
+    1166:1171:com.android.tools.r8.graph.DexApplication lambda$synthesize$56(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.graph.DexApplication):3152 -> a
+    1172:1172:com.android.tools.r8.graph.DexApplication lambda$synthesize$56(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.graph.DexApplication):3153:3153 -> a
+    1173:1174:void synthesizeBackports(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3181:3182 -> a
+    1175:1206:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3245:3276 -> a
+    1207:1207:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    1207:1207:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3276 -> a
+    1208:1208:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3277:3277 -> a
+    1209:1209:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
+    1209:1209:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3278 -> a
+    1210:1232:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3279:3301 -> a
+    1233:1233:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():440:440 -> a
+    1233:1233:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3301 -> a
+    1234:1247:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3301:3314 -> a
+    1248:1253:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):3476:3481 -> a
+    1248:1253:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3336 -> a
+    1254:1258:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3337:3341 -> a
+    1259:1259:void lambda$createAppInfo$57(java.util.Set,com.android.tools.r8.graph.DexProgramClass):3251:3251 -> a
+    1260:1260:boolean lambda$createAppInfo$58(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):3257:3257 -> a
+    1261:1274:void lambda$ensureLambdaAccessibility$59(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaClass):3353:3366 -> a
+    1275:1275:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.fakeReportShouldNotBeUsed():73:73 -> a
+    1275:1275:void lambda$ensureLambdaAccessibility$59(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaClass):3366 -> a
+    1276:1276:void lambda$ensureLambdaAccessibility$59(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaClass):3366:3366 -> a
+    1277:1283:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3382:3388 -> a
+    1284:1295:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3418:3429 -> a
+    1284:1295:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3388 -> a
+    1296:1296:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2654:2654 -> a
+    1296:1296:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3429 -> a
+    1296:1296:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3388 -> a
+    1297:1297:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3430:3430 -> a
+    1297:1297:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3388 -> a
+    1298:1300:boolean verifyReferencedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3438:3440 -> a
+    1298:1300:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3430 -> a
+    1298:1300:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3388 -> a
+    1301:1317:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3395:3411 -> a
+    1318:1320:void rewriteLambdaCallSites(com.android.tools.r8.graph.ProgramMethod,java.util.Map):3460:3462 -> a
+    1321:1404:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3487:3570 -> a
+    1405:1405:java.util.Set lambda$trace$60(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):3506:3506 -> a
+    1406:1406:void lambda$trace$61(com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3538:3538 -> a
+    1407:1407:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):3582:3582 -> a
+    1408:1409:void com.android.tools.r8.shaking.RootSetBuilder$RootSetBase.forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):1377:1378 -> a
+    1408:1409:void com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet.forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):2120 -> a
+    1408:1409:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):3582 -> a
+    1410:1410:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
+    1410:1410:void com.android.tools.r8.shaking.RootSetBuilder$RootSetBase.forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):1378 -> a
+    1410:1410:void com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet.forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):2120 -> a
+    1410:1410:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):3582 -> a
+    1411:1411:void com.android.tools.r8.shaking.RootSetBuilder$RootSetBase.forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):1379:1379 -> a
+    1411:1411:void com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet.forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):2120 -> a
+    1411:1411:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):3582 -> a
+    1412:1412:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    1412:1412:void com.android.tools.r8.shaking.RootSetBuilder$RootSetBase.forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):1380 -> a
+    1412:1412:void com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet.forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):2120 -> a
+    1412:1412:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):3582 -> a
+    1413:1415:void com.android.tools.r8.shaking.RootSetBuilder$RootSetBase.forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):1380:1382 -> a
+    1413:1415:void com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet.forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):2120 -> a
+    1413:1415:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):3582 -> a
+    1416:1441:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):3599:3624 -> a
+    1442:1442:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachClass(java.util.function.Consumer):1614:1614 -> a
+    1442:1442:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachReference(java.util.function.Consumer):1608 -> a
+    1442:1442:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):3624 -> a
+    1443:1443:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachField(java.util.function.Consumer):1624:1624 -> a
+    1443:1443:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMember(java.util.function.Consumer):1634 -> a
+    1443:1443:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachReference(java.util.function.Consumer):1609 -> a
+    1443:1443:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):3624 -> a
+    1444:1444:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMethod(java.util.function.Consumer):1647:1647 -> a
+    1444:1444:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMember(java.util.function.Consumer):1635 -> a
+    1444:1444:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachReference(java.util.function.Consumer):1609 -> a
+    1444:1444:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):3624 -> a
+    1445:1448:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):3627:3630 -> a
+    1449:1450:void lambda$addConsequentRootSet$63(com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):3602:3603 -> a
+    1451:1452:void lambda$addConsequentRootSet$65(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules):3608:3609 -> a
+    1453:1453:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachClass(java.util.function.Consumer):1614:1614 -> a
+    1453:1453:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachReference(java.util.function.Consumer):1608 -> a
+    1453:1453:void lambda$addConsequentRootSet$65(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules):3609 -> a
+    1454:1454:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachField(java.util.function.Consumer):1624:1624 -> a
+    1454:1454:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMember(java.util.function.Consumer):1634 -> a
+    1454:1454:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachReference(java.util.function.Consumer):1609 -> a
+    1454:1454:void lambda$addConsequentRootSet$65(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules):3609 -> a
+    1455:1455:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMethod(java.util.function.Consumer):1647:1647 -> a
+    1455:1455:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMember(java.util.function.Consumer):1635 -> a
+    1455:1455:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachReference(java.util.function.Consumer):1609 -> a
+    1455:1455:void lambda$addConsequentRootSet$65(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules):3609 -> a
+    1456:1456:boolean isLiveProgramReference(com.android.tools.r8.graph.DexReference):3641:3641 -> a
+    1457:1457:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
+    1457:1457:boolean isLiveProgramReference(com.android.tools.r8.graph.DexReference):3641 -> a
+    1458:1458:boolean isLiveProgramReference(com.android.tools.r8.graph.DexReference):3643:3643 -> a
+    1459:1459:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):2664:2664 -> a
+    1459:1459:boolean isLiveProgramReference(com.android.tools.r8.graph.DexReference):3644 -> a
+    1460:1464:boolean isLiveProgramReference(com.android.tools.r8.graph.DexReference):3646:3650 -> a
+    1465:1467:void retainAnnotationForFinalTreeShaking(java.util.List):3696:3698 -> a
+    1468:1468:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):3740:3740 -> a
+    1469:1469:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():199:199 -> a
+    1469:1469:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):3740 -> a
+    1470:1472:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):3741:3743 -> a
+    1473:1481:java.util.Set getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexProgramClass):3799:3807 -> a
+    1482:1495:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):3815:3828 -> a
+    1496:1496:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    1496:1496:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):3828 -> a
+    1497:1497:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):41:41 -> a
+    1497:1497:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):3830 -> a
+    1498:1498:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):3830:3830 -> a
+    1499:1499:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):41:41 -> a
+    1499:1499:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):3831 -> a
+    1500:1515:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):3831:3846 -> a
+    1516:1516:void lambda$markMethodAsLive$68(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexAnnotation):3837:3837 -> a
+    1517:1517:void lambda$markMethodAsLive$69(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3846:3846 -> a
+    1518:1528:void checkMemberForSoftPinning(com.android.tools.r8.graph.ProgramMember):3850:3860 -> a
+    1529:1531:void checkMemberForSoftPinning(com.android.tools.r8.graph.ProgramMember):3859:3861 -> a
+    1532:1532:boolean lambda$checkMemberForSoftPinning$70(com.android.tools.r8.shaking.ProguardKeepRuleBase):3853:3853 -> a
+    1533:1536:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3909:3912 -> a
+    1537:1543:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3918:3924 -> a
+    1537:1543:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1544:1551:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4033:4040 -> a
+    1544:1551:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3925 -> a
+    1544:1551:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1552:1564:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4039:4051 -> a
+    1552:1564:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3925 -> a
+    1552:1564:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1565:1565:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> a
+    1565:1565:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4053 -> a
+    1565:1565:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3925 -> a
+    1565:1565:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1566:1568:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4054:4056 -> a
+    1566:1568:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3925 -> a
+    1566:1568:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1569:1569:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3928:3928 -> a
+    1569:1569:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1570:1591:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4063:4084 -> a
+    1570:1591:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3929 -> a
+    1570:1591:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1592:1605:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4083:4096 -> a
+    1592:1605:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3929 -> a
+    1592:1605:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1606:1606:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> a
+    1606:1606:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4096 -> a
+    1606:1606:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3929 -> a
+    1606:1606:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1607:1655:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4101:4149 -> a
+    1607:1655:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3929 -> a
+    1607:1655:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1656:1656:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> a
+    1656:1656:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4154 -> a
+    1656:1656:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3929 -> a
+    1656:1656:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1657:1659:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4155:4157 -> a
+    1657:1659:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3929 -> a
+    1657:1659:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1660:1660:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3932:3932 -> a
+    1660:1660:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1661:1664:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4214:4217 -> a
+    1661:1664:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3933 -> a
+    1661:1664:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1665:1665:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):53:53 -> a
+    1665:1665:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4218 -> a
+    1665:1665:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3933 -> a
+    1665:1665:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1666:1666: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 -> a
+    1666:1666:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):53 -> a
+    1666:1666:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4218 -> a
+    1666:1666:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3933 -> a
+    1666:1666:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1667:1667:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4218:4218 -> a
+    1667:1667:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3933 -> a
+    1667:1667:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1668:1672:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3936:3940 -> a
+    1668:1672:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1673:1679:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4224:4230 -> a
+    1673:1679:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3941 -> a
+    1673:1679:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1680:1680:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
+    1680:1680:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4230 -> a
+    1680:1680:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3941 -> a
+    1680:1680:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1681:1692:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4231:4242 -> a
+    1681:1692:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3941 -> a
+    1681:1692:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1693:1693:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4235:4235 -> a
+    1693:1693:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3941 -> a
+    1693:1693:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1694:1694:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> a
+    1694:1694:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4247 -> a
+    1694:1694:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3941 -> a
+    1694:1694:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1695:1695:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4247:4247 -> a
+    1695:1695:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3941 -> a
+    1695:1695:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1696:1696:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> a
+    1696:1696:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4249 -> a
+    1696:1696:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3941 -> a
+    1696:1696:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1697:1698:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4250:4251 -> a
+    1697:1698:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3941 -> a
+    1697:1698:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1699:1708:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3944:3953 -> a
+    1699:1708:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1709:1709:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
+    1709:1709:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3953 -> a
+    1709:1709:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1710:1714:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3954:3958 -> a
+    1710:1714:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1715:1715:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> a
+    1715:1715:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3962 -> a
+    1715:1715:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1716:1716:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3962:3962 -> a
+    1716:1716:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1717:1717:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():545:545 -> a
+    1717:1717:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3963 -> a
+    1717:1717:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1718:1718:boolean com.android.tools.r8.graph.DexClass.isAnnotation():553:553 -> a
+    1718:1718:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():545 -> a
+    1718:1718:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3963 -> a
+    1718:1718:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1719:1719:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():545:545 -> a
+    1719:1719:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3963 -> a
+    1719:1719:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1720:1722:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3963:3965 -> a
+    1720:1722:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1723:1723:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> a
+    1723:1723:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3966 -> a
+    1723:1723:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1724:1727:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3965:3968 -> a
+    1724:1727:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1728:1728:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> a
+    1728:1728:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3969 -> a
+    1728:1728:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1729:1746:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3970:3987 -> a
+    1729:1746:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1747:1747:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():199:199 -> a
+    1747:1747:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3997 -> a
+    1747:1747:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1748:1751:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3997:4000 -> a
+    1748:1751:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1752:1752:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> a
+    1752:1752:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4001 -> a
+    1752:1752:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1753:1758:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4000:4005 -> a
+    1753:1758:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1759:1759:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> a
+    1759:1759:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4006 -> a
+    1759:1759:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1760:1774:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4006:4020 -> a
+    1760:1774:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1775:1775:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> a
+    1775:1775:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4021 -> a
+    1775:1775:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1776:1780:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4022:4026 -> a
+    1776:1780:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1781:1782:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4023:4024 -> a
+    1781:1782:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3913 -> a
+    1783:1789:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4167:4173 -> a
+    1790:1790:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> a
+    1790:1790:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4173 -> a
+    1791:1807:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4178:4194 -> a
+    1808:1808:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> a
+    1808:1808:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4195 -> a
+    1809:1813:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4196:4200 -> a
+    1814:1814:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):199:199 -> a
+    1814:1814:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4200 -> a
+    1815:1816:void lambda$handleJavaLangReflectProxyNewProxyInstance$72(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod):4202:4203 -> a
+    1817:1828:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4258:4269 -> 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):2974 -> b
-    2:7:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):1988:1993 -> b
-    2:7:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2975 -> b
-    8:11:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):1992:1995 -> b
-    8:11:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2975 -> b
-    12:15:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2980:2983 -> b
-    16:37:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2981:3002 -> b
-    38:38:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    38:38:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3001 -> b
-    39:42:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3004:3007 -> b
+    1:1:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2848 -> b
+    2:8:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):1869:1875 -> b
+    2:8:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2849 -> b
+    9:12:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2854:2857 -> b
+    13:34:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2855:2876 -> b
+    35:35:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
+    35:35:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2875 -> b
+    36:39:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2878:2881 -> b
+    40:40:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):41:41 -> b
+    40:40:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2882 -> b
+    41:42:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2882:2883 -> b
     43:43:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):41:41 -> b
-    43:43:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3008 -> b
-    44:45:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3008:3009 -> b
-    46:46:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):41:41 -> b
-    46:46:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3010 -> b
-    47:47:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3010:3010 -> b
-    48:48:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl access$1700(com.android.tools.r8.shaking.Enqueuer):173:173 -> b
-    49:49:void access$700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):173:173 -> b
-    50:50:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):492:492 -> b
-    51:52:void setInitialPrunedTypes(java.util.Set):526:527 -> b
-    53:60:void recordTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition,java.util.function.Consumer):557:564 -> b
-    61:62:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):674:675 -> b
-    63:63:boolean registerReflectiveFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):907:907 -> b
-    64:64:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):911:911 -> b
-    64:64:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1496 -> b
-    65:66:void markFieldAsTargeted(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):2648:2649 -> b
-    65:66:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1501 -> b
-    67:91:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1503:1527 -> b
-    92:92:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    92:92:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1527 -> b
-    93:95:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1532:1534 -> b
-    96:96:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):61:61 -> b
-    96:96:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1538 -> b
-    97:97:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1539:1539 -> b
-    98:99:void traceCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1029:1030 -> b
-    100:109:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1263:1272 -> b
-    110:110:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    110:110:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1272 -> b
-    111:112:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1274:1275 -> b
-    113:113:void lambda$traceInvokeInterface$13(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1275:1275 -> b
-    114:114:java.lang.Boolean lambda$traceStaticFieldWrite$20(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1657:1657 -> b
-    115:115:void lambda$markTypeAsLive$24(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1841:1841 -> b
-    116:119:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexClass):1855:1858 -> b
-    120:154:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1873:1907 -> b
-    155:155:boolean com.android.tools.r8.graph.DexClass.isPublic():630:630 -> b
-    155:155:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1909 -> b
-    156:156:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1910:1910 -> b
-    157:157:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1737:1737 -> b
-    157:157:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1913 -> b
-    158:158:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1911:1911 -> b
-    159:159:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1737:1737 -> b
-    159:159:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1881 -> b
-    160:160:void processAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1935:1935 -> b
-    161:161:void processAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet):1940:1940 -> b
-    161:161:void processAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1935 -> b
-    162:163:void processAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation[]):1945:1946 -> b
-    162:163:void processAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet):1940 -> b
-    162:163:void processAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1935 -> b
-    164:164:void markNonStaticDirectMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2130:2130 -> b
-    165:165:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2243:2243 -> b
-    166:166:void lambda$markMethodAsTargeted$35(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexAnnotation):2279:2279 -> b
-    167:167:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2350:2350 -> b
-    168:168:boolean com.android.tools.r8.graph.DexClass.isAnnotation():571:571 -> b
-    168:168:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2350 -> b
-    169:174:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2350:2355 -> b
-    175:176:void transitionDependentItemsForInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):2617:2618 -> b
-    175:176:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2356 -> b
-    177:177:void lambda$markStaticFieldAsLive$40(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2685:2685 -> b
-    178:178:boolean isFieldReferenced(com.android.tools.r8.graph.DexEncodedField):2734:2734 -> b
-    179:180:boolean isFieldRead(com.android.tools.r8.graph.ProgramField):2747:2748 -> b
-    181:181:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2780:2780 -> b
-    182:182:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):2790:2790 -> b
-    183:184:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2805:2806 -> b
-    185:185:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    185:185:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2806 -> b
-    186:186:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2813:2813 -> b
-    187:187:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():209:209 -> b
-    187:187:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2813 -> b
-    188:190:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2814:2816 -> b
-    191:191:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2815:2815 -> b
-    192:193:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl.isInstantiatedDirectlyOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):92:93 -> b
-    192:193:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2815 -> b
-    194:202:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2817:2825 -> b
-    203:210:java.util.Set traceMainDex(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3019:3026 -> b
-    211:211:com.android.tools.r8.graph.GraphLens$NestedGraphLens buildGraphLens():3107:3107 -> b
-    212:212:void keepClassWithRules(com.android.tools.r8.graph.DexProgramClass,java.util.Set):3111:3111 -> b
-    213:213:void keepMethodWithRules(com.android.tools.r8.graph.ProgramMethod,java.util.Set):3115:3115 -> b
-    214:215:void synthesizeBackports(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3370:3371 -> b
-    216:217:void lambda$addConsequentRootSet$67(com.android.tools.r8.graph.DexReference):3815:3816 -> b
-    218:221:void lambda$addConsequentRootSet$70(com.android.tools.r8.graph.DexType,java.util.Set):3836:3839 -> b
-    222:246:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3908:3932 -> b
-    247:255:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3930:3938 -> b
-    256:256:boolean lambda$checkMemberForSoftPinning$74(com.android.tools.r8.shaking.ProguardKeepRuleBase):4080:4080 -> b
-    257:261:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4098:4102 -> b
-    262:262:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4101:4101 -> b
-    263:267:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):4141:4145 -> b
-    1:1:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> c
-    1:1:com.android.tools.r8.shaking.KeepReason lambda$handleReflectiveBehavior$75(com.android.tools.r8.graph.ProgramMethod):4197 -> c
-    2:2:com.android.tools.r8.utils.InternalOptions access$1900(com.android.tools.r8.shaking.Enqueuer):173:173 -> c
-    3:3:boolean isPinned(com.android.tools.r8.graph.DexType):616:616 -> c
-    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):76:76 -> c
+    43:43:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2884 -> b
+    44:44:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2884:2884 -> b
+    45:45:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl access$1700(com.android.tools.r8.shaking.Enqueuer):160:160 -> b
+    46:46:void access$700(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):444:444 -> b
+    48:49:void setInitialPrunedTypes(java.util.Set):478:479 -> b
+    50:57:void recordTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition,java.util.function.Consumer):509:516 -> b
+    58:58:boolean com.android.tools.r8.graph.DexClass.isAnnotation():553:553 -> b
+    58:58:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):3888 -> b
+    59:69:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):3889:3899 -> b
+    70:70:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):3896:3896 -> b
+    71:72:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):621:622 -> b
+    73:73:boolean registerReflectiveFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):854:854 -> b
+    74:74:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):858:858 -> b
+    74:74:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1421 -> b
+    75:76:void markFieldAsTargeted(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):2522:2523 -> b
+    75:76:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1426 -> b
+    77:95:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1428:1446 -> b
+    96:96:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
+    96:96:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1446 -> b
+    97:99:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1451:1453 -> b
+    100:100:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):61:61 -> b
+    100:100:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1457 -> b
+    101:101:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1458:1458 -> b
+    102:102:java.util.Map lambda$traceCallSite$2(com.android.tools.r8.graph.ProgramMethod):927:927 -> b
+    103:104:void traceCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):972:973 -> b
+    105:114:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1206:1215 -> b
+    115:115:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
+    115:115:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1215 -> b
+    116:117:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1217:1218 -> b
+    118:118:void lambda$traceInvokeInterface$12(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1218:1218 -> b
+    119:119:java.lang.Boolean lambda$traceStaticFieldWrite$19(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1564:1564 -> b
+    120:120:void lambda$markTypeAsLive$23(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1730:1730 -> b
+    121:124:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexClass):1744:1747 -> b
+    125:157:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1762:1794 -> b
+    158:158:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1644:1644 -> b
+    158:158:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1770 -> b
+    159:159:void processAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1817:1817 -> b
+    160:160:void processAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet):1822:1822 -> b
+    160:160:void processAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1817 -> b
+    161:162:void processAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation[]):1827:1828 -> b
+    161:162:void processAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet):1822 -> b
+    161:162:void processAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1817 -> b
+    163:163:void markNonStaticDirectMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2009:2009 -> b
+    164:164:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2121:2121 -> b
+    165:165:void lambda$markMethodAsTargeted$33(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexAnnotation):2157:2157 -> b
+    166:166:void lambda$markStaticFieldAsLive$38(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2559:2559 -> b
+    167:167:boolean isFieldReferenced(com.android.tools.r8.graph.DexEncodedField):2608:2608 -> b
+    168:169:boolean isFieldRead(com.android.tools.r8.graph.ProgramField):2621:2622 -> b
+    170:170:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2654:2654 -> b
+    171:171:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):2664:2664 -> b
+    172:173:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2679:2680 -> b
+    174:174:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
+    174:174:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2680 -> b
+    175:175:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2687:2687 -> b
+    176:176:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():199:199 -> b
+    176:176:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2687 -> b
+    177:179:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2688:2690 -> b
+    180:180:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2689:2689 -> b
+    181:182:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl.isInstantiatedDirectlyOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):92:93 -> b
+    181:182:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2689 -> b
+    183:191:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2691:2699 -> b
+    192:192:com.android.tools.r8.graph.GraphLens$NestedGraphLens buildGraphLens():2974:2974 -> b
+    193:193:void keepClassWithRules(com.android.tools.r8.graph.DexProgramClass,java.util.Set):2978:2978 -> b
+    194:194:void keepMethodWithRules(com.android.tools.r8.graph.ProgramMethod,java.util.Set):2982:2982 -> b
+    195:199:void synthesizeInterfaceMethodBridges(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3171:3175 -> b
+    200:202:void com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions.addLiveMethod(com.android.tools.r8.graph.ProgramMethod):3056:3058 -> b
+    200:202:void com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions.addLiveMethodWithKeepAction(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):3063 -> b
+    200:202:void synthesizeInterfaceMethodBridges(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3175 -> b
+    203:203:void com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions.addLiveMethodWithKeepAction(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):3064:3064 -> b
+    203:203:void synthesizeInterfaceMethodBridges(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3175 -> b
+    204:204:void synthesizeInterfaceMethodBridges(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3177:3177 -> b
+    205:206:void lambda$addConsequentRootSet$64(com.android.tools.r8.graph.DexReference):3611:3612 -> b
+    207:210:void lambda$addConsequentRootSet$67(com.android.tools.r8.graph.DexType,java.util.Set):3632:3635 -> b
+    211:235:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3704:3728 -> b
+    236:244:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3726:3734 -> b
+    245:245:boolean lambda$checkMemberForSoftPinning$71(com.android.tools.r8.shaking.ProguardKeepRuleBase):3860:3860 -> b
+    246:250:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3878:3882 -> b
+    251:251:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3881:3881 -> b
+    1:1:com.android.tools.r8.utils.InternalOptions access$1900(com.android.tools.r8.shaking.Enqueuer):160:160 -> c
+    2:2:boolean isPinned(com.android.tools.r8.graph.DexType):563:563 -> c
+    3:3: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):76:76 -> c
+    3:3:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):137 -> c
+    3:3:boolean isPinned(com.android.tools.r8.graph.DexType):563 -> c
+    4:4:com.android.tools.r8.shaking.KeepClassInfo com.android.tools.r8.shaking.KeepInfoCollection.keepInfoForNonProgramClass():36:36 -> c
+    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):77 -> c
     4:4:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):137 -> c
-    4:4:boolean isPinned(com.android.tools.r8.graph.DexType):616 -> c
-    5:5:com.android.tools.r8.shaking.KeepClassInfo com.android.tools.r8.shaking.KeepInfoCollection.keepInfoForNonProgramClass():36:36 -> c
-    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):77 -> c
+    4:4:boolean isPinned(com.android.tools.r8.graph.DexType):563 -> c
+    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):77:77 -> c
     5:5:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):137 -> c
-    5:5:boolean isPinned(com.android.tools.r8.graph.DexType):616 -> c
-    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):77:77 -> c
-    6:6:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):137 -> c
-    6:6:boolean isPinned(com.android.tools.r8.graph.DexType):616 -> c
-    7:7:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):137:137 -> c
-    7:7:boolean isPinned(com.android.tools.r8.graph.DexType):616 -> c
-    8:9:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):686:687 -> c
-    10:10:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):903:903 -> c
-    10:10:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1552 -> c
-    11:12:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1556:1557 -> c
-    13:14:void markFieldAsTargeted(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):2648:2649 -> c
-    13:14:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1559 -> c
-    15:41:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1560:1586 -> c
-    42:42:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
-    42:42:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1586 -> c
-    43:47:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1590:1594 -> c
-    48:53:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1591:1596 -> c
-    54:54:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexProgramClass):536:536 -> c
-    54:54:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1596 -> c
-    55:55:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1600:1600 -> c
-    56:57:void markFieldAsTargeted(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):2648:2649 -> c
-    56:57:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1603 -> c
-    58:58:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):61:61 -> c
-    58:58:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):2653 -> c
-    58:58:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1606 -> c
-    59:59:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):2653:2653 -> c
-    59:59:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1606 -> c
-    60:60:boolean registerReflectiveFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):915:915 -> c
-    61:61:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1192:1192 -> c
-    61:61:void traceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1093 -> c
-    62:70:void traceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1094:1102 -> c
-    71:72:boolean registerBackportInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1287:1288 -> c
-    73:73:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1306:1306 -> c
-    74:76:boolean registerCloseResource(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1295:1297 -> c
-    74:76:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1309 -> c
-    77:79:boolean registerCloseResource(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1296:1298 -> c
-    77:79:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1309 -> c
-    80:104:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1312:1336 -> c
-    105:105:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
-    105:105:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1336 -> c
-    106:111:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):1988:1993 -> c
-    106:111:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2013 -> c
-    106:111:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1338 -> c
-    112:115:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):1992:1995 -> c
-    112:115:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2013 -> c
-    112:115:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1338 -> c
-    116:130:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2014:2028 -> c
-    116:130:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1338 -> c
-    131:131:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1339:1339 -> c
-    132:132:void lambda$traceInvokeStatic$14(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1339:1339 -> c
-    133:135:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2270:2272 -> c
-    136:137:void markReferencedTypesAsLive(com.android.tools.r8.graph.ProgramMethod):4086:4087 -> c
-    136:137:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2276 -> c
-    138:143:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2277:2282 -> c
-    144:144:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
-    144:144:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2282 -> c
-    145:148:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2284:2287 -> c
-    149:149:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):4137:4137 -> c
-    149:149:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2288 -> c
-    150:150:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportCompatKeepMethod(com.android.tools.r8.graph.ProgramMethod):191:191 -> c
-    150:150:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):4137 -> c
-    150:150:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2288 -> c
-    151:151:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):4137:4137 -> c
-    151:151:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2288 -> c
-    152:160:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2659:2667 -> c
-    161:161:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():209:209 -> c
-    161:161:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2667 -> c
-    162:163:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2668:2669 -> c
+    5:5:boolean isPinned(com.android.tools.r8.graph.DexType):563 -> c
+    6:6:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):137:137 -> c
+    6:6:boolean isPinned(com.android.tools.r8.graph.DexType):563 -> c
+    7:8:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):633:634 -> c
+    9:9:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):850:850 -> c
+    9:9:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1471 -> c
+    10:11:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1475:1476 -> c
+    12:13:void markFieldAsTargeted(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):2522:2523 -> c
+    12:13:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1478 -> c
+    14:34:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1479:1499 -> c
+    35:35:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
+    35:35:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1499 -> c
+    36:40:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1503:1507 -> c
+    41:46:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1504:1509 -> c
+    47:47:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexProgramClass):488:488 -> c
+    47:47:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1509 -> c
+    48:48:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1513:1513 -> c
+    49:50:void markFieldAsTargeted(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):2522:2523 -> c
+    49:50:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1516 -> c
+    51:51:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):61:61 -> c
+    51:51:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):2527 -> c
+    51:51:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1519 -> c
+    52:52:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):2527:2527 -> c
+    52:52:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1519 -> c
+    53:53:boolean registerReflectiveFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):862:862 -> c
+    54:54:void traceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1036:1036 -> c
+    55:55:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1135:1135 -> c
+    55:55:void traceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1037 -> c
+    56:62:void traceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1040:1046 -> c
+    63:63:void traceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1045:1045 -> c
+    64:65:boolean registerBackportInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1230:1231 -> c
+    66:94:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1239:1267 -> 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):1267 -> c
+    96:102:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):1869:1875 -> c
+    96:102:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):1892 -> c
+    96:102:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1269 -> c
+    103:117:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):1893:1907 -> c
+    103:117:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1269 -> c
+    118:118:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1270:1270 -> 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):1270:1270 -> c
+    120:122:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2148:2150 -> c
+    123:124:void markReferencedTypesAsLive(com.android.tools.r8.graph.ProgramMethod):3866:3867 -> c
+    123:124:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2154 -> c
+    125:130:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2155:2160 -> c
+    131:131:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
+    131:131:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2160 -> c
+    132:135:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2162:2165 -> c
+    136:136:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):3905:3905 -> c
+    136:136:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2166 -> c
+    137:137:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportCompatKeepMethod(com.android.tools.r8.graph.ProgramMethod):191:191 -> c
+    137:137:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):3905 -> c
+    137:137:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2166 -> c
+    138:138:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):3905:3905 -> c
+    138:138:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2166 -> c
+    139:139:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2228:2228 -> c
+    140:140:boolean com.android.tools.r8.graph.DexClass.isAnnotation():553:553 -> c
+    140:140:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2228 -> c
+    141:146:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2228:2233 -> c
+    147:148:void transitionDependentItemsForInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):2491:2492 -> c
+    147:148:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2234 -> c
+    149:157:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2533:2541 -> c
+    158:158:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():199:199 -> c
+    158:158:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2541 -> c
+    159:160:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2542:2543 -> c
+    161:161:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
+    161:161:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2543 -> c
+    162:163:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2546:2547 -> c
     164:164:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
-    164:164:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2669 -> c
-    165:166:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2672:2673 -> c
-    167:167:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
-    167:167:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2673 -> c
-    168:177:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2676:2685 -> c
-    178:182:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2758:2762 -> c
-    183:183:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():680:680 -> c
-    183:183:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2762 -> c
-    184:185:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2764:2765 -> c
-    186:187:boolean isNonProgramTypeLive(com.android.tools.r8.graph.DexClass):2794:2795 -> c
-    188:188:com.android.tools.r8.utils.collections.ProgramFieldSet lambda$markInstanceFieldAsReachable$42(com.android.tools.r8.graph.DexProgramClass):2824:2824 -> c
-    189:193:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2950:2954 -> c
-    189:193:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2962 -> c
-    194:199:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2953:2958 -> c
-    194:199:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2962 -> c
-    200:206:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2962:2968 -> c
-    207:207:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$markSuperMethodAsReachable$50(com.android.tools.r8.graph.DexEncodedMethod):3005:3005 -> c
-    208:212:void synthesizeInterfaceMethodBridges(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3360:3364 -> c
-    213:215:void com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions.addLiveMethod(com.android.tools.r8.graph.ProgramMethod):3196:3198 -> c
-    213:215:void com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions.addLiveMethodWithKeepAction(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):3203 -> c
-    213:215:void synthesizeInterfaceMethodBridges(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3364 -> c
-    216:216:void com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions.addLiveMethodWithKeepAction(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):3204:3204 -> c
-    216:216:void synthesizeInterfaceMethodBridges(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3364 -> c
-    217:217:void synthesizeInterfaceMethodBridges(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3366:3366 -> c
-    218:222:java.util.Set toDescriptorSet(java.util.Set):3671:3675 -> c
-    223:223:void lambda$addConsequentRootSet$69(com.android.tools.r8.graph.DexReference):3829:3829 -> c
-    224:224:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3858:3858 -> c
-    225:225:com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder com.android.tools.r8.shaking.RootSetUtils$RootSet.builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):2128:2128 -> c
-    225:225:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3858 -> c
-    226:229:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3859:3862 -> c
-    230:233:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):3873:3876 -> c
-    230:233:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3861 -> c
-    234:234:boolean com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.containsMethod(com.android.tools.r8.graph.DexMethod):1660:1660 -> c
-    234:234:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):3876 -> c
-    234:234:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3861 -> c
-    235:248:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):3879:3892 -> c
-    235:248:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3861 -> c
-    249:249:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.fakeReportShouldNotBeUsed():73:73 -> c
-    249:249:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):3892 -> c
-    249:249:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3861 -> c
-    250:256:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):3888:3894 -> c
-    250:256:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3861 -> c
-    257:257:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.fakeReportShouldNotBeUsed():73:73 -> c
-    257:257:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):3894 -> c
-    257:257:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3861 -> c
-    258:261:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):3893:3896 -> c
-    258:261:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3861 -> c
-    262:262:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3865:3865 -> c
-    1:1:com.android.tools.r8.shaking.Enqueuer$Mode access$300(com.android.tools.r8.shaking.Enqueuer):173:173 -> d
-    2:6:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory createUseRegistryFactory():480:484 -> d
-    7:7:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):911:911 -> d
-    7:7:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1619 -> d
-    8:9:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1623:1624 -> d
-    10:11:void markFieldAsTargeted(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):2648:2649 -> d
-    10:11:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1626 -> d
-    12:34:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1627:1649 -> d
-    35:35:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
-    35:35:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1649 -> d
-    36:42:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1652:1658 -> d
-    43:48:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1655:1660 -> d
-    49:49:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexProgramClass):536:536 -> d
-    49:49:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1660 -> d
-    50:50:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1665:1665 -> d
-    51:52:void markFieldAsTargeted(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):2648:2649 -> d
-    51:52:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1668 -> d
-    53:53:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):61:61 -> d
-    53:53:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):2653 -> d
-    53:53:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1671 -> d
-    54:54:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):2653:2653 -> d
-    54:54:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1671 -> d
-    55:55:java.util.Map lambda$traceCallSite$2(com.android.tools.r8.graph.ProgramMethod):984:984 -> d
-    56:56:void traceExceptionGuard(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1201:1201 -> d
-    57:57:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1192:1192 -> d
-    57:57:void traceExceptionGuard(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1202 -> d
-    58:64:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1206:1212 -> d
-    65:65:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):53:53 -> d
-    65:65:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1216 -> d
-    66:66: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
-    66:66:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):53 -> d
-    66:66:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1216 -> d
-    67:67:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1216:1216 -> d
-    68:68:void lambda$traceInvokeSuper$15(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1357:1357 -> d
-    69:80:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1370:1381 -> d
-    81:93:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1376:1388 -> d
-    94:94:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
-    94:94:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1388 -> d
-    95:96:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1390:1391 -> d
-    97:97:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1431:1431 -> d
-    98:106:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):1705:1713 -> d
-    107:107:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1737:1737 -> d
-    107:107:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):1717 -> d
-    108:112:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1741:1745 -> d
-    113:115:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1744:1746 -> d
-    116:116:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1742:1742 -> d
-    117:117:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$ensureMethodsContinueToWidenAccess$26(com.android.tools.r8.graph.DexType):1857:1857 -> d
-    118:118:java.util.Set lambda$markInterfaceTypeAsLiveViaInheritanceClause$29(com.android.tools.r8.graph.DexProgramClass):1904:1904 -> d
-    119:119:void shouldNotBeMinified(com.android.tools.r8.graph.DexReference):2218:2218 -> d
-    120:120:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():558:558 -> d
-    120:120:void shouldNotBeMinified(com.android.tools.r8.graph.DexReference):2218 -> d
-    121:121:void shouldNotBeMinified(com.android.tools.r8.graph.DexReference):2219:2219 -> d
-    122:122:void com.android.tools.r8.shaking.RootSetUtils$RootSet.shouldNotBeMinified(com.android.tools.r8.graph.DexReference):1974:1974 -> d
-    122:122:void shouldNotBeMinified(com.android.tools.r8.graph.DexReference):2219 -> d
-    123:126:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2721:2724 -> d
-    127:127:boolean com.android.tools.r8.shaking.KeepReason.isDueToReflectiveUse():0:0 -> d
-    127:127:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2725 -> d
-    128:133:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2723:2728 -> d
-    134:134:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
-    134:134:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2728 -> d
-    135:136:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2784:2785 -> d
-    137:137:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):2790:2790 -> d
-    137:137:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2785 -> d
-    138:138:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2786:2786 -> d
-    139:141:void synthesizeInvokeSpecialBridges(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3354:3356 -> d
+    164:164:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2547 -> c
+    165:174:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2550:2559 -> c
+    175:179:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2632:2636 -> c
+    180:180:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():662:662 -> c
+    180:180:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2636 -> c
+    181:182:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2638:2639 -> c
+    183:184:boolean isNonProgramTypeLive(com.android.tools.r8.graph.DexClass):2668:2669 -> c
+    185:185:com.android.tools.r8.utils.collections.ProgramFieldSet lambda$markInstanceFieldAsReachable$40(com.android.tools.r8.graph.DexProgramClass):2698:2698 -> c
+    186:190:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2824:2828 -> c
+    186:190:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2836 -> c
+    191:196:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2827:2832 -> c
+    191:196:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2836 -> c
+    197:203:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2836:2842 -> c
+    204:204:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$markSuperMethodAsReachable$48(com.android.tools.r8.graph.DexEncodedMethod):2879:2879 -> c
+    205:207:void synthesizeInvokeSpecialBridges(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3165:3167 -> c
+    208:212:java.util.Set toDescriptorSet(java.util.Set):3467:3471 -> c
+    213:213:void lambda$addConsequentRootSet$66(com.android.tools.r8.graph.DexReference):3625:3625 -> c
+    214:214:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3654:3654 -> c
+    215:215:void com.android.tools.r8.shaking.RootSetBuilder.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):142:142 -> c
+    215:215:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3654 -> c
+    216:219:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3655:3658 -> c
+    220:223:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):3669:3672 -> c
+    220:223:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3657 -> c
+    224:224:boolean com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.containsMethod(com.android.tools.r8.graph.DexMethod):1604:1604 -> c
+    224:224:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):3672 -> c
+    224:224:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3657 -> c
+    225:238:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):3675:3688 -> c
+    225:238:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3657 -> c
+    239:239:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.fakeReportShouldNotBeUsed():73:73 -> c
+    239:239:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):3688 -> c
+    239:239:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3657 -> c
+    240:246:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):3684:3690 -> c
+    240:246:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3657 -> c
+    247:247:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.fakeReportShouldNotBeUsed():73:73 -> c
+    247:247:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):3690 -> c
+    247:247:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3657 -> c
+    248:251:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):3689:3692 -> c
+    248:251:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3657 -> c
+    252:252:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3661:3661 -> c
+    253:256:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.ProgramMethod):3871:3874 -> c
+    1:1:com.android.tools.r8.shaking.Enqueuer$Mode access$300(com.android.tools.r8.shaking.Enqueuer):160:160 -> d
+    2:6:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory createUseRegistryFactory():432:436 -> d
+    7:7:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):858:858 -> d
+    7:7:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1532 -> d
+    8:9:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1536:1537 -> d
+    10:11:void markFieldAsTargeted(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):2522:2523 -> d
+    10:11:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1539 -> d
+    12:28:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1540:1556 -> 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):1556 -> d
+    30:36:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1559:1565 -> d
+    37:42:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1562:1567 -> d
+    43:43:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexProgramClass):488:488 -> d
+    43:43:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1567 -> d
+    44:44:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1572:1572 -> d
+    45:46:void markFieldAsTargeted(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):2522:2523 -> d
+    45:46:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1575 -> d
+    47:47:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):61:61 -> d
+    47:47:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):2527 -> d
+    47:47:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1578 -> d
+    48:48:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):2527:2527 -> d
+    48:48:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1578 -> d
+    49:49:void traceExceptionGuard(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1144:1144 -> d
+    50:50:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1135:1135 -> d
+    50:50:void traceExceptionGuard(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1145 -> d
+    51:57:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1149:1155 -> d
+    58:58:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):53:53 -> d
+    58:58:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1159 -> d
+    59:59: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
+    59:59:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):53 -> d
+    59:59:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1159 -> d
+    60:60:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1159:1159 -> d
+    61:61:void lambda$traceInvokeSuper$14(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1288:1288 -> d
+    62:73:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1301:1312 -> d
+    74:86:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1307:1319 -> d
+    87:87:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
+    87:87:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1319 -> d
+    88:89:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1321:1322 -> d
+    90:90:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1362:1362 -> d
+    91:99:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):1612:1620 -> d
+    100:100:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1644:1644 -> d
+    100:100:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):1624 -> d
+    101:105:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1648:1652 -> d
+    106:108:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1651:1653 -> d
+    109:109:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1649:1649 -> d
+    110:110:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$ensureMethodsContinueToWidenAccess$25(com.android.tools.r8.graph.DexType):1746:1746 -> d
+    111:111:java.util.Set lambda$markInterfaceTypeAsLiveViaInheritanceClause$28(com.android.tools.r8.graph.DexProgramClass):1789:1789 -> d
+    112:112:void shouldNotBeMinified(com.android.tools.r8.graph.DexReference):2096:2096 -> d
+    113:113:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():569:569 -> d
+    113:113:void shouldNotBeMinified(com.android.tools.r8.graph.DexReference):2096 -> d
+    114:114:void shouldNotBeMinified(com.android.tools.r8.graph.DexReference):2097:2097 -> d
+    115:115:void com.android.tools.r8.shaking.RootSetBuilder$RootSet.shouldNotBeMinified(com.android.tools.r8.graph.DexReference):1965:1965 -> d
+    115:115:void shouldNotBeMinified(com.android.tools.r8.graph.DexReference):2097 -> d
+    116:119:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2595:2598 -> d
+    120:120:boolean com.android.tools.r8.shaking.KeepReason.isDueToReflectiveUse():0:0 -> d
+    120:120:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2599 -> d
+    121:126:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2597:2602 -> d
+    127:127:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
+    127:127:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2602 -> d
+    128:129:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2658:2659 -> d
+    130:130:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):2664:2664 -> d
+    130:130:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2659 -> d
+    131:131:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2660:2660 -> d
+    132:142:void synthesizeLambdas(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3187:3197 -> d
+    143:146:void com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions.addInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,boolean):3043:3046 -> d
+    143:146:void synthesizeLambdas(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3197 -> d
+    147:147:void synthesizeLambdas(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3199:3199 -> d
+    148:148:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.instantiatedIn(com.android.tools.r8.graph.ProgramMethod):33:33 -> d
+    148:148:void synthesizeLambdas(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3200 -> d
+    149:166:void synthesizeLambdas(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3201:3218 -> d
+    167:168:void synthesizeLambdas(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3188:3189 -> 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):1254 -> e
+    1:1:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1197 -> 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):1254 -> e
-    3:3:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1254:1254 -> e
-    4:4:com.android.tools.r8.shaking.GraphReporter access$400(com.android.tools.r8.shaking.Enqueuer):173:173 -> e
-    5:5:void recordTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):549:549 -> e
-    6:17:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1109:1120 -> e
-    18:22:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1119:1123 -> e
+    2:2:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1197 -> e
+    3:3:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1197:1197 -> e
+    4:4:com.android.tools.r8.shaking.GraphReporter access$400(com.android.tools.r8.shaking.Enqueuer):160:160 -> e
+    5:5:void recordTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):501:501 -> e
+    6:17:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1052:1063 -> e
+    18:22:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1062:1066 -> e
     23:23:boolean com.android.tools.r8.utils.Visibility.isPublic():28:28 -> e
-    23:23:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1127 -> e
-    24:27:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1132:1135 -> e
+    23:23:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1070 -> e
+    24:27:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1075:1078 -> e
     28:28:boolean com.android.tools.r8.utils.Visibility.isPrivate():20:20 -> e
-    28:28:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1135 -> e
-    29:32:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1135:1138 -> e
+    28:28:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1078 -> e
+    29:32:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1078:1081 -> e
     33:33:boolean com.android.tools.r8.utils.Visibility.isProtected():24:24 -> e
-    33:33:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1142 -> e
-    34:34:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1147:1147 -> e
+    33:33:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1085 -> e
+    34:34:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1090:1090 -> e
     35:35:boolean com.android.tools.r8.utils.Visibility.isPackagePrivate():16:16 -> e
-    35:35:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1151 -> e
-    36:36:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1151:1151 -> e
+    35:35:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1094 -> e
+    36:36:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1094:1094 -> e
     37:37:boolean com.android.tools.r8.utils.Visibility.isPackagePrivate():16:16 -> e
-    37:37:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1152 -> e
-    38:38:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1152:1152 -> e
-    39:39:void lambda$traceInvokeVirtual$16(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1391:1391 -> e
-    40:40:void traceInstanceFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1435:1435 -> e
-    41:41:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$21(com.android.tools.r8.graph.DexType):1745:1745 -> e
-    42:42:java.util.Set lambda$markVirtualMethodAsReachable$43(com.android.tools.r8.graph.DexProgramClass):2887:2887 -> e
-    43:52:void synthesizeLambdas(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3392:3401 -> e
-    53:54:void com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions.addInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):3181:3182 -> e
-    53:54:void synthesizeLambdas(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3402 -> e
-    55:55:void synthesizeLambdas(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3404:3404 -> e
-    56:56:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.instantiatedIn(com.android.tools.r8.graph.ProgramMethod):33:33 -> e
-    56:56:void synthesizeLambdas(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3405 -> e
-    57:74:void synthesizeLambdas(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3406:3423 -> e
-    75:76:void synthesizeLambdas(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3393:3394 -> e
-    77:82:void ensureLambdaAccessibility():3551:3556 -> e
-    83:86:void unpinLambdaMethods():3578:3581 -> e
-    83:86:void ensureLambdaAccessibility():3573 -> e
-    87:90:void com.android.tools.r8.shaking.RootSetUtils$RootSet.prune(com.android.tools.r8.graph.DexReference):1922:1925 -> e
-    87:90:void unpinLambdaMethods():3581 -> e
-    87:90:void ensureLambdaAccessibility():3573 -> e
-    91:94:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.ProgramMethod):4091:4094 -> e
+    37:37:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1095 -> e
+    38:38:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1095:1095 -> e
+    39:39:void lambda$traceInvokeVirtual$15(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1322:1322 -> e
+    40:40:void traceInstanceFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1366:1366 -> e
+    41:41:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$20(com.android.tools.r8.graph.DexType):1652:1652 -> e
+    42:42:java.util.Set lambda$markVirtualMethodAsReachable$41(com.android.tools.r8.graph.DexProgramClass):2761:2761 -> e
+    43:48:void ensureLambdaAccessibility():3346:3351 -> e
+    49:52:void unpinLambdaMethods():3374:3377 -> e
+    49:52:void ensureLambdaAccessibility():3369 -> e
+    53:56:void com.android.tools.r8.shaking.RootSetBuilder$RootSet.prune(com.android.tools.r8.graph.DexReference):1912:1915 -> e
+    53:56:void unpinLambdaMethods():3377 -> e
+    53:56:void ensureLambdaAccessibility():3369 -> e
+    57:66:void synthesizeLibraryConversionWrappers(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3446:3455 -> 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):1279 -> f
+    1:1:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1222 -> 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):1279 -> f
-    3:3:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1279:1279 -> f
-    4:4:com.android.tools.r8.shaking.EnqueuerWorklist access$500(com.android.tools.r8.shaking.Enqueuer):173:173 -> f
-    5:5:com.android.tools.r8.shaking.GraphReporter getGraphReporter():476:476 -> f
-    6:6:void traceInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1196:1196 -> f
-    7:7:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1192:1192 -> f
-    7:7:void traceInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1197 -> f
-    8:8:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1487:1487 -> f
-    9:9:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$22(com.android.tools.r8.graph.DexType):1801:1801 -> f
-    10:21:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):2033:2044 -> f
-    22:28:boolean markDirectClassInitializerAsLive(com.android.tools.r8.graph.DexProgramClass):2065:2071 -> f
-    22:28:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):2048 -> f
-    29:32:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):2054:2057 -> f
-    33:42:void synthesizeLibraryConversionWrappers(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3650:3659 -> f
-    43:43:void traceCode(com.android.tools.r8.graph.ProgramMethod):4066:4066 -> f
-    1:1:com.android.tools.r8.shaking.Enqueuer$SetWithReason access$600(com.android.tools.r8.shaking.Enqueuer):173:173 -> g
-    2:2:com.android.tools.r8.shaking.Enqueuer$Mode getMode():472:472 -> g
-    3:3:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1343:1343 -> g
-    4:14:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1675:1685 -> g
-    4:14:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1348 -> g
-    15:20:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1349:1354 -> g
-    21:21:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> g
-    21:21:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1354 -> g
-    22:23:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1356:1357 -> g
-    24:32:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1395:1403 -> g
-    33:33:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.instantiatedIn(com.android.tools.r8.graph.ProgramMethod) -> g
-    33:33:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1407 -> g
-    34:34:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1403:1403 -> g
-    35:35:void traceInstanceFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1491:1491 -> g
-    36:36:java.util.Set lambda$processAnnotation$30(com.android.tools.r8.graph.DexType):1962:1962 -> g
-    37:52:void markInterfaceInitializedDirectly(com.android.tools.r8.graph.DexProgramClass):2081:2096 -> g
-    53:54:void synthesizeTwrCloseResource(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3386:3387 -> g
+    2:2:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1222 -> f
+    3:3:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1222:1222 -> f
+    4:4:com.android.tools.r8.shaking.EnqueuerWorklist access$500(com.android.tools.r8.shaking.Enqueuer):160:160 -> f
+    5:5:com.android.tools.r8.shaking.GraphReporter getGraphReporter():428:428 -> f
+    6:6:void traceInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1139:1139 -> f
+    7:7:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1135:1135 -> f
+    7:7:void traceInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1140 -> f
+    8:8:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1412:1412 -> f
+    9:9:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$21(com.android.tools.r8.graph.DexType):1690:1690 -> f
+    10:21:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):1912:1923 -> f
+    22:28:boolean markDirectClassInitializerAsLive(com.android.tools.r8.graph.DexProgramClass):1944:1950 -> f
+    22:28:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):1927 -> f
+    29:32:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):1933:1936 -> f
+    1:1:com.android.tools.r8.shaking.Enqueuer$SetWithReason access$600(com.android.tools.r8.shaking.Enqueuer):160:160 -> g
+    2:2:com.android.tools.r8.shaking.Enqueuer$Mode getMode():424:424 -> g
+    3:3:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1274:1274 -> g
+    4:4:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1582:1582 -> g
+    4:4:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1279 -> g
+    5:5:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> g
+    5:5:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1582 -> g
+    5:5:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1279 -> g
+    6:15:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1583:1592 -> g
+    6:15:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1279 -> g
+    16:21:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1280:1285 -> 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):1285 -> g
+    23:24:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1287:1288 -> g
+    25:33:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1326:1334 -> 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):1338 -> g
+    35:35:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1334:1334 -> g
+    36:36:void traceInstanceFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1416:1416 -> g
+    37:37:java.util.Set lambda$processAnnotation$29(com.android.tools.r8.graph.DexType):1844:1844 -> g
+    38:53:void markInterfaceInitializedDirectly(com.android.tools.r8.graph.DexProgramClass):1960:1975 -> 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):1361 -> h
+    1:1:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1292 -> 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):1361 -> h
-    3:3:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1361:1361 -> h
-    4:4:java.util.Set access$900(com.android.tools.r8.shaking.Enqueuer):173:173 -> h
-    5:5:void recordCompilerSynthesizedTypeReference(com.android.tools.r8.graph.DexType):540:540 -> h
-    6:6:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2243:2243 -> h
-    6:6:void recordCompilerSynthesizedTypeReference(com.android.tools.r8.graph.DexType):542 -> h
-    7:8:void recordCompilerSynthesizedTypeReference(com.android.tools.r8.graph.DexType):543:544 -> h
-    9:9:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1192:1192 -> h
-    10:10:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1543:1543 -> h
-    11:28:boolean markInterfaceInitializedIndirectly(com.android.tools.r8.graph.DexProgramClass):2106:2123 -> h
-    29:31:long getNumberOfLiveItems():3779:3781 -> h
-    1:1:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory getUseRegistryFactory():488:488 -> i
-    2:2:void traceStaticFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1547:1547 -> i
-    3:9:void reportMissingClass(com.android.tools.r8.graph.DexType):2247:2247 -> i
-    15:16:void reportMissingClass(com.android.tools.r8.graph.DexType):2253:2254 -> i
-    17:24:void transitionDependentItemsForInstantiatedItem(com.android.tools.r8.graph.DexProgramClass):2624:2631 -> i
-    1:1:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1610:1610 -> j
-    2:5:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):2635:2638 -> j
-    6:6:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1737:1737 -> j
-    6:6:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):2639 -> j
-    7:7:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):2643:2643 -> j
-    8:20:void synthesize():3273:3285 -> j
-    21:22:void synthesizeNestConstructor(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3376:3377 -> j
-    21:22:void synthesize():3286 -> j
-    23:24:void com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions.addProgramClass(com.android.tools.r8.graph.DexProgramClass):3191:3192 -> j
-    23:24:void synthesizeNestConstructor(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3380 -> j
-    23:24:void synthesize():3286 -> j
-    25:38:void synthesize():3287:3300 -> j
-    39:40:void com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions.amendMainDexClasses(com.android.tools.r8.shaking.MainDexClasses):3214:3215 -> j
-    39:40:void synthesize():3300 -> j
-    41:42:void com.android.tools.r8.shaking.MainDexClasses.addAll(java.lang.Iterable):48:49 -> j
-    41:42:void com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions.amendMainDexClasses(com.android.tools.r8.shaking.MainDexClasses):3215 -> j
-    41:42:void synthesize():3300 -> j
-    43:48:void synthesize():3301:3306 -> j
-    1:1:void traceStaticFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1614:1614 -> k
-com.android.tools.r8.shaking.Enqueuer$1 -> com.android.tools.r8.shaking.p$a:
-com.android.tools.r8.shaking.Enqueuer$AnnotationReferenceMarker -> com.android.tools.r8.shaking.p$b:
+    2:2:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1292 -> h
+    3:3:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1292:1292 -> h
+    4:4:java.util.Set access$900(com.android.tools.r8.shaking.Enqueuer):160:160 -> h
+    5:5:void recordCompilerSynthesizedTypeReference(com.android.tools.r8.graph.DexType):492:492 -> h
+    6:6:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2121:2121 -> h
+    6:6:void recordCompilerSynthesizedTypeReference(com.android.tools.r8.graph.DexType):494 -> h
+    7:8:void recordCompilerSynthesizedTypeReference(com.android.tools.r8.graph.DexType):495:496 -> h
+    9:9:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1135:1135 -> h
+    10:10:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1462:1462 -> h
+    11:28:boolean markInterfaceInitializedIndirectly(com.android.tools.r8.graph.DexProgramClass):1985:2002 -> h
+    29:31:long getNumberOfLiveItems():3575:3577 -> h
+    1:1:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory getUseRegistryFactory():440:440 -> i
+    2:2:void traceStaticFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1466:1466 -> i
+    3:9:void reportMissingClass(com.android.tools.r8.graph.DexType):2125:2125 -> i
+    15:16:void reportMissingClass(com.android.tools.r8.graph.DexType):2131:2132 -> i
+    17:22:void transitionDependentItemsForInstantiatedItem(com.android.tools.r8.graph.DexProgramClass):2498:2503 -> i
+    23:23:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> i
+    23:23:void transitionDependentItemsForInstantiatedItem(com.android.tools.r8.graph.DexProgramClass):2503 -> i
+    24:26:void transitionDependentItemsForInstantiatedItem(com.android.tools.r8.graph.DexProgramClass):2503:2505 -> i
+    1:1:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1523:1523 -> j
+    2:10:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):2509:2517 -> j
+    11:35:void synthesize():3131:3155 -> j
+    36:37:void com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions.amendMainDexClasses(com.android.tools.r8.shaking.MainDexClasses):3077:3078 -> j
+    36:37:void synthesize():3155 -> j
+    38:39:void com.android.tools.r8.shaking.MainDexClasses.addAll(java.lang.Iterable):48:49 -> j
+    38:39:void com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions.amendMainDexClasses(com.android.tools.r8.shaking.MainDexClasses):3078 -> j
+    38:39:void synthesize():3155 -> j
+    40:45:void synthesize():3156:3161 -> j
+    1:1:void traceStaticFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1527:1527 -> k
+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 -> c
     com.android.tools.r8.shaking.KeepReason reason -> d
     com.android.tools.r8.shaking.Enqueuer this$0 -> e
     com.android.tools.r8.graph.DexItem annotationHolder -> a
     com.android.tools.r8.graph.ProgramDefinition context -> b
-    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.shaking.Enqueuer$1):4610:4610 -> <init>
-    2:6:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.KeepReason):4621:4625 -> <init>
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.shaking.Enqueuer$1):4385:4385 -> <init>
+    2:6:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.KeepReason):4396:4400 -> <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):4635:4636 -> b
-    3:3:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):282:282 -> b
-    3:3:boolean addField(com.android.tools.r8.graph.DexField):4640 -> b
-    4:4:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.toProgramFieldOrNull(com.android.tools.r8.graph.DexEncodedField):291:291 -> b
-    4:4:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):282 -> b
-    4:4:boolean addField(com.android.tools.r8.graph.DexField):4640 -> b
-    5:8:boolean addField(com.android.tools.r8.graph.DexField):4645:4648 -> b
-    9:9:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():209:209 -> b
-    9:9:boolean addField(com.android.tools.r8.graph.DexField):4648 -> b
-    10:20:boolean addField(com.android.tools.r8.graph.DexField):4650:4660 -> b
-    21:27:boolean addField(com.android.tools.r8.graph.DexField):4659:4665 -> b
-    28:28:boolean addField(com.android.tools.r8.graph.DexField):4664:4664 -> b
-    29:40:boolean addMethod(com.android.tools.r8.graph.DexMethod):4673:4684 -> b
-    41:51:boolean addMethod(com.android.tools.r8.graph.DexMethod):4682:4692 -> b
-    52:52:boolean addMethod(com.android.tools.r8.graph.DexMethod):4690:4690 -> b
-    53:54:boolean addType(com.android.tools.r8.graph.DexType):4722:4723 -> b
-com.android.tools.r8.shaking.Enqueuer$EnqueuerDefinitionSupplier -> com.android.tools.r8.shaking.p$c:
+    1:2:boolean addField(com.android.tools.r8.graph.DexField):4410:4411 -> b
+    3:3:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):232:232 -> b
+    3:3:boolean addField(com.android.tools.r8.graph.DexField):4415 -> b
+    4:4:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.toProgramFieldOrNull(com.android.tools.r8.graph.DexEncodedField):241:241 -> b
+    4:4:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):232 -> b
+    4:4:boolean addField(com.android.tools.r8.graph.DexField):4415 -> b
+    5:8:boolean addField(com.android.tools.r8.graph.DexField):4420:4423 -> b
+    9:9:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():199:199 -> b
+    9:9:boolean addField(com.android.tools.r8.graph.DexField):4423 -> b
+    10:20:boolean addField(com.android.tools.r8.graph.DexField):4425:4435 -> b
+    21:27:boolean addField(com.android.tools.r8.graph.DexField):4434:4440 -> b
+    28:28:boolean addField(com.android.tools.r8.graph.DexField):4439:4439 -> b
+    29:40:boolean addMethod(com.android.tools.r8.graph.DexMethod):4448:4459 -> b
+    41:51:boolean addMethod(com.android.tools.r8.graph.DexMethod):4457:4467 -> b
+    52:52:boolean addMethod(com.android.tools.r8.graph.DexMethod):4465:4465 -> b
+    53:54:boolean addType(com.android.tools.r8.graph.DexType):4497:4498 -> b
+com.android.tools.r8.shaking.Enqueuer$EnqueuerDefinitionSupplier -> com.android.tools.r8.shaking.q$c:
     com.android.tools.r8.shaking.Enqueuer enqueuer -> a
-    1:2:void <init>(com.android.tools.r8.shaking.Enqueuer):4733:4734 -> <init>
-    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):4738:4738 -> a
-    2:2:void lambda$definitionFor$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType):4738:4738 -> a
-com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet -> com.android.tools.r8.shaking.p$d:
+    1:2:void <init>(com.android.tools.r8.shaking.Enqueuer):4508:4509 -> <init>
+    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):4513:4513 -> a
+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):4536:4536 -> <init>
-    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4532:4537 -> <init>
-    1:1:java.util.Set access$1300(com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet):4530:4530 -> a
-    2:5:boolean add(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4541:4544 -> a
-    6:6:boolean contains(com.android.tools.r8.graph.DexEncodedField):4548:4548 -> a
-    7:7:boolean contains(com.android.tools.r8.graph.ProgramField):4552:4552 -> a
-    8:8:boolean contains(com.android.tools.r8.graph.DexEncodedField):4548:4548 -> a
-    8:8:boolean contains(com.android.tools.r8.graph.ProgramField):4552 -> a
-com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet -> com.android.tools.r8.shaking.p$e:
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4311:4311 -> <init>
+    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4307:4312 -> <init>
+    1:1:java.util.Set access$1300(com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet):4305:4305 -> a
+    2:5:boolean add(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4316:4319 -> a
+    6:6:boolean contains(com.android.tools.r8.graph.DexEncodedField):4323:4323 -> a
+    7:7:boolean contains(com.android.tools.r8.graph.ProgramField):4327:4327 -> a
+    8:8:boolean contains(com.android.tools.r8.graph.DexEncodedField):4323:4323 -> a
+    8:8:boolean contains(com.android.tools.r8.graph.ProgramField):4327 -> 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):4562:4562 -> <init>
-    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4558:4563 -> <init>
-    1:1:java.util.Set access$1200(com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet):4556:4556 -> a
-    2:5:boolean add(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4567:4570 -> a
-    6:6:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):4574:4574 -> a
-    7:7:boolean contains(com.android.tools.r8.graph.ProgramMethod):4578:4578 -> a
-    8:8:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):4574:4574 -> a
-    8:8:boolean contains(com.android.tools.r8.graph.ProgramMethod):4578 -> a
-    9:9:java.util.Set getItems():4582:4582 -> a
-com.android.tools.r8.shaking.Enqueuer$Mode -> com.android.tools.r8.shaking.p$f:
-    com.android.tools.r8.shaking.Enqueuer$Mode WHY_ARE_YOU_KEEPING -> e
-    com.android.tools.r8.shaking.Enqueuer$Mode FINAL_MAIN_DEX_TRACING -> d
-    com.android.tools.r8.shaking.Enqueuer$Mode INITIAL_MAIN_DEX_TRACING -> c
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4337:4337 -> <init>
+    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4333:4338 -> <init>
+    1:1:java.util.Set access$1200(com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet):4331:4331 -> a
+    2:5:boolean add(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4342:4345 -> a
+    6:6:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):4349:4349 -> a
+    7:7:boolean contains(com.android.tools.r8.graph.ProgramMethod):4353:4353 -> a
+    8:8:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):4349:4349 -> a
+    8:8:boolean contains(com.android.tools.r8.graph.ProgramMethod):4353 -> a
+    9:9:java.util.Set getItems():4357:4357 -> 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:5:void <clinit>():176:180 -> <clinit>
-    1:1:void <init>(java.lang.String,int):175:175 -> <init>
-    1:1:boolean isFinalTreeShaking():187:187 -> a
-    1:1:boolean isInitialOrFinalTreeShaking():191:191 -> b
-    1:1:boolean isInitialTreeShaking():183:183 -> c
-    1:1:boolean isInitialMainDexTracing():195:195 -> d
-    1:1:boolean isMainDexTracing():203 -> d
-    2:2:boolean isFinalMainDexTracing():199:199 -> d
-    2:2:boolean isMainDexTracing():203 -> d
-com.android.tools.r8.shaking.Enqueuer$SetWithReason -> com.android.tools.r8.shaking.p$g:
+    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):4592:4592 -> <init>
-    2:7:void <init>(java.util.function.BiConsumer):4588:4593 -> <init>
-    1:2:boolean add(java.lang.Object,com.android.tools.r8.shaking.KeepReason):4597:4598 -> a
-    3:3:boolean contains(java.lang.Object):4602:4602 -> a
-    4:4:java.util.Set getItems():4606:4606 -> a
-com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason -> com.android.tools.r8.shaking.p$h:
+    1:1:void <init>(java.util.function.BiConsumer):4367:4367 -> <init>
+    2:7:void <init>(java.util.function.BiConsumer):4363:4368 -> <init>
+    1:2:boolean add(java.lang.Object,com.android.tools.r8.shaking.KeepReason):4372:4373 -> a
+    3:3:boolean contains(java.lang.Object):4377:4377 -> a
+    4:4:java.util.Set getItems():4381:4381 -> 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>():4499:4499 -> <clinit>
-    1:4:void <init>():4499:4502 -> <init>
-    5:5:void <init>(com.android.tools.r8.shaking.Enqueuer$1):4499:4499 -> <init>
-    1:1:java.util.Set access$200(com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason):4499:4499 -> a
-    2:4:boolean add(java.lang.Object,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):4505:4507 -> a
-    5:5:boolean contains(java.lang.Object):4514:4514 -> a
-    6:7:boolean registerDeferredAction(java.lang.Object,com.android.tools.r8.utils.Action):4518:4519 -> a
-    8:8:java.util.Set getItems():4526:4526 -> a
-    1:1:java.util.List lambda$registerDeferredAction$0(java.lang.Object):4519:4519 -> b
-com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions -> com.android.tools.r8.shaking.p$i:
-    java.util.List desugaredMethods -> b
-    java.util.Map syntheticInstantiations -> c
-    java.util.Set mainDexTypes -> i
-    java.util.List liveMethodsWithKeepActions -> h
+    1:1:void <clinit>():4274:4274 -> <clinit>
+    1:4:void <init>():4274:4277 -> <init>
+    5:5:void <init>(com.android.tools.r8.shaking.Enqueuer$1):4274:4274 -> <init>
+    1:1:java.util.Set access$200(com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason):4274:4274 -> a
+    2:4:boolean add(java.lang.Object,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):4280:4282 -> a
+    5:5:boolean contains(java.lang.Object):4289:4289 -> a
+    6:7:boolean registerDeferredAction(java.lang.Object,com.android.tools.r8.utils.Action):4293:4294 -> a
+    8:8:java.util.Set getItems():4301:4301 -> a
+    1:1:java.util.List lambda$registerDeferredAction$0(java.lang.Object):4294:4294 -> b
+com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions -> com.android.tools.r8.shaking.q$i:
+    java.util.Set mainDexTypes -> g
+    java.util.Map syntheticInstantiations -> b
+    java.util.Map liveMethods -> d
+    java.util.List liveMethodsWithKeepActions -> f
     boolean $assertionsDisabled -> a
-    java.util.Map liveMethods -> e
-    java.util.Map syntheticProgramClasses -> f
-    com.android.tools.r8.utils.collections.ProgramMethodMap syntheticStaticFieldReadsByContext -> d
-    java.util.Map syntheticClasspathClasses -> g
-    1:1:void <clinit>():3146:3146 -> <clinit>
-    1:22:void <init>():3146:3167 -> <init>
-    23:23:void <init>(com.android.tools.r8.shaking.Enqueuer$1):3146:3146 -> <init>
-    1:7:boolean isEmpty():3170:3176 -> a
-    8:9:void addClasspathClass(com.android.tools.r8.graph.DexClasspathClass):3186:3187 -> a
-    10:12:void addLiveMethod(com.android.tools.r8.graph.ProgramMethod):3196:3198 -> a
-    13:17:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):3219:3223 -> a
-    18:18:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.fakeReportShouldNotBeUsed():73:73 -> a
-    18:18:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):3223 -> a
-    19:29:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):3225:3235 -> a
-    30:45:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):3233:3248 -> a
-    46:46:void lambda$enqueueWorkItems$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.utils.Pair):3230:3230 -> a
-    47:47:void lambda$enqueueWorkItems$2(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,java.util.Set):3241:3241 -> a
-    48:48:void lambda$enqueueWorkItems$1(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexField):3242:3242 -> a
-    49:49:void registerStatelessLambdaInstanceFieldReads(com.android.tools.r8.utils.collections.ProgramMethodMap):3253:3253 -> a
-    50:57:void registerStatelessLambdaInstanceFieldReads(com.android.tools.r8.graph.ProgramMethod,java.util.Map):3259:3266 -> a
+    java.util.Map syntheticClasspathClasses -> e
+    com.android.tools.r8.utils.collections.ProgramMethodMap syntheticStaticFieldReadsByContext -> c
+    1:1:void <clinit>():3013:3013 -> <clinit>
+    1:18:void <init>():3013:3030 -> <init>
+    19:19:void <init>(com.android.tools.r8.shaking.Enqueuer$1):3013:3013 -> <init>
+    1:5:boolean isEmpty():3033:3037 -> a
+    6:7:void addClasspathClass(com.android.tools.r8.graph.DexClasspathClass):3051:3052 -> a
+    8:10:void addLiveMethod(com.android.tools.r8.graph.ProgramMethod):3056:3058 -> a
+    11:14:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):3082:3085 -> a
+    15:15:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.fakeReportShouldNotBeUsed():73:73 -> a
+    15:15:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):3085 -> a
+    16:22:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):3087:3093 -> a
+    23:38:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):3091:3106 -> a
+    39:39:void lambda$enqueueWorkItems$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.utils.Pair):3088:3088 -> a
+    40:40:void lambda$enqueueWorkItems$2(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,java.util.Set):3099:3099 -> a
+    41:41:void lambda$enqueueWorkItems$1(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexField):3100:3100 -> a
+    42:42:void registerStatelessLambdaInstanceFieldReads(com.android.tools.r8.utils.collections.ProgramMethodMap):3111:3111 -> a
+    43:50:void registerStatelessLambdaInstanceFieldReads(com.android.tools.r8.graph.ProgramMethod,java.util.Map):3117:3124 -> a
     1:1:java.util.LinkedHashSet com.android.tools.r8.com.google.common.collect.Sets.newLinkedHashSet():347:347 -> b
-    1:1:java.util.Set lambda$registerStatelessLambdaInstanceFieldReads$3(com.android.tools.r8.graph.ProgramMethod):3264 -> b
-com.android.tools.r8.shaking.EnqueuerFactory -> com.android.tools.r8.shaking.q:
-    1:11:com.android.tools.r8.shaking.Enqueuer createForFinalTreeShaking(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer,java.util.Set):37:47 -> a
-    12:12:void lambda$createForFinalTreeShaking$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.ir.analysis.proto.ProtoShrinker):46:46 -> a
-    13:13:com.android.tools.r8.shaking.Enqueuer createForInitialMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.SubtypingInfo):55:55 -> a
-    14:14:com.android.tools.r8.shaking.Enqueuer createForFinalMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.MainDexTracingResult):70:70 -> a
-    15:15:com.android.tools.r8.shaking.Enqueuer createForWhyAreYouKeeping(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer):84:84 -> a
-    1:1:com.android.tools.r8.shaking.Enqueuer createForInitialTreeShaking(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.SubtypingInfo):22:22 -> b
-com.android.tools.r8.shaking.EnqueuerMetadataTraceable -> com.android.tools.r8.internal.Ya:
+    1:1:java.util.Set lambda$registerStatelessLambdaInstanceFieldReads$3(com.android.tools.r8.graph.ProgramMethod):3122 -> b
+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):20:20 -> a
+    2:6: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):28:32 -> a
+    7:7:void lambda$createForFinalTreeShaking$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.ir.analysis.proto.ProtoShrinker):31:31 -> a
+    8:8: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.ta:
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
-com.android.tools.r8.shaking.EnqueuerUseRegistryFactory -> com.android.tools.r8.internal.Za:
+com.android.tools.r8.shaking.EnqueuerUseRegistryFactory -> com.android.tools.r8.internal.ua:
     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.r:
+com.android.tools.r8.shaking.EnqueuerWorklist -> com.android.tools.r8.shaking.s:
     java.util.Queue queue -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():18:18 -> <clinit>
-    1:1:void <init>():256:256 -> <init>
-    2:2:void <init>():254:254 -> <init>
-    1:1:com.android.tools.r8.shaking.EnqueuerWorklist createWorklist():259:259 -> a
-    2:2:void enqueueMarkReachableDirectAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):272:272 -> a
-    3:3:void enqueueMarkReachableSuperAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):276:276 -> a
-    4:4:void enqueueMarkReachableFieldAction(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):281:281 -> a
-    5:5: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):291:291 -> a
-    6:6:boolean com.android.tools.r8.graph.DexClass.isAnnotation():571:571 -> 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):291 -> a
-    7:9: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):291:293 -> a
-    10:10:void enqueueMarkAnnotationInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):297:297 -> a
-    11:11:boolean com.android.tools.r8.graph.DexClass.isAnnotation():571:571 -> a
-    11:11:void enqueueMarkAnnotationInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):297 -> a
-    12:14:void enqueueMarkAnnotationInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):297:299 -> a
-    15:15:void enqueueMarkMethodLiveAction(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):309:309 -> a
-    16:16:void enqueueMarkMethodKeptAction(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):313:313 -> a
-    17:17:void enqueueMarkFieldKeptAction(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):317:317 -> a
-    18:18:void enqueueTraceCodeAction(com.android.tools.r8.graph.ProgramMethod):321:321 -> a
-    19:19:void enqueueTraceConstClassAction(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):325:325 -> a
-    20:20:void enqueueTraceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):337:337 -> a
-    1:1:boolean isEmpty():263:263 -> b
-    2:2:void enqueueMarkInterfaceInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):303:303 -> b
-    3:3:boolean com.android.tools.r8.graph.DexClass.isAnnotation():571:571 -> b
-    3:3:void enqueueMarkInterfaceInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):303 -> b
-    4:6:void enqueueMarkInterfaceInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):303:305 -> b
-    7:7:void enqueueTraceInvokeDirectAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):329:329 -> b
-    8:8:void enqueueTraceNewInstanceAction(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):333:333 -> b
-    1:1:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction poll():267:267 -> c
-com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction -> com.android.tools.r8.shaking.r$a:
+    1:1:void <init>():243:243 -> <init>
+    2:2:void <init>():241:241 -> <init>
+    1:1:com.android.tools.r8.shaking.EnqueuerWorklist createWorklist():246:246 -> a
+    2:2:void enqueueMarkReachableDirectAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):259:259 -> a
+    3:3:void enqueueMarkReachableSuperAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):263:263 -> a
+    4:4:void enqueueMarkReachableFieldAction(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):268:268 -> a
+    5:5: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):278:278 -> a
+    6:6:boolean com.android.tools.r8.graph.DexClass.isAnnotation():553:553 -> 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):278 -> a
+    7:9: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):278:280 -> a
+    10:10:void enqueueMarkAnnotationInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):284:284 -> a
+    11:11:boolean com.android.tools.r8.graph.DexClass.isAnnotation():553:553 -> a
+    11:11:void enqueueMarkAnnotationInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):284 -> a
+    12:14:void enqueueMarkAnnotationInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):284:286 -> a
+    15:15:void enqueueMarkMethodLiveAction(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):296:296 -> a
+    16:16:void enqueueMarkMethodKeptAction(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):300:300 -> a
+    17:17:void enqueueMarkFieldKeptAction(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):304:304 -> a
+    18:18:void enqueueTraceConstClassAction(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):308:308 -> a
+    19:19:void enqueueTraceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):320:320 -> a
+    1:1:boolean isEmpty():250:250 -> b
+    2:2:void enqueueMarkInterfaceInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):290:290 -> b
+    3:3:boolean com.android.tools.r8.graph.DexClass.isAnnotation():553:553 -> b
+    3:3:void enqueueMarkInterfaceInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):290 -> b
+    4:6:void enqueueMarkInterfaceInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):290:292 -> b
+    7:7:void enqueueTraceInvokeDirectAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):312:312 -> b
+    8:8:void enqueueTraceNewInstanceAction(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):316:316 -> b
+    1:1:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction poll():254:254 -> c
+com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction -> com.android.tools.r8.shaking.s$a:
     1:1:void <init>():20:20 -> <init>
     void run(com.android.tools.r8.shaking.Enqueuer) -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkAnnotationInstantiatedAction -> com.android.tools.r8.shaking.s:
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkAnnotationInstantiatedAction -> com.android.tools.r8.shaking.t:
     com.android.tools.r8.graph.DexProgramClass target -> a
     com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reason -> b
     1:3:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):105:107 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):112:112 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkFieldKeptAction -> com.android.tools.r8.shaking.t:
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkFieldKeptAction -> com.android.tools.r8.shaking.u:
     com.android.tools.r8.graph.ProgramField field -> a
     com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness witness -> b
     1:3:void <init>(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):166:168 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):173:173 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkInstantiatedAction -> com.android.tools.r8.shaking.u:
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkInstantiatedAction -> com.android.tools.r8.shaking.v:
     com.android.tools.r8.shaking.InstantiationReason instantiationReason -> c
     com.android.tools.r8.shaking.KeepReason keepReason -> d
     com.android.tools.r8.graph.DexProgramClass target -> a
     com.android.tools.r8.graph.ProgramMethod context -> b
     1:5:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):88:92 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):97:97 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkInterfaceInstantiatedAction -> com.android.tools.r8.shaking.v:
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkInterfaceInstantiatedAction -> com.android.tools.r8.shaking.w:
     com.android.tools.r8.graph.DexProgramClass target -> a
     com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reason -> b
     1:3:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):120:122 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):127:127 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkMethodKeptAction -> com.android.tools.r8.shaking.w:
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkMethodKeptAction -> com.android.tools.r8.shaking.x:
     com.android.tools.r8.shaking.KeepReason reason -> b
     com.android.tools.r8.graph.ProgramMethod target -> a
     1:3:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):151:153 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):158:158 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkMethodLiveAction -> com.android.tools.r8.shaking.x:
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkMethodLiveAction -> com.android.tools.r8.shaking.y:
     com.android.tools.r8.graph.ProgramDefinition context -> b
     com.android.tools.r8.graph.ProgramMethod method -> a
     1:3:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):136:138 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):143:143 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableDirectAction -> com.android.tools.r8.shaking.y:
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableDirectAction -> com.android.tools.r8.shaking.z:
     com.android.tools.r8.shaking.KeepReason reason -> c
     com.android.tools.r8.graph.ProgramDefinition context -> b
     com.android.tools.r8.graph.DexMethod target -> a
     1:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):30:33 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):38:38 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableFieldAction -> com.android.tools.r8.shaking.z:
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableFieldAction -> com.android.tools.r8.shaking.A:
     com.android.tools.r8.graph.ProgramField field -> a
     com.android.tools.r8.shaking.KeepReason reason -> c
     com.android.tools.r8.graph.ProgramDefinition context -> b
     1:4:void <init>(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):65:68 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):73:73 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableSuperAction -> com.android.tools.r8.shaking.A:
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableSuperAction -> com.android.tools.r8.shaking.B:
     com.android.tools.r8.graph.ProgramMethod context -> b
     com.android.tools.r8.graph.DexMethod target -> a
     1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):47:49 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):54:54 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$TraceCodeAction -> com.android.tools.r8.shaking.B:
-    com.android.tools.r8.graph.ProgramMethod method -> a
-    1:2:void <init>(com.android.tools.r8.graph.ProgramMethod):180:181 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):186:186 -> a
 com.android.tools.r8.shaking.EnqueuerWorklist$TraceConstClassAction -> com.android.tools.r8.shaking.C:
     com.android.tools.r8.graph.DexType type -> a
     com.android.tools.r8.graph.ProgramMethod context -> b
-    1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):195:197 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):202:202 -> a
+    1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):182:184 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):189:189 -> a
 com.android.tools.r8.shaking.EnqueuerWorklist$TraceInvokeDirectAction -> com.android.tools.r8.shaking.D:
     com.android.tools.r8.graph.ProgramMethod context -> b
     com.android.tools.r8.graph.DexMethod invokedMethod -> a
-    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):211:213 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):218:218 -> a
+    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):198:200 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):205:205 -> a
 com.android.tools.r8.shaking.EnqueuerWorklist$TraceNewInstanceAction -> com.android.tools.r8.shaking.E:
     com.android.tools.r8.graph.DexType type -> a
     com.android.tools.r8.graph.ProgramMethod context -> b
-    1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):227:229 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):234:234 -> a
+    1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):214:216 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):221:221 -> a
 com.android.tools.r8.shaking.EnqueuerWorklist$TraceStaticFieldReadAction -> com.android.tools.r8.shaking.F:
     com.android.tools.r8.graph.DexField field -> a
     com.android.tools.r8.graph.ProgramMethod context -> b
-    1:3:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):243:245 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):250:250 -> a
-com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier -> com.android.tools.r8.shaking.J:
-    java.util.Map newFieldAccessContexts -> a
-    1:1:void <init>(java.util.Map,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$1):17:17 -> <init>
-    2:3:void <init>(java.util.Map):60:61 -> <init>
-    1:2:void modify(com.android.tools.r8.graph.AppView):69:70 -> a
-    3:6:void lambda$modify$0(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$FieldAccessContexts):72:75 -> a
-com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$1 -> com.android.tools.r8.shaking.G:
-com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder -> com.android.tools.r8.shaking.H:
-    java.util.Map newFieldAccessContexts -> a
-    1:1:void <init>():84:84 -> <init>
-    2:2:void <init>():81:81 -> <init>
-    1:1:com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$FieldAccessContexts getFieldAccessContexts(com.android.tools.r8.graph.DexField):87:87 -> a
-    2:2:void recordFieldReadInContext(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):91:91 -> a
-    3:3:com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier build():108:108 -> a
-    1:1:com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$FieldAccessContexts lambda$getFieldAccessContexts$0(com.android.tools.r8.graph.DexField):87:87 -> b
-    2:2:void recordFieldWrittenInContext(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):100:100 -> b
-    1:1:com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder recordFieldReadInUnknownContext(com.android.tools.r8.graph.DexField):95:95 -> c
-    1:1:void recordFieldWriteInUnknownContext(com.android.tools.r8.graph.DexField):104:104 -> d
-com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$FieldAccessContexts -> com.android.tools.r8.shaking.I:
-    com.android.tools.r8.graph.AbstractAccessContexts writesWithContexts -> c
-    com.android.tools.r8.graph.AbstractAccessContexts readsWithContexts -> b
-    boolean $assertionsDisabled -> a
-    1:1:void <clinit>():19:19 -> <clinit>
-    1:4:void <init>():19:22 -> <init>
-    5:5:void <init>(com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$1):19:19 -> <init>
-    1:1:com.android.tools.r8.graph.AbstractAccessContexts access$200(com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$FieldAccessContexts):19:19 -> a
-    2:2:void addReadContext(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):25:25 -> a
-    3:3:boolean com.android.tools.r8.graph.AbstractAccessContexts.isBottom():0:0 -> a
-    3:3:void addReadContext(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):25 -> a
-    4:7:void addReadContext(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):26:29 -> a
-    8:8:boolean com.android.tools.r8.graph.AbstractAccessContexts.isConcrete():0:0 -> a
-    8:8:void addReadContext(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):29 -> a
-    9:11:void addReadContext(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):30:32 -> a
-    12:12:boolean com.android.tools.r8.graph.AbstractAccessContexts.isTop():0:0 -> a
-    12:12:void addReadContext(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):32 -> a
-    13:13:void addReadContext(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):32:32 -> a
-    14:14:void recordReadInUnknownContext():37:37 -> a
-    1:1:com.android.tools.r8.graph.AbstractAccessContexts access$300(com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$FieldAccessContexts):19:19 -> b
-    2:2:void addWriteContext(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):41:41 -> b
-    3:3:boolean com.android.tools.r8.graph.AbstractAccessContexts.isBottom():0:0 -> b
-    3:3:void addWriteContext(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):41 -> b
-    4:7:void addWriteContext(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):42:45 -> b
-    8:8:boolean com.android.tools.r8.graph.AbstractAccessContexts.isConcrete():0:0 -> b
-    8:8:void addWriteContext(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):45 -> b
-    9:11:void addWriteContext(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):46:48 -> b
-    12:12:boolean com.android.tools.r8.graph.AbstractAccessContexts.isTop():0:0 -> b
-    12:12:void addWriteContext(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):48 -> b
-    13:13:void addWriteContext(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):48:48 -> b
-    14:14:void recordWriteInUnknownContext():53:53 -> b
-com.android.tools.r8.shaking.FilteredClassPath -> com.android.tools.r8.internal.wc:
+    1:3:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):230:232 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):237:237 -> a
+com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier -> com.android.tools.r8.shaking.I:
+    java.util.Map newFieldAccesses -> a
+    1:2:void <init>(java.util.Map):25:26 -> <init>
+    1:2:void modify(com.android.tools.r8.graph.AppView):30:31 -> a
+    3:6:void lambda$modify$2(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$FieldReferences):33:36 -> a
+    7:7:void lambda$modify$0(com.android.tools.r8.graph.FieldAccessInfoImpl,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):34:34 -> a
+    1:1:void lambda$modify$1(com.android.tools.r8.graph.FieldAccessInfoImpl,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):35:35 -> b
+com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder -> com.android.tools.r8.shaking.G:
+    java.util.Map newFieldAccesses -> a
+    1:1:void <init>():44:44 -> <init>
+    2:2:void <init>():42:42 -> <init>
+    1:1:com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$FieldReferences getFieldReferences(com.android.tools.r8.graph.DexField):47:47 -> a
+    2:2:void recordFieldReadInContext(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):51:51 -> a
+    3:3:com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier build():59:59 -> a
+    1:1:com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$FieldReferences lambda$getFieldReferences$0(com.android.tools.r8.graph.DexField):47:47 -> b
+    2:2:void recordFieldWrittenInContext(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):55:55 -> b
+com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$FieldReferences -> com.android.tools.r8.shaking.H:
+    com.android.tools.r8.utils.collections.ProgramMethodSet readContexts -> b
+    com.android.tools.r8.utils.collections.ProgramMethodSet writeContexts -> a
+    1:3:void <init>():18:20 -> <init>
+    1:1:com.android.tools.r8.utils.collections.ProgramMethodSet access$000(com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$FieldReferences):18:18 -> a
+    1:1:com.android.tools.r8.utils.collections.ProgramMethodSet access$100(com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$FieldReferences):18:18 -> b
+com.android.tools.r8.shaking.FilteredClassPath -> com.android.tools.r8.internal.Pb:
     com.android.tools.r8.origin.Origin origin -> c
     com.android.tools.r8.position.Position position -> d
     java.nio.file.Path path -> a
@@ -73804,8 +74333,8 @@
     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.wd:
-com.android.tools.r8.shaking.GraphReporter -> com.android.tools.r8.shaking.K:
+com.android.tools.r8.shaking.GlobalKeepInfoConfiguration -> com.android.tools.r8.internal.Kc:
+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
     java.util.Map reasonInfo -> j
@@ -73834,7 +74363,7 @@
     52:57:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):168 -> a
     58:58:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):171:171 -> a
     59:59:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.ProgramMethod):175:175 -> a
-    60:60:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():680:680 -> a
+    60:60:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():662:662 -> a
     60:60:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.ProgramMethod):175 -> a
     61:61:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.ProgramMethod):176:176 -> a
     62:67:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.ProgramMethod):175:180 -> a
@@ -73865,50 +74394,56 @@
     144:147:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):355:358 -> a
     148:151:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.shaking.KeepReason):362:365 -> a
     152:156:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):369:373 -> a
-    157:158:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):400:401 -> a
-    157:158:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):373 -> a
-    159:161:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):376:378 -> a
-    162:165:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):382:385 -> a
-    166:166:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):389:389 -> a
-    167:167:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):405:405 -> a
-    167:167:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):390 -> a
-    168:168:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):392:392 -> a
-    169:169:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.shaking.KeepReason):422:422 -> a
-    169:169:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):393 -> a
-    170:172:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):394:396 -> a
-    173:173:com.android.tools.r8.experimental.graphinfo.GraphNode getGraphNode(com.android.tools.r8.graph.DexReference):409:409 -> a
-    174:174:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
-    174:174:com.android.tools.r8.experimental.graphinfo.GraphNode getGraphNode(com.android.tools.r8.graph.DexReference):409 -> a
-    175:183:com.android.tools.r8.experimental.graphinfo.GraphNode getGraphNode(com.android.tools.r8.graph.DexReference):410:418 -> a
-    184:184:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):426:426 -> a
-    185:185:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):431:431 -> a
-    186:186:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode getAnnotationGraphNode(com.android.tools.r8.graph.DexItem):435:435 -> a
-    187:191:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode lambda$getAnnotationGraphNode$0(com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItem):438:442 -> a
-    192:192:com.android.tools.r8.experimental.graphinfo.MethodGraphNode getMethodGraphNode(com.android.tools.r8.graph.DexMethod):458:458 -> a
-    193:206:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$2(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):461:474 -> a
-    207:207:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$2(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):468:468 -> a
-    208:208:com.android.tools.r8.experimental.graphinfo.FieldGraphNode getFieldGraphNode(com.android.tools.r8.graph.DexField):479:479 -> a
-    209:215:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$3(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):482:488 -> a
-    216:216:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$3(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):485:485 -> a
-    217:237:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode getKeepRuleGraphNode(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):501:521 -> a
-    238:238:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode lambda$getKeepRuleGraphNode$4(com.android.tools.r8.shaking.ProguardKeepRuleBase,java.util.Set,com.android.tools.r8.shaking.ProguardKeepRuleBase):506:506 -> a
-    239:243:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode lambda$getKeepRuleGraphNode$5(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.shaking.ProguardKeepRuleBase):514:518 -> a
+    157:157:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):400:400 -> a
+    157:157:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):373 -> a
+    158:158:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    158:158:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):400 -> a
+    158:158:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):373 -> a
+    159:159:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):401:401 -> a
+    159:159:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):373 -> a
+    160:162:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):376:378 -> a
+    163:166:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):382:385 -> a
+    167:167:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):389:389 -> a
+    168:168:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):405:405 -> a
+    168:168:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):390 -> a
+    169:169:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):392:392 -> a
+    170:170:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.shaking.KeepReason):422:422 -> a
+    170:170:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):393 -> a
+    171:173:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):394:396 -> a
+    174:174:com.android.tools.r8.experimental.graphinfo.GraphNode getGraphNode(com.android.tools.r8.graph.DexReference):409:409 -> a
+    175:175:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
+    175:175:com.android.tools.r8.experimental.graphinfo.GraphNode getGraphNode(com.android.tools.r8.graph.DexReference):409 -> a
+    176:184:com.android.tools.r8.experimental.graphinfo.GraphNode getGraphNode(com.android.tools.r8.graph.DexReference):410:418 -> a
+    185:185:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):426:426 -> a
+    186:186:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):431:431 -> a
+    187:187:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode getAnnotationGraphNode(com.android.tools.r8.graph.DexItem):435:435 -> a
+    188:192:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode lambda$getAnnotationGraphNode$1(com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItem):438:442 -> a
+    193:193:com.android.tools.r8.experimental.graphinfo.MethodGraphNode getMethodGraphNode(com.android.tools.r8.graph.DexMethod):458:458 -> a
+    194:207:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):461:474 -> a
+    208:208:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):468:468 -> a
+    209:209:com.android.tools.r8.experimental.graphinfo.FieldGraphNode getFieldGraphNode(com.android.tools.r8.graph.DexField):479:479 -> a
+    210:216:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):482:488 -> a
+    217:217:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):485:485 -> a
+    218:238:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode getKeepRuleGraphNode(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):501:521 -> a
+    239:239: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):506:506 -> a
+    240:244:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode lambda$getKeepRuleGraphNode$6(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.shaking.ProguardKeepRuleBase):514:518 -> a
     1:10:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):248:257 -> b
     11:17:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):286:292 -> b
     18:18:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):291:291 -> b
     19:23:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):347:351 -> b
-    24:24:com.android.tools.r8.experimental.graphinfo.ClassGraphNode getClassGraphNode(com.android.tools.r8.graph.DexType):447:447 -> b
+    24:24:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo lambda$getEdgeInfo$0(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):426:426 -> b
+    25:25:com.android.tools.r8.experimental.graphinfo.ClassGraphNode getClassGraphNode(com.android.tools.r8.graph.DexType):447:447 -> b
     1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):431:431 -> c
-    1:1:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$1(com.android.tools.r8.graph.DexType):450 -> c
-    2:4:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$1(com.android.tools.r8.graph.DexType):451:453 -> c
-com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness -> com.android.tools.r8.shaking.K$a:
+    1:1:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$2(com.android.tools.r8.graph.DexType):450 -> c
+    2:4:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$2(com.android.tools.r8.graph.DexType):451:453 -> c
+com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness -> com.android.tools.r8.shaking.J$a:
     com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness INSTANCE -> a
     1:1:void <clinit>():320:320 -> <clinit>
     1:1:void <init>():322:322 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():328:328 -> a
     2:2:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):333:333 -> a
     1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness access$000():318:318 -> b
-com.android.tools.r8.shaking.IfRuleClassPartEquivalence -> com.android.tools.r8.shaking.L:
+com.android.tools.r8.shaking.IfRuleClassPartEquivalence -> com.android.tools.r8.shaking.K:
     1:1:void <init>():11:11 -> <init>
     1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):11:11 -> a
     2:22:boolean doEquivalent(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.shaking.ProguardIfRule):15:35 -> a
@@ -73916,47 +74451,50 @@
     23:23:int doHash(java.lang.Object):11:11 -> a
     24:37:int doHash(com.android.tools.r8.shaking.ProguardIfRule):43:56 -> a
     24:37:int doHash(java.lang.Object):11 -> a
-com.android.tools.r8.shaking.IfRuleEvaluator -> com.android.tools.r8.shaking.M:
+com.android.tools.r8.shaking.IfRuleEvaluator -> com.android.tools.r8.shaking.L:
     java.util.concurrent.ExecutorService executorService -> e
     com.android.tools.r8.graph.AppView appView -> b
     java.util.List futures -> f
     com.android.tools.r8.shaking.Enqueuer enqueuer -> d
+    com.android.tools.r8.shaking.ConsequentRootSetBuilder rootSetBuilder -> h
     com.android.tools.r8.graph.SubtypingInfo subtypingInfo -> c
     boolean $assertionsDisabled -> a
-    com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSetBuilder rootSetBuilder -> h
     java.util.Map ifRules -> g
-    1:1:void <clinit>():39:39 -> <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.RootSetUtils$ConsequentRootSetBuilder):55:55 -> <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.RootSetUtils$ConsequentRootSetBuilder):45:61 -> <init>
-    1:17:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet run():65:81 -> a
-    18:88:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet run():80:150 -> a
-    89:89:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet run():148:148 -> a
-    90:95:boolean lambda$run$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData,com.android.tools.r8.shaking.ProguardIfRule):98:103 -> a
-    96:102: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):129:135 -> a
-    103:103:boolean canRemoveSubsequentKeepRule(com.android.tools.r8.shaking.ProguardIfRule):156:156 -> a
-    104:107:boolean com.android.tools.r8.com.google.common.collect.Iterables.isEmpty(java.lang.Iterable):1023:1026 -> a
-    104:107:boolean canRemoveSubsequentKeepRule(com.android.tools.r8.shaking.ProguardIfRule):156 -> a
-    108:109:boolean canRemoveSubsequentKeepRule(com.android.tools.r8.shaking.ProguardIfRule):156:157 -> a
-    110:119:boolean isEffectivelyLive(com.android.tools.r8.graph.DexProgramClass):181:190 -> a
-    120:120:boolean evaluateClassForIfRule(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexProgramClass):199:199 -> a
-    121:121:boolean com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder.satisfyClassType(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):790:790 -> a
-    121:121:boolean evaluateClassForIfRule(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexProgramClass):199 -> a
-    122:135:boolean evaluateClassForIfRule(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexProgramClass):202:215 -> a
-    136:137:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):222:223 -> a
-    138:138:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():594:594 -> a
-    138:138:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):224 -> a
-    139:146:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):224:231 -> a
-    147:160:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):229:242 -> a
-    161:190:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):240:269 -> a
-    191:191:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():594:594 -> a
-    191:191:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):275 -> a
-    192:193:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):275:276 -> a
-    194:197:boolean lambda$evaluateIfRuleMembersAndMaterialize$2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):235:238 -> a
-    198:201:boolean lambda$evaluateIfRuleMembersAndMaterialize$3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):244:247 -> a
-    202:203:boolean lambda$evaluateIfRuleMembersAndMaterialize$4(java.util.Collection,java.util.Collection,com.android.tools.r8.shaking.ProguardMemberRule):271:272 -> a
-    204:236:void materializeIfRule(com.android.tools.r8.shaking.ProguardIfRule,java.util.Set):285:317 -> a
-    1:5:void registerClassCapture(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):169:173 -> b
-com.android.tools.r8.shaking.InlineRule -> com.android.tools.r8.shaking.P:
+    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:17:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet run():63:79 -> a
+    18:53:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet run():78:113 -> a
+    54:54:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    54:54:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet run():114 -> a
+    55:89:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet run():114:148 -> a
+    90:90:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet run():146:146 -> a
+    91:96: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
+    97:103: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
+    104:104:boolean canRemoveSubsequentKeepRule(com.android.tools.r8.shaking.ProguardIfRule):154:154 -> a
+    105:108:boolean com.android.tools.r8.com.google.common.collect.Iterables.isEmpty(java.lang.Iterable):1023:1026 -> a
+    105:108:boolean canRemoveSubsequentKeepRule(com.android.tools.r8.shaking.ProguardIfRule):154 -> a
+    109:110:boolean canRemoveSubsequentKeepRule(com.android.tools.r8.shaking.ProguardIfRule):154:155 -> a
+    111:120:boolean isEffectivelyLive(com.android.tools.r8.graph.DexProgramClass):179:188 -> a
+    121:121:boolean evaluateClassForIfRule(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexProgramClass):197:197 -> a
+    122:122:boolean com.android.tools.r8.shaking.RootSetBuilder.satisfyClassType(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):781:781 -> a
+    122:122:boolean evaluateClassForIfRule(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexProgramClass):197 -> a
+    123:136:boolean evaluateClassForIfRule(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexProgramClass):200:213 -> a
+    137:138:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):220:221 -> a
+    139:139:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():576:576 -> a
+    139:139:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):222 -> a
+    140:147:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):222:229 -> a
+    148:161:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):227:240 -> a
+    162:191:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):238:267 -> a
+    192:192:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():576:576 -> a
+    192:192:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):273 -> a
+    193:194:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):273:274 -> a
+    195:198:boolean lambda$evaluateIfRuleMembersAndMaterialize$2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):233:236 -> a
+    199:202:boolean lambda$evaluateIfRuleMembersAndMaterialize$3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):242:245 -> a
+    203:204:boolean lambda$evaluateIfRuleMembersAndMaterialize$4(java.util.Collection,java.util.Collection,com.android.tools.r8.shaking.ProguardMemberRule):269:270 -> a
+    205:237: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
     com.android.tools.r8.shaking.InlineRule$Type type -> s
     boolean $assertionsDisabled -> r
@@ -73986,14 +74524,14 @@
     18:18:com.android.tools.r8.shaking.ProguardCheckDiscardRule asProguardCheckDiscardRule():119 -> B
     19:20:com.android.tools.r8.shaking.ProguardCheckDiscardRule asProguardCheckDiscardRule():120:121 -> B
     1:1:com.android.tools.r8.shaking.InlineRule$Type getType():104:104 -> C
-com.android.tools.r8.shaking.InlineRule$1 -> com.android.tools.r8.shaking.N:
+com.android.tools.r8.shaking.InlineRule$1 -> com.android.tools.r8.shaking.M:
     1:1:void <init>(com.android.tools.r8.origin.Origin):13:13 -> <init>
-com.android.tools.r8.shaking.InlineRule$Builder -> com.android.tools.r8.shaking.O:
+com.android.tools.r8.shaking.InlineRule$Builder -> com.android.tools.r8.shaking.N:
     com.android.tools.r8.shaking.InlineRule$Type type -> p
     1:1:void <init>(com.android.tools.r8.shaking.InlineRule$1):27:27 -> <init>
     2:2:void <init>():30:30 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> d
-com.android.tools.r8.shaking.InlineRule$Type -> com.android.tools.r8.shaking.P$a:
+com.android.tools.r8.shaking.InlineRule$Type -> com.android.tools.r8.shaking.O$a:
     com.android.tools.r8.shaking.InlineRule$Type[] $VALUES -> e
     com.android.tools.r8.shaking.InlineRule$Type NEVER_SINGLE_CALLER -> d
     com.android.tools.r8.shaking.InlineRule$Type NEVER -> c
@@ -74003,22 +74541,22 @@
     5:5:void <clinit>():20:20 -> <clinit>
     1:1:void <init>(java.lang.String,int):20:20 -> <init>
     1:1:com.android.tools.r8.shaking.InlineRule$Type[] values():20:20 -> a
-com.android.tools.r8.shaking.InstantiatedObject -> com.android.tools.r8.shaking.T:
+com.android.tools.r8.shaking.InstantiatedObject -> com.android.tools.r8.shaking.S:
     1:1:void <init>():9:9 -> <init>
     com.android.tools.r8.graph.DexProgramClass asClass() -> a
     com.android.tools.r8.ir.desugar.LambdaDescriptor asLambda() -> b
     boolean isClass() -> c
-com.android.tools.r8.shaking.InstantiatedObject$InstantiatedClass -> com.android.tools.r8.shaking.Q:
+com.android.tools.r8.shaking.InstantiatedObject$InstantiatedClass -> com.android.tools.r8.shaking.P:
     com.android.tools.r8.graph.DexProgramClass clazz -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():35:35 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexProgramClass):38:40 -> <init>
     1:1:com.android.tools.r8.graph.DexProgramClass asClass():50:50 -> a
-com.android.tools.r8.shaking.InstantiatedObject$InstantiatedLambda -> com.android.tools.r8.shaking.S:
+com.android.tools.r8.shaking.InstantiatedObject$InstantiatedLambda -> com.android.tools.r8.shaking.Q:
     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.cg:
+com.android.tools.r8.shaking.InstantiationReason -> com.android.tools.r8.internal.of:
     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
@@ -74027,7 +74565,7 @@
     com.android.tools.r8.shaking.InstantiationReason SYNTHESIZED_CLASS -> f
     1:6:void <clinit>():8:13 -> <clinit>
     1:1:void <init>(java.lang.String,int):7:7 -> <init>
-com.android.tools.r8.shaking.KeepClassInfo -> com.android.tools.r8.shaking.W:
+com.android.tools.r8.shaking.KeepClassInfo -> com.android.tools.r8.shaking.V:
     com.android.tools.r8.shaking.KeepClassInfo BOTTOM -> f
     com.android.tools.r8.shaking.KeepClassInfo TOP -> e
     boolean $assertionsDisabled -> g
@@ -74052,8 +74590,8 @@
     3:3:boolean isTop():46:46 -> k
     3:3:com.android.tools.r8.shaking.KeepClassInfo$Joiner joiner():33 -> k
     4:5:com.android.tools.r8.shaking.KeepClassInfo$Joiner joiner():33:34 -> k
-com.android.tools.r8.shaking.KeepClassInfo$1 -> com.android.tools.r8.shaking.U:
-com.android.tools.r8.shaking.KeepClassInfo$Builder -> com.android.tools.r8.shaking.V:
+com.android.tools.r8.shaking.KeepClassInfo$1 -> com.android.tools.r8.shaking.T:
+com.android.tools.r8.shaking.KeepClassInfo$Builder -> com.android.tools.r8.shaking.U:
     1:1:void <init>(com.android.tools.r8.shaking.KeepClassInfo$1):54:54 -> <init>
     2:2:void <init>(com.android.tools.r8.shaking.KeepClassInfo,com.android.tools.r8.shaking.KeepClassInfo$1):54:54 -> <init>
     3:3:void <init>():57:57 -> <init>
@@ -74066,10 +74604,10 @@
     1:1:com.android.tools.r8.shaking.KeepClassInfo getTopInfo():66:66 -> f
     1:1:com.android.tools.r8.shaking.KeepInfo getTopInfo():54 -> f
     com.android.tools.r8.shaking.KeepInfo$Builder self() -> o
-com.android.tools.r8.shaking.KeepClassInfo$Joiner -> com.android.tools.r8.shaking.W$a:
+com.android.tools.r8.shaking.KeepClassInfo$Joiner -> com.android.tools.r8.shaking.V$a:
     1:1:void <init>(com.android.tools.r8.shaking.KeepClassInfo):93:93 -> <init>
     com.android.tools.r8.shaking.KeepInfo$Joiner self() -> f
-com.android.tools.r8.shaking.KeepFieldInfo -> com.android.tools.r8.shaking.Z:
+com.android.tools.r8.shaking.KeepFieldInfo -> com.android.tools.r8.shaking.Y:
     com.android.tools.r8.shaking.KeepFieldInfo TOP -> e
     com.android.tools.r8.shaking.KeepFieldInfo BOTTOM -> f
     boolean $assertionsDisabled -> g
@@ -74093,8 +74631,8 @@
     3:3:boolean isTop():41:41 -> k
     3:3:com.android.tools.r8.shaking.KeepFieldInfo$Joiner joiner():35 -> k
     4:5:com.android.tools.r8.shaking.KeepFieldInfo$Joiner joiner():35:36 -> k
-com.android.tools.r8.shaking.KeepFieldInfo$1 -> com.android.tools.r8.shaking.X:
-com.android.tools.r8.shaking.KeepFieldInfo$Builder -> com.android.tools.r8.shaking.Y:
+com.android.tools.r8.shaking.KeepFieldInfo$1 -> com.android.tools.r8.shaking.W:
+com.android.tools.r8.shaking.KeepFieldInfo$Builder -> com.android.tools.r8.shaking.X:
     1:1:void <init>(com.android.tools.r8.shaking.KeepFieldInfo$1):49:49 -> <init>
     2:2:void <init>(com.android.tools.r8.shaking.KeepFieldInfo,com.android.tools.r8.shaking.KeepFieldInfo$1):49:49 -> <init>
     3:3:void <init>():52:52 -> <init>
@@ -74107,10 +74645,10 @@
     1:1:com.android.tools.r8.shaking.KeepFieldInfo getTopInfo():61:61 -> f
     1:1:com.android.tools.r8.shaking.KeepInfo getTopInfo():49 -> f
     com.android.tools.r8.shaking.KeepInfo$Builder self() -> o
-com.android.tools.r8.shaking.KeepFieldInfo$Joiner -> com.android.tools.r8.shaking.Z$a:
+com.android.tools.r8.shaking.KeepFieldInfo$Joiner -> com.android.tools.r8.shaking.Y$a:
     1:1:void <init>(com.android.tools.r8.shaking.KeepFieldInfo):88:88 -> <init>
     com.android.tools.r8.shaking.KeepInfo$Joiner self() -> f
-com.android.tools.r8.shaking.KeepInfo -> com.android.tools.r8.shaking.b0:
+com.android.tools.r8.shaking.KeepInfo -> com.android.tools.r8.shaking.a0:
     boolean pinned -> a
     boolean allowMinification -> b
     boolean allowAccessModification -> c
@@ -74119,7 +74657,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():587:588 -> a
+    2:3:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():598:599 -> 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
@@ -74133,7 +74671,7 @@
     1:1:boolean internalIsAccessModificationRequiredForRepackaging():65:65 -> b
     2:2:boolean isAllowSignatureAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):89:89 -> b
     1:1:boolean isMinificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):49:49 -> c
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():558:558 -> c
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():569:569 -> 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
@@ -74141,7 +74679,7 @@
     boolean isBottom() -> d
     boolean isRepackagingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration) -> d
     1:1:boolean isPinned():39:39 -> e
-com.android.tools.r8.shaking.KeepInfo$Builder -> com.android.tools.r8.shaking.a0:
+com.android.tools.r8.shaking.KeepInfo$Builder -> com.android.tools.r8.shaking.Z:
     boolean requireAccessModificationForRepackaging -> e
     com.android.tools.r8.shaking.KeepInfo original -> a
     boolean pinned -> b
@@ -74208,7 +74746,7 @@
     1:2:com.android.tools.r8.shaking.KeepInfo$Builder unpin():201 -> p
     1:2:com.android.tools.r8.shaking.KeepInfo$Builder setRequireAccessModificationForRepackaging(boolean):219:220 -> q
     1:2:com.android.tools.r8.shaking.KeepInfo$Builder unsetRequireAccessModificationForRepackaging():228 -> q
-com.android.tools.r8.shaking.KeepInfo$Joiner -> com.android.tools.r8.shaking.b0$a:
+com.android.tools.r8.shaking.KeepInfo$Joiner -> com.android.tools.r8.shaking.a0$a:
     boolean $assertionsDisabled -> a
     com.android.tools.r8.shaking.KeepInfo$Builder builder -> b
     1:1:void <clinit>():246:246 -> <clinit>
@@ -74220,7 +74758,7 @@
     1:2:com.android.tools.r8.shaking.KeepInfo$Joiner requireAccessModificationForRepackaging():282:283 -> e
     com.android.tools.r8.shaking.KeepInfo$Joiner self() -> f
     1:2:com.android.tools.r8.shaking.KeepInfo$Joiner top():262:263 -> g
-com.android.tools.r8.shaking.KeepInfoCollection -> com.android.tools.r8.shaking.c0:
+com.android.tools.r8.shaking.KeepInfoCollection -> com.android.tools.r8.shaking.b0:
     1:1:void <init>():32:32 -> <init>
     void forEachPinnedField(java.util.function.Consumer) -> a
     com.android.tools.r8.shaking.KeepClassInfo getClassInfo(com.android.tools.r8.graph.DexProgramClass) -> a
@@ -74258,7 +74796,7 @@
     23:32:com.android.tools.r8.shaking.KeepInfo getInfo(com.android.tools.r8.graph.ProgramDefinition):120:129 -> a
     void forEachPinnedMethod(java.util.function.Consumer) -> b
     void forEachPinnedType(java.util.function.Consumer) -> c
-com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection -> com.android.tools.r8.shaking.c0$a:
+com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection -> com.android.tools.r8.shaking.b0$a:
     java.util.Map keepClassInfo -> b
     java.util.Map keepMethodInfo -> c
     java.util.Map keepFieldInfo -> d
@@ -74279,7 +74817,7 @@
     87:87:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
     87:87:void lambda$rewrite$6(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,java.util.Map,com.android.tools.r8.graph.DexReference,java.util.List):259 -> a
     88:95:void lambda$rewrite$6(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,java.util.Map,com.android.tools.r8.graph.DexReference,java.util.List):260:267 -> a
-    96:96:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):320:320 -> a
+    96:96:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):321:321 -> a
     96:96:void lambda$rewrite$6(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,java.util.Map,com.android.tools.r8.graph.DexReference,java.util.List):267 -> a
     97:100:void lambda$rewrite$6(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,java.util.Map,com.android.tools.r8.graph.DexReference,java.util.List):269:272 -> a
     101:101:java.util.Map getRuleInstances():280:280 -> a
@@ -74291,17 +74829,17 @@
     108:115:void joinClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):312:319 -> a
     116:117:com.android.tools.r8.shaking.KeepMethodInfo getMethodInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):300:301 -> a
     118:119:com.android.tools.r8.shaking.KeepFieldInfo getFieldInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):306:307 -> a
-    120:120:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):320:320 -> a
+    120:120:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):321:321 -> a
     120:120:void lambda$rewrite$4(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo):227 -> a
     121:123:void lambda$rewrite$4(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo):228:228 -> a
     126:127:void lambda$rewrite$4(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo):231:232 -> a
     128:128:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethod.getParameters():58:58 -> a
     128:128:void lambda$rewrite$4(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo):234 -> a
-    129:129:java.util.stream.Stream com.android.tools.r8.graph.DexTypeList.stream():128:128 -> a
+    129:129:java.util.stream.Stream com.android.tools.r8.graph.DexTypeList.stream():124:124 -> a
     129:129:void lambda$rewrite$4(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo):234 -> a
     130:130:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethod.getParameters():58:58 -> a
     130:130:void lambda$rewrite$4(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo):235 -> a
-    131:131:java.util.stream.Stream com.android.tools.r8.graph.DexTypeList.stream():128:128 -> a
+    131:131:java.util.stream.Stream com.android.tools.r8.graph.DexTypeList.stream():124:124 -> a
     131:131:void lambda$rewrite$4(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo):235 -> a
     132:132:void lambda$rewrite$4(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo):235:235 -> a
     133:137:void lambda$rewrite$4(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo):233:237 -> a
@@ -74321,12 +74859,12 @@
     5:5:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> b
     5:5:void joinInfo(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):327 -> b
     6:21:void joinInfo(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):328:343 -> b
-    22:22:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):282:282 -> b
-    22:22:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexField.lookupOnProgramClass(com.android.tools.r8.graph.DexProgramClass):68 -> b
+    22:22:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):232:232 -> b
+    22:22:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexField.lookupOnProgramClass(com.android.tools.r8.graph.DexProgramClass):56 -> b
     22:22:void joinInfo(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):344 -> b
-    23:23:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.toProgramFieldOrNull(com.android.tools.r8.graph.DexEncodedField):291:291 -> b
-    23:23:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):282 -> b
-    23:23:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexField.lookupOnProgramClass(com.android.tools.r8.graph.DexProgramClass):68 -> b
+    23:23:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.toProgramFieldOrNull(com.android.tools.r8.graph.DexEncodedField):241:241 -> b
+    23:23:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):232 -> b
+    23:23:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexField.lookupOnProgramClass(com.android.tools.r8.graph.DexProgramClass):56 -> b
     23:23:void joinInfo(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):344 -> b
     24:24:void joinInfo(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):346:346 -> b
     25:25:void keepClass(com.android.tools.r8.graph.DexProgramClass):352:352 -> b
@@ -74347,10 +74885,10 @@
     2:2:void pinMethod(com.android.tools.r8.graph.ProgramMethod):377:377 -> c
     3:3:void pinField(com.android.tools.r8.graph.ProgramField):430:430 -> c
     4:4:void forEachPinnedType(java.util.function.Consumer):450:450 -> c
-com.android.tools.r8.shaking.KeepMemberInfo -> com.android.tools.r8.shaking.d0:
+com.android.tools.r8.shaking.KeepMemberInfo -> com.android.tools.r8.shaking.c0:
     1:1:void <init>(com.android.tools.r8.shaking.KeepInfo$Builder):13:13 -> <init>
     1:2:boolean isRepackagingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):18:19 -> d
-com.android.tools.r8.shaking.KeepMethodInfo -> com.android.tools.r8.shaking.g0:
+com.android.tools.r8.shaking.KeepMethodInfo -> com.android.tools.r8.shaking.f0:
     com.android.tools.r8.shaking.KeepMethodInfo BOTTOM -> f
     com.android.tools.r8.shaking.KeepMethodInfo TOP -> e
     boolean $assertionsDisabled -> g
@@ -74372,8 +74910,8 @@
     3:3:com.android.tools.r8.shaking.KeepMethodInfo$Joiner joiner():35 -> j
     4:5:com.android.tools.r8.shaking.KeepMethodInfo$Joiner joiner():35:36 -> j
     1:1:com.android.tools.r8.shaking.KeepMethodInfo top():16:16 -> k
-com.android.tools.r8.shaking.KeepMethodInfo$1 -> com.android.tools.r8.shaking.e0:
-com.android.tools.r8.shaking.KeepMethodInfo$Builder -> com.android.tools.r8.shaking.f0:
+com.android.tools.r8.shaking.KeepMethodInfo$1 -> com.android.tools.r8.shaking.d0:
+com.android.tools.r8.shaking.KeepMethodInfo$Builder -> com.android.tools.r8.shaking.e0:
     1:1:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$1):49:49 -> <init>
     2:2:void <init>(com.android.tools.r8.shaking.KeepMethodInfo,com.android.tools.r8.shaking.KeepMethodInfo$1):49:49 -> <init>
     3:3:void <init>():52:52 -> <init>
@@ -74386,18 +74924,18 @@
     1:1:com.android.tools.r8.shaking.KeepMethodInfo getTopInfo():66:66 -> f
     1:1:com.android.tools.r8.shaking.KeepInfo getTopInfo():49 -> f
     com.android.tools.r8.shaking.KeepInfo$Builder self() -> o
-com.android.tools.r8.shaking.KeepMethodInfo$Joiner -> com.android.tools.r8.shaking.g0$a:
+com.android.tools.r8.shaking.KeepMethodInfo$Joiner -> com.android.tools.r8.shaking.f0$a:
     1:1:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):88:88 -> <init>
     com.android.tools.r8.shaking.KeepInfo$Joiner self() -> f
-com.android.tools.r8.shaking.KeepReason -> com.android.tools.r8.shaking.u0:
+com.android.tools.r8.shaking.KeepReason -> com.android.tools.r8.shaking.t0:
     1:1:void <init>():18:18 -> <init>
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind() -> a
     com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter) -> a
     1:1:com.android.tools.r8.shaking.KeepReason reachableFromLiveType(com.android.tools.r8.graph.DexType):45:45 -> a
     2:2:com.android.tools.r8.shaking.KeepReason referencedInAnnotation(com.android.tools.r8.graph.DexItem):65:65 -> a
     3:3:com.android.tools.r8.shaking.KeepReason reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> a
-com.android.tools.r8.shaking.KeepReason$1 -> com.android.tools.r8.shaking.h0:
-com.android.tools.r8.shaking.KeepReason$AnnotatedOn -> com.android.tools.r8.shaking.i0:
+com.android.tools.r8.shaking.KeepReason$1 -> com.android.tools.r8.shaking.g0:
+com.android.tools.r8.shaking.KeepReason$AnnotatedOn -> com.android.tools.r8.shaking.h0:
     com.android.tools.r8.graph.DexDefinition holder -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():249:249 -> <clinit>
@@ -74408,60 +74946,61 @@
     5:5:boolean com.android.tools.r8.graph.DexDefinition.isDexEncodedField():0:0 -> a
     5:5:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):266 -> a
     6:9:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):267:270 -> a
-com.android.tools.r8.shaking.KeepReason$BasedOnOtherMethod -> com.android.tools.r8.shaking.j0:
+com.android.tools.r8.shaking.KeepReason$BasedOnOtherMethod -> com.android.tools.r8.shaking.i0:
     com.android.tools.r8.graph.DexEncodedMethod method -> a
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):88:88 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod):92:93 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):104:104 -> a
-com.android.tools.r8.shaking.KeepReason$InstantiatedIn -> com.android.tools.r8.shaking.k0:
+com.android.tools.r8.shaking.KeepReason$InstantiatedIn -> com.android.tools.r8.shaking.j0:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):108:108 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):111:111 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():116:116 -> a
-com.android.tools.r8.shaking.KeepReason$InvokedFrom -> com.android.tools.r8.shaking.l0:
+com.android.tools.r8.shaking.KeepReason$InvokedFrom -> com.android.tools.r8.shaking.k0:
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():159:159 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):159:159 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):162:163 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():168:168 -> a
-com.android.tools.r8.shaking.KeepReason$InvokedFromLambdaCreatedIn -> com.android.tools.r8.shaking.m0:
+com.android.tools.r8.shaking.KeepReason$InvokedFromLambdaCreatedIn -> com.android.tools.r8.shaking.l0:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):177:177 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):180:180 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():185:185 -> a
-com.android.tools.r8.shaking.KeepReason$InvokedViaSuper -> com.android.tools.r8.shaking.n0:
+com.android.tools.r8.shaking.KeepReason$InvokedViaSuper -> com.android.tools.r8.shaking.m0:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):125:125 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):128:128 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():133:133 -> a
-com.android.tools.r8.shaking.KeepReason$MethodHandleReferencedFrom -> com.android.tools.r8.shaking.o0:
+com.android.tools.r8.shaking.KeepReason$MethodHandleReferencedFrom -> com.android.tools.r8.shaking.n0:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):297:297 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):300:300 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():305:305 -> a
-com.android.tools.r8.shaking.KeepReason$ReachableFromLiveType -> com.android.tools.r8.shaking.p0:
+com.android.tools.r8.shaking.KeepReason$ReachableFromLiveType -> com.android.tools.r8.shaking.o0:
     com.android.tools.r8.graph.DexType type -> a
     1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason$1):211:211 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.DexType):215:216 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():221:221 -> a
     2:2:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):226:226 -> a
-com.android.tools.r8.shaking.KeepReason$ReferencedFrom -> com.android.tools.r8.shaking.q0:
+com.android.tools.r8.shaking.KeepReason$ReferencedFrom -> com.android.tools.r8.shaking.p0:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):194:194 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):197:197 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():202:202 -> a
-com.android.tools.r8.shaking.KeepReason$ReferencedInAnnotation -> com.android.tools.r8.shaking.r0:
+com.android.tools.r8.shaking.KeepReason$ReferencedInAnnotation -> com.android.tools.r8.shaking.q0:
     com.android.tools.r8.graph.DexItem holder -> a
     1:1:void <init>(com.android.tools.r8.graph.DexItem,com.android.tools.r8.shaking.KeepReason$1):230:230 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.DexItem):234:235 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():240:240 -> a
     2:2:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):245:245 -> a
-com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom -> com.android.tools.r8.shaking.s0:
+com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom -> com.android.tools.r8.shaking.r0:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):275:275 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):278:278 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():288:288 -> a
-com.android.tools.r8.shaking.KeepReason$TargetedBySuper -> com.android.tools.r8.shaking.t0:
+com.android.tools.r8.shaking.KeepReason$TargetedBySuper -> com.android.tools.r8.shaking.s0:
     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.rn:
-    java.util.List pruned -> b
+com.android.tools.r8.shaking.L8TreePruner -> com.android.tools.r8.internal.wm:
+    java.util.List pruned -> c
     java.util.Set emulatedInterfaces -> a
+    java.util.Set backports -> b
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions):32:32 -> <init>
     2:10:void <init>(com.android.tools.r8.utils.InternalOptions):28:36 -> <init>
     11:11:void <init>(com.android.tools.r8.utils.InternalOptions):35:35 -> <init>
@@ -74470,7 +75009,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.uo:
+com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis -> com.android.tools.r8.internal.yn:
     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
@@ -74488,22 +75027,25 @@
     11:15:boolean com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis.hasLibraryMethodOverrideDirectlyOrIndirectly(com.android.tools.r8.graph.DexProgramClass,java.util.Set):79 -> a
     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:45:void analyze(com.android.tools.r8.ir.code.IRCode):108:136 -> a
-    46:46:void analyze(com.android.tools.r8.ir.code.IRCode):135:135 -> a
-    47:47:void finish():146:146 -> a
-    48:52:boolean com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis.verifyNoUninstantiatedTypesEscapeIntoLibrary():152:156 -> a
-    48:52:void finish():146 -> a
-    53:53:boolean com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis.verifyNoUninstantiatedTypesEscapeIntoLibrary():154:154 -> a
-    53:53:void finish():146 -> a
-    54:54:void finish():147:147 -> a
-    55:55:boolean lambda$finish$1(com.android.tools.r8.graph.DexType):148:148 -> a
-    56:59:void lambda$logResults$2(java.lang.Class):176:179 -> a
-    60:60:void lambda$logResults$2(java.lang.Class):175:175 -> 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):273:273 -> 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
+    48:48:void finish():146:146 -> a
+    49:53:boolean com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis.verifyNoUninstantiatedTypesEscapeIntoLibrary():152:156 -> a
+    49:53:void finish():146 -> a
+    54:54:boolean com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis.verifyNoUninstantiatedTypesEscapeIntoLibrary():154:154 -> a
+    54:54:void finish():146 -> a
+    55:55:void finish():147:147 -> a
+    56:56:boolean lambda$finish$1(com.android.tools.r8.graph.DexType):148:148 -> a
+    57:60:void lambda$logResults$2(java.lang.Class):176:179 -> a
+    61:61:void lambda$logResults$2(java.lang.Class):175:175 -> a
     1:7:java.util.Set getInitialNonEscapingClassesWithLibraryMethodOverrides(com.android.tools.r8.graph.AppView):50:56 -> b
     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.to:
+com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration -> com.android.tools.r8.internal.xn:
     com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration INSTANCE -> a
     1:1:void <clinit>():184:184 -> <clinit>
     1:1:void <init>():187:187 -> <init>
@@ -74511,20 +75053,19 @@
     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.xo:
+com.android.tools.r8.shaking.LibraryModeledPredicate -> com.android.tools.r8.internal.Bn:
     boolean isModeled(com.android.tools.r8.graph.DexType) -> d
-com.android.tools.r8.shaking.MainDexClasses -> com.android.tools.r8.internal.Hp:
+com.android.tools.r8.shaking.MainDexClasses -> com.android.tools.r8.internal.Jo:
     java.util.Set mainDexClasses -> a
     1:1:void <init>(java.util.Set,com.android.tools.r8.shaking.MainDexClasses$1):15:15 -> <init>
     2:3:void <init>(java.util.Set):23:24 -> <init>
     1:1:com.android.tools.r8.shaking.MainDexClasses$Builder builder():28:28 -> a
     2:2:void add(com.android.tools.r8.graph.DexProgramClass):36:36 -> a
     3:3:void addAll(com.android.tools.r8.shaking.MainDexTracingResult):44:44 -> a
-    4:4:boolean contains(com.android.tools.r8.graph.DexType):54:54 -> a
-    5:6:boolean containsAnyOf(java.lang.Iterable):62:63 -> a
-    7:7:void forEach(java.util.function.Consumer):71:71 -> a
-    8:11:com.android.tools.r8.shaking.MainDexClasses rewrittenWithLens(com.android.tools.r8.graph.GraphLens):79:82 -> a
-    12:18:com.android.tools.r8.shaking.MainDexClasses withoutPrunedItems(com.android.tools.r8.graph.PrunedItems):92:98 -> a
+    4:5:boolean containsAnyOf(java.lang.Iterable):62:63 -> a
+    6:6:void forEach(java.util.function.Consumer):71:71 -> a
+    7:10:com.android.tools.r8.shaking.MainDexClasses rewrittenWithLens(com.android.tools.r8.graph.GraphLens):79:82 -> a
+    11:17:com.android.tools.r8.shaking.MainDexClasses withoutPrunedItems(com.android.tools.r8.graph.PrunedItems):92:98 -> a
     1:1:com.android.tools.r8.shaking.MainDexClasses createEmptyMainDexClasses():32:32 -> b
     2:2:void com.android.tools.r8.shaking.MainDexClasses.<init>():20:20 -> b
     2:2:com.android.tools.r8.shaking.MainDexClasses createEmptyMainDexClasses():32 -> b
@@ -74533,15 +75074,15 @@
     4:4:boolean contains(com.android.tools.r8.graph.DexProgramClass):58 -> b
     1:1:boolean isEmpty():75:75 -> c
     1:1:int size():88:88 -> d
-com.android.tools.r8.shaking.MainDexClasses$1 -> com.android.tools.r8.internal.Hp$a:
-com.android.tools.r8.shaking.MainDexClasses$Builder -> com.android.tools.r8.internal.Hp$b:
+com.android.tools.r8.shaking.MainDexClasses$1 -> com.android.tools.r8.internal.Jo$a:
+com.android.tools.r8.shaking.MainDexClasses$Builder -> com.android.tools.r8.internal.Jo$b:
     java.util.Set mainDexClasses -> a
     1:1:void <init>(com.android.tools.r8.shaking.MainDexClasses$1):104:104 -> <init>
     2:2:void <init>():108:108 -> <init>
     3:3:void <init>():106:106 -> <init>
     1:1:void add(com.android.tools.r8.graph.DexProgramClass):111:111 -> a
     2:2:com.android.tools.r8.shaking.MainDexClasses build():115:115 -> a
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer -> com.android.tools.r8.internal.Lp:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer -> com.android.tools.r8.internal.No:
     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
@@ -74553,7 +75094,7 @@
     1:1:java.util.function.Consumer access$200(com.android.tools.r8.shaking.MainDexDirectReferenceTracer):29:29 -> a
     2:2:void access$300(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):29:29 -> a
     3:10:void run(java.util.Set):45:52 -> a
-    11:11:boolean com.android.tools.r8.graph.DexAnnotation.hasSynthesizedClassAnnotation(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):420:420 -> a
+    11:11:boolean com.android.tools.r8.graph.DexAnnotation.hasSynthesizedClassAnnotation(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):413:413 -> a
     11:11:void run(java.util.Set):51 -> a
     12:12:void run(java.util.Set):53:53 -> a
     13:13:void com.android.tools.r8.shaking.MainDexDirectReferenceTracer.traceAnnotationsDirectDependencies(com.android.tools.r8.graph.DexAnnotationSet):93:93 -> a
@@ -74569,8 +75110,8 @@
     24:28:void lambda$getFirstReferenceOutsideFromCode$3(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Set,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType):80:84 -> a
     29:32:void traceMethodDirectDependencies(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):97:100 -> a
     1:1:boolean hasReferencesOutsideFromCode(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod,java.util.Set):71:71 -> b
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1 -> com.android.tools.r8.internal.Ip:
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$AnnotationDirectReferenceCollector -> com.android.tools.r8.internal.Jp:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1 -> com.android.tools.r8.internal.Ko:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$AnnotationDirectReferenceCollector -> com.android.tools.r8.internal.Lo:
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer this$0 -> a
     1:1:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer):186:186 -> <init>
     2:2:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1):186:186 -> <init>
@@ -74581,7 +75122,7 @@
     1:2:boolean addField(com.android.tools.r8.graph.DexField):196:197 -> b
     3:4:boolean addMethod(com.android.tools.r8.graph.DexMethod):203:204 -> b
     5:5:boolean addType(com.android.tools.r8.graph.DexType):224:224 -> b
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector -> com.android.tools.r8.internal.Kp:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector -> com.android.tools.r8.internal.Mo:
     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):104:104 -> <init>
     2:3:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.graph.DexItemFactory):106:107 -> <init>
@@ -74601,7 +75142,7 @@
     3:3:void registerTypeReference(com.android.tools.r8.graph.DexType):177:177 -> f
     1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):162:162 -> g
     1:2:void registerFieldAccess(com.android.tools.r8.graph.DexField):166:167 -> i
-com.android.tools.r8.shaking.MainDexListBuilder -> com.android.tools.r8.internal.Mp:
+com.android.tools.r8.shaking.MainDexListBuilder -> com.android.tools.r8.internal.Oo:
     java.util.Map annotationTypeContainEnum -> d
     com.android.tools.r8.graph.AppView appView -> c
     com.android.tools.r8.shaking.MainDexTracingResult$Builder mainDexClassesBuilder -> e
@@ -74621,7 +75162,10 @@
     15:17:void lambda$traceRuntimeAnnotationsWithEnumForMainDex$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotation):85:87 -> a
     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:30:void addDirectDependency(com.android.tools.r8.graph.DexType):161:172 -> 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):273:273 -> 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
     34:34:com.android.tools.r8.shaking.MainDexTracingResult$Builder com.android.tools.r8.shaking.MainDexTracingResult$Builder.addDependency(com.android.tools.r8.graph.DexType):66:66 -> a
     34:34:void addDirectDependency(com.android.tools.r8.graph.DexProgramClass):178 -> a
@@ -74632,10 +75176,13 @@
     37:38:void addDirectDependency(com.android.tools.r8.graph.DexProgramClass):178 -> a
     39:43:void addDirectDependency(com.android.tools.r8.graph.DexProgramClass):179:183 -> a
     1:3:com.android.tools.r8.shaking.MainDexTracingResult run():66:68 -> b
-    4:20:boolean isAnnotationWithEnum(com.android.tools.r8.graph.DexType):95:111 -> b
-    21:21:boolean com.android.tools.r8.shaking.MainDexListBuilder.isAnnotation(com.android.tools.r8.graph.DexType):132:132 -> b
-    21:21:boolean isAnnotationWithEnum(com.android.tools.r8.graph.DexType):113 -> b
-    22:32:boolean isAnnotationWithEnum(com.android.tools.r8.graph.DexType):113:123 -> b
+    4:6:boolean isAnnotationWithEnum(com.android.tools.r8.graph.DexType):95:97 -> b
+    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> b
+    7:7:boolean isAnnotationWithEnum(com.android.tools.r8.graph.DexType):97 -> b
+    8:19:boolean isAnnotationWithEnum(com.android.tools.r8.graph.DexType):100:111 -> b
+    20:20:boolean com.android.tools.r8.shaking.MainDexListBuilder.isAnnotation(com.android.tools.r8.graph.DexType):132:132 -> b
+    20:20:boolean isAnnotationWithEnum(com.android.tools.r8.graph.DexType):113 -> b
+    21:31:boolean isAnnotationWithEnum(com.android.tools.r8.graph.DexType):113:123 -> b
     1:2:boolean isEnum(com.android.tools.r8.graph.DexType):127:128 -> c
     3:3:void traceMainDexDirectDependencies():136:136 -> c
     1:3:void traceRuntimeAnnotationsWithEnumForMainDex():72:74 -> d
@@ -74645,9 +75192,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):264:270 -> d
+    15:21:void com.android.tools.r8.graph.DexClass.forEachAnnotation(java.util.function.Consumer):255:261 -> d
     15:21:void traceRuntimeAnnotationsWithEnumForMainDex():83 -> d
-com.android.tools.r8.shaking.MainDexTracingResult -> com.android.tools.r8.internal.Op:
+com.android.tools.r8.shaking.MainDexTracingResult -> com.android.tools.r8.internal.Qo:
     java.util.Set roots -> c
     java.util.Set dependencies -> d
     java.util.Set classes -> e
@@ -74671,39 +75218,36 @@
     5:5:boolean canReferenceItemFromContextWithoutIncreasingMainDexSize(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.ProgramDefinition):107 -> a
     6:6:boolean com.android.tools.r8.shaking.MainDexTracingResult.isRoot(com.android.tools.r8.graph.ProgramDefinition):146:146 -> a
     6:6:boolean canReferenceItemFromContextWithoutIncreasingMainDexSize(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.ProgramDefinition):107 -> a
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():726:726 -> a
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():676:676 -> a
     7:7:boolean com.android.tools.r8.shaking.MainDexTracingResult.isRoot(com.android.tools.r8.graph.ProgramDefinition):146 -> a
     7:7:boolean canReferenceItemFromContextWithoutIncreasingMainDexSize(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.ProgramDefinition):107 -> a
     8:8:boolean com.android.tools.r8.shaking.MainDexTracingResult.isRoot(com.android.tools.r8.graph.ProgramDefinition):146:146 -> a
     8:8:boolean canReferenceItemFromContextWithoutIncreasingMainDexSize(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.ProgramDefinition):107 -> a
-    9:9:java.util.Set com.android.tools.r8.shaking.MainDexTracingResult.getRoots():116:116 -> a
-    9:9:boolean isRoot(com.android.tools.r8.graph.DexType):150 -> a
-    10:10:boolean isRoot(com.android.tools.r8.graph.DexType):150:150 -> a
-    11:11:java.util.Set com.android.tools.r8.shaking.MainDexTracingResult.getDependencies():120:120 -> a
-    11:11:boolean isDependency(com.android.tools.r8.graph.ProgramDefinition):154 -> a
-    12:12:boolean isDependency(com.android.tools.r8.graph.ProgramDefinition):154:154 -> a
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():726:726 -> a
-    13:13:boolean isDependency(com.android.tools.r8.graph.ProgramDefinition):154 -> a
-    14:14:boolean isDependency(com.android.tools.r8.graph.ProgramDefinition):154:154 -> a
-    15:15:java.util.Set getClasses():124:124 -> a
-    16:16:void collectTypesMatching(java.util.Set,java.util.function.Predicate,java.util.function.Consumer):137:137 -> a
-    17:18:void lambda$collectTypesMatching$0(java.util.function.Predicate,java.util.function.Consumer,com.android.tools.r8.graph.DexType):139:140 -> a
-    19:19:com.android.tools.r8.shaking.MainDexTracingResult$Builder builder(com.android.tools.r8.graph.AppInfo):166:166 -> a
-    20:20:com.android.tools.r8.shaking.MainDexTracingResult$Builder com.android.tools.r8.shaking.MainDexTracingResult.builder(com.android.tools.r8.graph.AppInfo):166:166 -> a
-    20:20:com.android.tools.r8.shaking.MainDexTracingResult prunedCopy(com.android.tools.r8.shaking.AppInfoWithLiveness):158 -> a
-    21:24:com.android.tools.r8.shaking.MainDexTracingResult prunedCopy(com.android.tools.r8.shaking.AppInfoWithLiveness):159:162 -> a
+    9:9:java.util.Set com.android.tools.r8.shaking.MainDexTracingResult.getDependencies():120:120 -> a
+    9:9:boolean isDependency(com.android.tools.r8.graph.ProgramDefinition):150 -> a
+    10:10:boolean isDependency(com.android.tools.r8.graph.ProgramDefinition):150:150 -> a
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():676:676 -> a
+    11:11:boolean isDependency(com.android.tools.r8.graph.ProgramDefinition):150 -> a
+    12:12:boolean isDependency(com.android.tools.r8.graph.ProgramDefinition):150:150 -> a
+    13:13:java.util.Set getClasses():124:124 -> a
+    14:14:void collectTypesMatching(java.util.Set,java.util.function.Predicate,java.util.function.Consumer):137:137 -> a
+    15:16:void lambda$collectTypesMatching$0(java.util.function.Predicate,java.util.function.Consumer,com.android.tools.r8.graph.DexType):139:140 -> a
+    17:17:com.android.tools.r8.shaking.MainDexTracingResult$Builder builder(com.android.tools.r8.graph.AppInfo):162:162 -> a
+    18:18:com.android.tools.r8.shaking.MainDexTracingResult$Builder com.android.tools.r8.shaking.MainDexTracingResult.builder(com.android.tools.r8.graph.AppInfo):162:162 -> a
+    18:18:com.android.tools.r8.shaking.MainDexTracingResult prunedCopy(com.android.tools.r8.shaking.AppInfoWithLiveness):154 -> a
+    19:22:com.android.tools.r8.shaking.MainDexTracingResult prunedCopy(com.android.tools.r8.shaking.AppInfoWithLiveness):155:158 -> a
     1:1:java.util.Set com.android.tools.r8.shaking.MainDexTracingResult.getRoots():116:116 -> b
     1:1:boolean isRoot(com.android.tools.r8.graph.ProgramDefinition):146 -> b
     2:2:boolean isRoot(com.android.tools.r8.graph.ProgramDefinition):146:146 -> b
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():726:726 -> b
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():676:676 -> b
     3:3:boolean isRoot(com.android.tools.r8.graph.ProgramDefinition):146 -> b
     4:4:boolean isRoot(com.android.tools.r8.graph.ProgramDefinition):146:146 -> b
     5:5:java.util.Set getDependencies():120:120 -> b
-    6:6:com.android.tools.r8.shaking.MainDexTracingResult$Builder extensionBuilder(com.android.tools.r8.graph.AppInfo):170:170 -> b
+    6:6:com.android.tools.r8.shaking.MainDexTracingResult$Builder extensionBuilder(com.android.tools.r8.graph.AppInfo):166:166 -> b
     1:1:java.util.Set getRoots():116:116 -> c
     1:2:boolean isEmpty():111:112 -> d
-com.android.tools.r8.shaking.MainDexTracingResult$1 -> com.android.tools.r8.internal.Op$a:
-com.android.tools.r8.shaking.MainDexTracingResult$Builder -> com.android.tools.r8.internal.Op$b:
+com.android.tools.r8.shaking.MainDexTracingResult$1 -> com.android.tools.r8.internal.Qo$a:
+com.android.tools.r8.shaking.MainDexTracingResult$Builder -> com.android.tools.r8.internal.Qo$b:
     java.util.Set roots -> c
     java.util.Set dependencies -> d
     boolean $assertionsDisabled -> a
@@ -74727,59 +75271,59 @@
     4:5:com.android.tools.r8.shaking.MainDexTracingResult$Builder addRoot(com.android.tools.r8.graph.DexType):54:55 -> b
     1:1:boolean contains(com.android.tools.r8.graph.DexType):72:72 -> c
     1:2:boolean isProgramClass(com.android.tools.r8.graph.DexType):80:81 -> d
-com.android.tools.r8.shaking.MemberValuePropagationRule -> com.android.tools.r8.shaking.x0:
+com.android.tools.r8.shaking.MemberValuePropagationRule -> com.android.tools.r8.shaking.w0:
     com.android.tools.r8.shaking.MemberValuePropagationRule$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.MemberValuePropagationRule$Type,com.android.tools.r8.shaking.MemberValuePropagationRule$1):11:11 -> <init>
     2: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.MemberValuePropagationRule$Type):73:87 -> <init>
     1:5:java.lang.String typeString():100:104 -> A
     1:1:com.android.tools.r8.shaking.MemberValuePropagationRule$Type getType():95:95 -> B
-com.android.tools.r8.shaking.MemberValuePropagationRule$1 -> com.android.tools.r8.shaking.v0:
-com.android.tools.r8.shaking.MemberValuePropagationRule$Builder -> com.android.tools.r8.shaking.w0:
+com.android.tools.r8.shaking.MemberValuePropagationRule$1 -> com.android.tools.r8.shaking.u0:
+com.android.tools.r8.shaking.MemberValuePropagationRule$Builder -> com.android.tools.r8.shaking.v0:
     com.android.tools.r8.shaking.MemberValuePropagationRule$Type type -> p
     1:1:void <init>(com.android.tools.r8.shaking.MemberValuePropagationRule$1):17:17 -> <init>
     2:2:void <init>():21:21 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> d
-com.android.tools.r8.shaking.MemberValuePropagationRule$Type -> com.android.tools.r8.shaking.x0$a:
+com.android.tools.r8.shaking.MemberValuePropagationRule$Type -> com.android.tools.r8.shaking.w0$a:
     com.android.tools.r8.shaking.MemberValuePropagationRule$Type[] $VALUES -> b
     com.android.tools.r8.shaking.MemberValuePropagationRule$Type NEVER -> a
     1:1:void <clinit>():14:14 -> <clinit>
     2:2:void <clinit>():13:13 -> <clinit>
     1:1:void <init>(java.lang.String,int):13:13 -> <init>
     1:1:com.android.tools.r8.shaking.MemberValuePropagationRule$Type[] values():13:13 -> a
-com.android.tools.r8.shaking.MissingClasses -> com.android.tools.r8.shaking.z0:
+com.android.tools.r8.shaking.MissingClasses -> com.android.tools.r8.shaking.y0:
     java.util.Set missingClasses -> a
-    1:1:void <init>(java.util.Set,com.android.tools.r8.shaking.MissingClasses$1):17:17 -> <init>
-    2:3:void <init>(java.util.Set):21:22 -> <init>
-    1:1:com.android.tools.r8.shaking.MissingClasses$Builder builder():26:26 -> a
-    2:2:com.android.tools.r8.shaking.MissingClasses$Builder builder():26:26 -> a
-    2:2:com.android.tools.r8.shaking.MissingClasses commitSyntheticItems(com.android.tools.r8.synthesis.CommittedItems):38 -> a
-    3:4:com.android.tools.r8.shaking.MissingClasses commitSyntheticItems(com.android.tools.r8.synthesis.CommittedItems):40:41 -> a
-    5:5:boolean contains(com.android.tools.r8.graph.DexType):45:45 -> a
-    1:1:com.android.tools.r8.shaking.MissingClasses$Builder builderForInitialMissingClasses():30:30 -> b
-    1:1:com.android.tools.r8.shaking.MissingClasses empty():34:34 -> c
-com.android.tools.r8.shaking.MissingClasses$1 -> com.android.tools.r8.shaking.y0:
-com.android.tools.r8.shaking.MissingClasses$Builder -> com.android.tools.r8.shaking.z0$a:
+    1:1:void <init>(java.util.Set,com.android.tools.r8.shaking.MissingClasses$1):16:16 -> <init>
+    2:3:void <init>(java.util.Set):20:21 -> <init>
+    1:1:com.android.tools.r8.shaking.MissingClasses$Builder builder():25:25 -> a
+    2:2:com.android.tools.r8.shaking.MissingClasses$Builder builder():25:25 -> a
+    2:2:com.android.tools.r8.shaking.MissingClasses commitSyntheticItems(com.android.tools.r8.synthesis.CommittedItems):37 -> a
+    3:4:com.android.tools.r8.shaking.MissingClasses commitSyntheticItems(com.android.tools.r8.synthesis.CommittedItems):39:40 -> a
+    5:5:boolean contains(com.android.tools.r8.graph.DexType):44:44 -> a
+    1:1:com.android.tools.r8.shaking.MissingClasses$Builder builderForInitialMissingClasses():29:29 -> b
+    1:1:com.android.tools.r8.shaking.MissingClasses empty():33:33 -> c
+com.android.tools.r8.shaking.MissingClasses$1 -> com.android.tools.r8.shaking.x0:
+com.android.tools.r8.shaking.MissingClasses$Builder -> com.android.tools.r8.shaking.y0$a:
     java.util.Set newIgnoredMissingClasses -> c
     java.util.Set alreadyMissingClasses -> a
     java.util.Set newMissingClasses -> b
-    1:1:void <init>(com.android.tools.r8.shaking.MissingClasses$1):48:48 -> <init>
-    2:2:void <init>(java.util.Set,com.android.tools.r8.shaking.MissingClasses$1):48:48 -> <init>
-    3:3:void <init>():58:58 -> <init>
-    4:4:void <init>(java.util.Set):61:61 -> <init>
-    5:16:void <init>(java.util.Set):51:62 -> <init>
-    1:1:void addNewMissingClass(com.android.tools.r8.graph.DexType):66:66 -> a
-    2:2:com.android.tools.r8.shaking.MissingClasses$Builder addNewMissingClasses(java.util.Collection):70:70 -> a
-    3:4:com.android.tools.r8.shaking.MissingClasses$Builder removeAlreadyMissingClasses(java.lang.Iterable):83:84 -> a
-    5:10:com.android.tools.r8.shaking.MissingClasses reportMissingClasses(com.android.tools.r8.graph.AppView):95:100 -> a
-    11:11:java.util.Collection getAllowedMissingClasses(com.android.tools.r8.graph.DexItemFactory):117:117 -> a
-    11:11:com.android.tools.r8.shaking.MissingClasses reportMissingClasses(com.android.tools.r8.graph.AppView):100 -> a
-    12:26:com.android.tools.r8.shaking.MissingClasses reportMissingClasses(com.android.tools.r8.graph.AppView):99:113 -> a
-    27:29:com.android.tools.r8.shaking.MissingClasses build():140:142 -> a
-    1:1:boolean contains(com.android.tools.r8.graph.DexType):79:79 -> b
-    2:2:com.android.tools.r8.shaking.MissingClasses ignoreMissingClasses():91:91 -> b
-    1:1:void ignoreNewMissingClass(com.android.tools.r8.graph.DexType):75:75 -> c
-    1:1:boolean wasAlreadyMissing(com.android.tools.r8.graph.DexType):146:146 -> d
+    1:1:void <init>(com.android.tools.r8.shaking.MissingClasses$1):47:47 -> <init>
+    2:2:void <init>(java.util.Set,com.android.tools.r8.shaking.MissingClasses$1):47:47 -> <init>
+    3:3:void <init>():57:57 -> <init>
+    4:4:void <init>(java.util.Set):60:60 -> <init>
+    5:16:void <init>(java.util.Set):50:61 -> <init>
+    1:1:void addNewMissingClass(com.android.tools.r8.graph.DexType):65:65 -> a
+    2:2:com.android.tools.r8.shaking.MissingClasses$Builder addNewMissingClasses(java.util.Collection):69:69 -> a
+    3:4:com.android.tools.r8.shaking.MissingClasses$Builder removeAlreadyMissingClasses(java.lang.Iterable):82:83 -> a
+    5:7:com.android.tools.r8.shaking.MissingClasses reportMissingClasses(com.android.tools.r8.utils.InternalOptions):95:97 -> a
+    8:8:java.util.Collection getAllowedMissingClasses(com.android.tools.r8.graph.DexItemFactory):114:114 -> a
+    8:8:com.android.tools.r8.shaking.MissingClasses reportMissingClasses(com.android.tools.r8.utils.InternalOptions):97 -> a
+    9:23:com.android.tools.r8.shaking.MissingClasses reportMissingClasses(com.android.tools.r8.utils.InternalOptions):96:110 -> a
+    24:26:com.android.tools.r8.shaking.MissingClasses build():129:131 -> a
+    1:1:boolean contains(com.android.tools.r8.graph.DexType):78:78 -> b
+    2:2:com.android.tools.r8.shaking.MissingClasses ignoreMissingClasses():90:90 -> b
+    1:1:void ignoreNewMissingClass(com.android.tools.r8.graph.DexType):74:74 -> c
+    1:1:boolean wasAlreadyMissing(com.android.tools.r8.graph.DexType):135:135 -> d
 com.android.tools.r8.shaking.MissingClassesDiagnostic -> com.android.tools.r8.shaking.MissingClassesDiagnostic:
     java.util.SortedSet missingClasses -> c
     boolean $assertionsDisabled -> a
@@ -74803,38 +75347,48 @@
     1:2:com.android.tools.r8.shaking.MissingClassesDiagnostic$Builder addMissingClasses(java.util.Collection):91:92 -> a
     3:3:com.android.tools.r8.shaking.MissingClassesDiagnostic$Builder setFatal(boolean):98:98 -> a
     4:4:com.android.tools.r8.shaking.MissingClassesDiagnostic build():103:103 -> a
-com.android.tools.r8.shaking.NoHorizontalClassMergingRule -> com.android.tools.r8.shaking.B0:
+com.android.tools.r8.shaking.NoHorizontalClassMergingRule -> com.android.tools.r8.shaking.A0:
     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.NoHorizontalClassMergingRule$1):11:11 -> <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):60:60 -> <init>
     java.lang.String typeString() -> A
-com.android.tools.r8.shaking.NoHorizontalClassMergingRule$1 -> com.android.tools.r8.shaking.A0:
-com.android.tools.r8.shaking.NoHorizontalClassMergingRule$Builder -> com.android.tools.r8.shaking.B0$a:
+com.android.tools.r8.shaking.NoHorizontalClassMergingRule$1 -> com.android.tools.r8.shaking.z0:
+com.android.tools.r8.shaking.NoHorizontalClassMergingRule$Builder -> com.android.tools.r8.shaking.A0$a:
     1:1:void <init>(com.android.tools.r8.shaking.NoHorizontalClassMergingRule$1):15:15 -> <init>
     2:2:void <init>():19:19 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> d
     1:11:com.android.tools.r8.shaking.NoHorizontalClassMergingRule build():29:39 -> e
-com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule -> com.android.tools.r8.shaking.E0:
+com.android.tools.r8.shaking.NoStaticClassMergingRule -> com.android.tools.r8.shaking.D0:
+    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.NoStaticClassMergingRule$1):11:11 -> <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.NoStaticClassMergingRule$1 -> com.android.tools.r8.shaking.B0:
+com.android.tools.r8.shaking.NoStaticClassMergingRule$Builder -> com.android.tools.r8.shaking.C0:
+    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.NoUnusedInterfaceRemovalRule -> com.android.tools.r8.shaking.G0:
     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:
+com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule$1 -> com.android.tools.r8.shaking.E0:
+com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule$Builder -> com.android.tools.r8.shaking.F0:
     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:
+com.android.tools.r8.shaking.NoVerticalClassMergingRule -> com.android.tools.r8.shaking.J0:
     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.F0:
-com.android.tools.r8.shaking.NoVerticalClassMergingRule$Builder -> com.android.tools.r8.shaking.G0:
+com.android.tools.r8.shaking.NoVerticalClassMergingRule$1 -> com.android.tools.r8.shaking.H0:
+com.android.tools.r8.shaking.NoVerticalClassMergingRule$Builder -> com.android.tools.r8.shaking.I0:
     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.lw:
+com.android.tools.r8.shaking.ProguardAccessFlags -> com.android.tools.r8.internal.ev:
     java.util.List NAMES -> b
     int flags -> c
     int PPP_MASK -> a
@@ -74885,88 +75439,98 @@
     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.K0:
+com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule -> com.android.tools.r8.shaking.M0:
     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.I0:
-com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder -> com.android.tools.r8.shaking.J0:
+com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$1 -> com.android.tools.r8.shaking.K0:
+com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder -> com.android.tools.r8.shaking.L0:
     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.L0:
+com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule -> com.android.tools.r8.shaking.N0:
     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.L0$a:
-com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder -> com.android.tools.r8.shaking.L0$b:
+com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$1 -> com.android.tools.r8.shaking.N0$a:
+com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder -> com.android.tools.r8.shaking.N0$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.O0:
+com.android.tools.r8.shaking.ProguardAssumeValuesRule -> com.android.tools.r8.shaking.Q0:
     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.M0:
-com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder -> com.android.tools.r8.shaking.N0:
+com.android.tools.r8.shaking.ProguardAssumeValuesRule$1 -> com.android.tools.r8.shaking.O0:
+com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder -> com.android.tools.r8.shaking.P0:
     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.R0:
+com.android.tools.r8.shaking.ProguardCheckDiscardRule -> com.android.tools.r8.shaking.T0:
     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.P0:
-com.android.tools.r8.shaking.ProguardCheckDiscardRule$Builder -> com.android.tools.r8.shaking.Q0:
+com.android.tools.r8.shaking.ProguardCheckDiscardRule$1 -> com.android.tools.r8.shaking.R0:
+com.android.tools.r8.shaking.ProguardCheckDiscardRule$Builder -> com.android.tools.r8.shaking.S0:
     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.S0:
-    com.android.tools.r8.com.google.common.collect.ImmutableList patterns -> a
-    1:1:void <clinit>():12:12 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.shaking.ProguardClassFilter$1):11:11 -> <init>
-    2:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList):36:37 -> <init>
-    1:1:com.android.tools.r8.shaking.ProguardClassFilter$Builder builder():17:17 -> a
-    2:3:boolean matches(com.android.tools.r8.graph.DexType):53:54 -> a
-    1:1:java.util.List getPatterns():45:45 -> b
-    1:1:boolean isEmpty():49:49 -> c
-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.shaking.ProguardClassFilter -> com.android.tools.r8.shaking.U0:
+    com.android.tools.r8.shaking.ProguardClassFilter EMPTY -> a
+    com.android.tools.r8.com.google.common.collect.ImmutableList patterns -> b
+    1:2:void <clinit>():16:17 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.shaking.ProguardClassFilter$1):16:16 -> <init>
+    2:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList):41:42 -> <init>
+    1:1:com.android.tools.r8.shaking.ProguardClassFilter$Builder builder():22:22 -> a
+    2:3:boolean matches(com.android.tools.r8.graph.DexType):54:55 -> a
+    4:16:java.util.Set getNonMatches(java.util.Set):63:75 -> a
+    17:34:java.util.Set getNonMatches(java.util.Set):68:85 -> a
+    35:38:com.android.tools.r8.utils.TraversalContinuation lambda$getNonMatches$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardTypeMatcher):70:73 -> a
+    39:39:void lambda$getNonMatches$1(java.util.Set,com.android.tools.r8.shaking.ProguardTypeMatcher):86:86 -> a
+    1:1:com.android.tools.r8.shaking.ProguardClassFilter empty():46:46 -> b
+    1:1:boolean isEmpty():50:50 -> c
+com.android.tools.r8.shaking.ProguardClassFilter$1 -> com.android.tools.r8.shaking.U0$a:
+com.android.tools.r8.shaking.ProguardClassFilter$Builder -> com.android.tools.r8.shaking.U0$b:
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder patterns -> a
-    1:1:void <init>(com.android.tools.r8.shaking.ProguardClassFilter$1):20:20 -> <init>
-    2:2:void <init>():23:23 -> <init>
-    3:3:void <init>():21:21 -> <init>
-    1:1:com.android.tools.r8.shaking.ProguardClassFilter$Builder addPattern(com.android.tools.r8.shaking.ProguardClassNameList):27:27 -> a
-    2:2:com.android.tools.r8.shaking.ProguardClassFilter build():32:32 -> a
-com.android.tools.r8.shaking.ProguardClassNameList -> com.android.tools.r8.shaking.T0:
+    1:1:void <init>(com.android.tools.r8.shaking.ProguardClassFilter$1):25:25 -> <init>
+    2:2:void <init>():28:28 -> <init>
+    3:3:void <init>():26:26 -> <init>
+    1:1:com.android.tools.r8.shaking.ProguardClassFilter$Builder addPattern(com.android.tools.r8.shaking.ProguardClassNameList):32:32 -> a
+    2:2:com.android.tools.r8.shaking.ProguardClassFilter build():37:37 -> a
+com.android.tools.r8.shaking.ProguardClassNameList -> com.android.tools.r8.shaking.V0:
     1:1:void <init>():24:24 -> <init>
     java.util.List asSpecificDexTypes() -> a
+    void forEachTypeMatcher(java.util.function.Consumer) -> a
     boolean matches(com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.shaking.ProguardClassNameList materialize(com.android.tools.r8.graph.DexItemFactory) -> a
+    com.android.tools.r8.utils.TraversalContinuation traverseTypeMatchers(java.util.function.Function) -> a
     void writeTo(java.lang.StringBuilder) -> a
     1:1:com.android.tools.r8.shaking.ProguardClassNameList singletonList(com.android.tools.r8.shaking.ProguardTypeMatcher):35:35 -> a
     2:2:java.lang.Iterable getWildcardsOrEmpty(com.android.tools.r8.shaking.ProguardClassNameList):98:98 -> a
+    3:3:void forEachTypeMatcher(java.util.function.Consumer,java.util.function.Predicate):109:109 -> a
+    4:5:void lambda$forEachTypeMatcher$0(java.util.function.Predicate,java.util.function.Consumer,com.android.tools.r8.shaking.ProguardTypeMatcher):111:112 -> a
+    6:6:com.android.tools.r8.utils.TraversalContinuation traverseTypeMatchers(java.util.function.Function,java.util.function.Predicate):123:123 -> a
+    7:10:com.android.tools.r8.utils.TraversalContinuation lambda$traverseTypeMatchers$1(java.util.function.Predicate,java.util.function.Function,com.android.tools.r8.shaking.ProguardTypeMatcher):125:128 -> a
     1:1:com.android.tools.r8.shaking.ProguardClassNameList$Builder builder():27:27 -> b
     1:1:java.lang.Iterable getWildcards():90:90 -> c
-    1:1:boolean hasWildcards():94:94 -> d
-    int size() -> e
+    int size() -> d
     1:3:java.lang.String toString():74:76 -> toString
-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.shaking.ProguardClassNameList$1 -> com.android.tools.r8.shaking.V0$a:
+com.android.tools.r8.shaking.ProguardClassNameList$Builder -> com.android.tools.r8.shaking.V0$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap matchers -> a
     1:1:void <init>(com.android.tools.r8.shaking.ProguardClassNameList$1):40:40 -> <init>
     2:2:void <init>():47:47 -> <init>
     3:3:void <init>():45:45 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardClassNameList$Builder addClassName(boolean,com.android.tools.r8.shaking.ProguardTypeMatcher):51:51 -> a
     2:9:com.android.tools.r8.shaking.ProguardClassNameList build():56:63 -> a
-com.android.tools.r8.shaking.ProguardClassNameList$MixedClassNameList -> com.android.tools.r8.shaking.T0$c:
+com.android.tools.r8.shaking.ProguardClassNameList$MixedClassNameList -> com.android.tools.r8.shaking.V0$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):334:334 -> <init>
     2:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):338:339 -> <init>
@@ -74976,11 +75540,14 @@
     15:15:java.util.stream.Stream lambda$getWildcards$0(java.lang.Iterable):401:401 -> a
     16:19:com.android.tools.r8.shaking.ProguardClassNameList materialize(com.android.tools.r8.graph.DexItemFactory):407:410 -> a
     20:20:void lambda$materialize$1(com.android.tools.r8.shaking.ProguardClassNameList$Builder,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.ProguardTypeMatcher,java.lang.Boolean):409:409 -> a
+    21:21:void forEachTypeMatcher(java.util.function.Consumer):415:415 -> a
+    22:22:void lambda$forEachTypeMatcher$2(java.util.function.Consumer,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$Entry):415:415 -> a
+    23:28:com.android.tools.r8.utils.TraversalContinuation traverseTypeMatchers(java.util.function.Function):421:426 -> a
     1:3:java.lang.Iterable getWildcards():399:401 -> c
-    1:1:int size():344:344 -> e
+    1:1:int size():344:344 -> d
     1:5:boolean equals(java.lang.Object):367:371 -> equals
     1:1:int hashCode():376:376 -> hashCode
-com.android.tools.r8.shaking.ProguardClassNameList$PositiveClassNameList -> com.android.tools.r8.shaking.T0$d:
+com.android.tools.r8.shaking.ProguardClassNameList$PositiveClassNameList -> com.android.tools.r8.shaking.V0$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):245:245 -> <init>
     2:3:void <init>(java.util.Collection):249:250 -> <init>
@@ -74991,13 +75558,15 @@
     11:11:boolean matches(com.android.tools.r8.graph.DexType):298:298 -> a
     12:12:java.util.stream.Stream lambda$getWildcards$2(java.lang.Iterable):305:305 -> a
     13:13:com.android.tools.r8.shaking.ProguardTypeMatcher lambda$materialize$3(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.ProguardTypeMatcher):313:313 -> a
+    14:14:void forEachTypeMatcher(java.util.function.Consumer):319:319 -> a
+    15:20:com.android.tools.r8.utils.TraversalContinuation traverseTypeMatchers(java.util.function.Function):325:330 -> a
     1:1:boolean lambda$asSpecificDexTypes$0(com.android.tools.r8.shaking.ProguardTypeMatcher):289:289 -> b
     2:5:com.android.tools.r8.shaking.ProguardClassNameList$PositiveClassNameList materialize(com.android.tools.r8.graph.DexItemFactory):311:314 -> b
     1:3:java.lang.Iterable getWildcards():303:305 -> c
-    1:1:int size():255:255 -> e
+    1:1:int size():255:255 -> d
     1:5:boolean equals(java.lang.Object):275:279 -> equals
     1:1:int hashCode():284:284 -> hashCode
-com.android.tools.r8.shaking.ProguardClassNameList$SingleClassNameList -> com.android.tools.r8.shaking.T0$e:
+com.android.tools.r8.shaking.ProguardClassNameList$SingleClassNameList -> com.android.tools.r8.shaking.V0$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):177:177 -> <init>
     2:3:void <init>(com.android.tools.r8.shaking.ProguardTypeMatcher):181:182 -> <init>
@@ -75006,11 +75575,13 @@
     4:4:boolean matches(com.android.tools.r8.graph.DexType):220:220 -> a
     5:5:com.android.tools.r8.shaking.ProguardClassNameList$SingleClassNameList materialize(com.android.tools.r8.graph.DexItemFactory):230:230 -> a
     5:5:com.android.tools.r8.shaking.ProguardClassNameList materialize(com.android.tools.r8.graph.DexItemFactory):177 -> a
+    6:6:void forEachTypeMatcher(java.util.function.Consumer):235:235 -> a
+    7:7:com.android.tools.r8.utils.TraversalContinuation traverseTypeMatchers(java.util.function.Function):241:241 -> a
     1:1:java.lang.Iterable getWildcards():225:225 -> c
-    int size() -> e
+    int size() -> d
     1:5:boolean equals(java.lang.Object):200:204 -> equals
     1:1:int hashCode():209:209 -> hashCode
-com.android.tools.r8.shaking.ProguardClassSpecification -> com.android.tools.r8.shaking.U0:
+com.android.tools.r8.shaking.ProguardClassSpecification -> com.android.tools.r8.shaking.W0:
     com.android.tools.r8.shaking.ProguardClassType classType -> i
     boolean inheritanceIsExtends -> m
     com.android.tools.r8.shaking.ProguardTypeMatcher inheritanceClassName -> l
@@ -75049,7 +75620,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.U0$a:
+com.android.tools.r8.shaking.ProguardClassSpecification$Builder -> com.android.tools.r8.shaking.W0$a:
     com.android.tools.r8.shaking.ProguardClassType classType -> j
     boolean inheritanceIsExtends -> n
     java.util.List memberRules -> o
@@ -75079,7 +75650,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.mw:
+com.android.tools.r8.shaking.ProguardClassType -> com.android.tools.r8.internal.fv:
     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
@@ -75093,140 +75664,115 @@
     boolean matches(com.android.tools.r8.graph.DexClass) -> a
     1:1:com.android.tools.r8.shaking.ProguardClassType[] values():9:9 -> a
     1:9:java.lang.String toString():43:51 -> toString
-com.android.tools.r8.shaking.ProguardClassType$1 -> com.android.tools.r8.internal.mw$a:
+com.android.tools.r8.shaking.ProguardClassType$1 -> com.android.tools.r8.internal.fv$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.mw$b:
+com.android.tools.r8.shaking.ProguardClassType$2 -> com.android.tools.r8.internal.fv$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.mw$c:
+com.android.tools.r8.shaking.ProguardClassType$3 -> com.android.tools.r8.internal.fv$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.mw$d:
+com.android.tools.r8.shaking.ProguardClassType$4 -> com.android.tools.r8.internal.fv$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.mw$e:
+com.android.tools.r8.shaking.ProguardClassType$5 -> com.android.tools.r8.internal.fv$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.ProguardClassType$6 -> com.android.tools.r8.internal.mw$f:
+com.android.tools.r8.shaking.ProguardClassType$6 -> com.android.tools.r8.internal.fv$f:
     int[] $SwitchMap$com$android$tools$r8$shaking$ProguardClassType -> a
     1:1:void <clinit>():43:43 -> <clinit>
-com.android.tools.r8.shaking.ProguardCompatibilityActions -> com.android.tools.r8.shaking.W0:
-    java.util.Set compatInstantiatedTypes -> a
-    1:1:void <init>(java.util.Set,com.android.tools.r8.shaking.ProguardCompatibilityActions$1):14:14 -> <init>
-    2:3:void <init>(java.util.Set):18:19 -> <init>
-    1:1:com.android.tools.r8.shaking.ProguardCompatibilityActions$Builder builder():23:23 -> a
-    2:2:com.android.tools.r8.shaking.ProguardCompatibilityActions$Builder builder():23:23 -> a
-    2:2:com.android.tools.r8.shaking.ProguardCompatibilityActions rewrittenWithLens(com.android.tools.r8.graph.GraphLens):41 -> a
-    3:6:com.android.tools.r8.shaking.ProguardCompatibilityActions rewrittenWithLens(com.android.tools.r8.graph.GraphLens):42:45 -> a
-    7:7:com.android.tools.r8.shaking.ProguardCompatibilityActions$Builder builder():23:23 -> a
-    7:7:com.android.tools.r8.shaking.ProguardCompatibilityActions withoutPrunedItems(com.android.tools.r8.graph.PrunedItems):31 -> a
-    8:13:com.android.tools.r8.shaking.ProguardCompatibilityActions withoutPrunedItems(com.android.tools.r8.graph.PrunedItems):32:37 -> a
-    14:14:boolean isCompatInstantiated(com.android.tools.r8.graph.DexProgramClass):27:27 -> a
-com.android.tools.r8.shaking.ProguardCompatibilityActions$1 -> com.android.tools.r8.shaking.V0:
-com.android.tools.r8.shaking.ProguardCompatibilityActions$Builder -> com.android.tools.r8.shaking.W0$a:
-    java.util.Set compatInstantiatedTypes -> a
-    1:3:void <init>():48:50 -> <init>
-    1:1:void addCompatInstantiatedType(com.android.tools.r8.graph.DexProgramClass):53:53 -> a
-    2:2:void addCompatInstantiatedType(com.android.tools.r8.graph.DexType):57:57 -> a
-    2:2:void addCompatInstantiatedType(com.android.tools.r8.graph.DexProgramClass):53 -> a
-    3:3:void addCompatInstantiatedType(com.android.tools.r8.graph.DexType):57:57 -> a
-    3:3:void access$000(com.android.tools.r8.shaking.ProguardCompatibilityActions$Builder,com.android.tools.r8.graph.DexType):48 -> a
-    4:4:com.android.tools.r8.shaking.ProguardCompatibilityActions build():61:61 -> a
 com.android.tools.r8.shaking.ProguardConfiguration -> com.android.tools.r8.shaking.X0:
-    boolean printConfiguration -> m
-    boolean protoShrinking -> N
-    int maxRemovedAndroidLogLevel -> O
-    boolean printUsage -> o
-    com.android.tools.r8.shaking.ProguardKeepAttributes keepAttributes -> v
-    java.nio.file.Path seedFile -> B
-    boolean ignoreWarnings -> i
-    com.android.tools.r8.shaking.ProguardClassFilter dontWarnPatterns -> x
-    com.android.tools.r8.com.google.common.collect.ImmutableList rules -> z
-    boolean obfuscating -> k
-    boolean configurationDebugging -> L
-    com.android.tools.r8.com.google.common.collect.ImmutableList packageObfuscationDictionary -> F
-    com.android.tools.r8.com.google.common.collect.ImmutableList libraryjars -> e
-    com.android.tools.r8.shaking.ProguardPathFilter adaptResourceFileContents -> J
-    boolean printMapping -> q
-    com.android.tools.r8.com.google.common.collect.ImmutableList obfuscationDictionary -> D
-    com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode packageObfuscationMode -> f
-    java.nio.file.Path printMappingFile -> r
-    com.android.tools.r8.shaking.ProguardPathFilter adaptResourceFilenames -> I
-    boolean keepParameterNames -> G
-    boolean allowAccessModification -> h
-    boolean printSeeds -> A
-    boolean overloadAggressively -> C
-    java.lang.String packagePrefix -> g
-    boolean dontUseMixedCaseClassnames -> M
-    com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
-    com.android.tools.r8.shaking.ProguardClassFilter dontNotePatterns -> y
-    boolean optimizing -> j
-    boolean shrinking -> l
-    com.android.tools.r8.shaking.ProguardPathFilter keepDirectories -> K
-    com.android.tools.r8.com.google.common.collect.ImmutableList classObfuscationDictionary -> E
-    java.nio.file.Path printUsageFile -> p
-    com.android.tools.r8.com.google.common.collect.ImmutableList injars -> d
-    java.lang.String renameSourceFileAttribute -> u
-    java.nio.file.Path printConfigurationFile -> n
-    boolean verbose -> t
-    java.nio.file.Path applyMappingFile -> s
-    com.android.tools.r8.shaking.ProguardClassFilter adaptClassStrings -> H
-    com.android.tools.r8.shaking.ProguardKeepRule keepAllRule -> P
-    boolean $assertionsDisabled -> a
-    java.lang.String parsedConfiguration -> b
-    com.android.tools.r8.shaking.ProguardPackageNameList keepPackageNamesPatterns -> w
-    1:1:void <clinit>():21:21 -> <clinit>
-    1:1:void <init>(java.lang.String,com.android.tools.r8.graph.DexItemFactory,java.util.List,java.util.List,com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode,java.lang.String,boolean,boolean,boolean,boolean,boolean,boolean,java.nio.file.Path,boolean,java.nio.file.Path,boolean,java.nio.file.Path,java.nio.file.Path,boolean,java.lang.String,com.android.tools.r8.shaking.ProguardKeepAttributes,com.android.tools.r8.shaking.ProguardPackageNameList,com.android.tools.r8.shaking.ProguardClassFilter,com.android.tools.r8.shaking.ProguardClassFilter,java.util.Set,boolean,java.nio.file.Path,boolean,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,boolean,com.android.tools.r8.shaking.ProguardClassFilter,com.android.tools.r8.shaking.ProguardPathFilter,com.android.tools.r8.shaking.ProguardPathFilter,com.android.tools.r8.shaking.ProguardPathFilter,boolean,boolean,boolean,int,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardConfiguration$1):21:21 -> <init>
-    2:43:void <init>(java.lang.String,com.android.tools.r8.graph.DexItemFactory,java.util.List,java.util.List,com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode,java.lang.String,boolean,boolean,boolean,boolean,boolean,boolean,java.nio.file.Path,boolean,java.nio.file.Path,boolean,java.nio.file.Path,java.nio.file.Path,boolean,java.lang.String,com.android.tools.r8.shaking.ProguardKeepAttributes,com.android.tools.r8.shaking.ProguardPackageNameList,com.android.tools.r8.shaking.ProguardClassFilter,com.android.tools.r8.shaking.ProguardClassFilter,java.util.Set,boolean,java.nio.file.Path,boolean,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,boolean,com.android.tools.r8.shaking.ProguardClassFilter,com.android.tools.r8.shaking.ProguardPathFilter,com.android.tools.r8.shaking.ProguardPathFilter,com.android.tools.r8.shaking.ProguardPathFilter,boolean,boolean,boolean,int,com.android.tools.r8.shaking.ProguardKeepRule):487:528 -> <init>
-    1:1:boolean hasDontUseMixedCaseClassnames():697:697 -> A
-    1:1:boolean hasDontWarnPatterns():632:632 -> B
-    1:1:boolean isAccessModificationAllowed():564:564 -> C
-    1:1:boolean isConfigurationDebugging():693:693 -> D
-    1:1:boolean isIgnoreWarnings():584:584 -> E
-    1:1:boolean isKeepParameterNames():665:665 -> F
-    1:1:boolean isObfuscating():592:592 -> G
-    1:1:boolean isOptimizing():588:588 -> H
-    1:1:boolean isOverloadAggressively():649:649 -> I
-    1:1:boolean isPrintConfiguration():600:600 -> J
-    1:1:boolean isPrintMapping():568:568 -> K
-    1:1:boolean isPrintSeeds():685:685 -> L
-    1:1:boolean isPrintUsage():608:608 -> M
-    1:1:boolean isProtoShrinkingEnabled():701:701 -> N
-    1:1:boolean isShrinking():596:596 -> O
-    1:1:boolean isVerbose():616:616 -> P
-    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder builder(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):536:536 -> a
-    2:2:com.android.tools.r8.shaking.ProguardClassFilter getDontWarnPatterns(com.android.tools.r8.errors.dontwarn.DontWarnConfiguration$Witness):637:637 -> a
-    3:3:com.android.tools.r8.shaking.ProguardClassFilter getAdaptClassStrings():669:669 -> a
-    1:1:com.android.tools.r8.shaking.ProguardPathFilter getAdaptResourceFileContents():677:677 -> b
-    1:1:com.android.tools.r8.shaking.ProguardPathFilter getAdaptResourceFilenames():673:673 -> c
-    1:1:java.nio.file.Path getApplyMappingFile():580:580 -> d
-    1:1:java.util.List getClassObfuscationDictionary():657:657 -> e
-    1:1:com.android.tools.r8.graph.DexItemFactory getDexItemFactory():544:544 -> f
-    1:1:com.android.tools.r8.shaking.ProguardClassFilter getDontNotePatterns():641:641 -> g
-    1:1:java.util.List getInjars():548:548 -> h
-    1:1:com.android.tools.r8.shaking.ProguardKeepRule getKeepAllRule():709:709 -> i
-    1:1:com.android.tools.r8.shaking.ProguardKeepAttributes getKeepAttributes():624:624 -> j
-    1:1:com.android.tools.r8.shaking.ProguardPathFilter getKeepDirectories():681:681 -> k
-    1:1:com.android.tools.r8.shaking.ProguardPackageNameList getKeepPackageNamesPatterns():628:628 -> l
-    1:1:java.util.List getLibraryjars():552:552 -> m
-    1:1:int getMaxRemovedAndroidLogLevel():705:705 -> n
-    1:1:java.util.List getObfuscationDictionary():653:653 -> o
-    1:1:java.util.List getPackageObfuscationDictionary():661:661 -> p
-    1:1:com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode getPackageObfuscationMode():556:556 -> q
-    1:1:java.lang.String getPackagePrefix():560:560 -> r
-    1:1:java.lang.String getParsedConfiguration():540:540 -> s
-    1:1:java.nio.file.Path getPrintConfigurationFile():604:604 -> t
-    1:2:java.lang.String toString():714:715 -> toString
+    com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
+    java.lang.String packagePrefix -> f
+    boolean optimizing -> i
+    com.android.tools.r8.shaking.ProguardClassFilter dontNotePatterns -> x
+    boolean shrinking -> k
+    boolean dontUseMixedCaseClassnames -> L
+    java.nio.file.Path printConfigurationFile -> m
+    com.android.tools.r8.shaking.ProguardPathFilter keepDirectories -> J
+    java.nio.file.Path printMappingFile -> q
+    java.nio.file.Path printUsageFile -> o
+    boolean verbose -> s
+    com.android.tools.r8.com.google.common.collect.ImmutableList classObfuscationDictionary -> D
+    com.android.tools.r8.com.google.common.collect.ImmutableList injars -> c
+    java.lang.String renameSourceFileAttribute -> t
+    java.nio.file.Path applyMappingFile -> r
+    com.android.tools.r8.shaking.ProguardClassFilter adaptClassStrings -> G
+    com.android.tools.r8.shaking.ProguardKeepRule keepAllRule -> O
+    com.android.tools.r8.shaking.ProguardPathFilter adaptResourceFileContents -> I
+    java.lang.String parsedConfiguration -> a
+    boolean ignoreWarnings -> h
+    com.android.tools.r8.shaking.ProguardPackageNameList keepPackageNamesPatterns -> v
+    boolean protoShrinking -> M
+    int maxRemovedAndroidLogLevel -> N
+    boolean printUsage -> n
+    com.android.tools.r8.shaking.ProguardKeepAttributes keepAttributes -> u
+    boolean printMapping -> p
+    boolean obfuscating -> j
+    com.android.tools.r8.shaking.ProguardClassFilter dontWarnPatterns -> w
+    com.android.tools.r8.com.google.common.collect.ImmutableList rules -> y
+    boolean configurationDebugging -> K
+    boolean printConfiguration -> l
+    com.android.tools.r8.com.google.common.collect.ImmutableList packageObfuscationDictionary -> E
+    com.android.tools.r8.com.google.common.collect.ImmutableList libraryjars -> d
+    com.android.tools.r8.com.google.common.collect.ImmutableList obfuscationDictionary -> C
+    com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode packageObfuscationMode -> e
+    boolean printSeeds -> z
+    com.android.tools.r8.shaking.ProguardPathFilter adaptResourceFilenames -> H
+    boolean keepParameterNames -> F
+    boolean allowAccessModification -> g
+    java.nio.file.Path seedFile -> A
+    boolean overloadAggressively -> B
+    1:1:void <init>(java.lang.String,com.android.tools.r8.graph.DexItemFactory,java.util.List,java.util.List,com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode,java.lang.String,boolean,boolean,boolean,boolean,boolean,boolean,java.nio.file.Path,boolean,java.nio.file.Path,boolean,java.nio.file.Path,java.nio.file.Path,boolean,java.lang.String,com.android.tools.r8.shaking.ProguardKeepAttributes,com.android.tools.r8.shaking.ProguardPackageNameList,com.android.tools.r8.shaking.ProguardClassFilter,com.android.tools.r8.shaking.ProguardClassFilter,java.util.Set,boolean,java.nio.file.Path,boolean,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,boolean,com.android.tools.r8.shaking.ProguardClassFilter,com.android.tools.r8.shaking.ProguardPathFilter,com.android.tools.r8.shaking.ProguardPathFilter,com.android.tools.r8.shaking.ProguardPathFilter,boolean,boolean,boolean,int,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardConfiguration$1):20:20 -> <init>
+    2:43:void <init>(java.lang.String,com.android.tools.r8.graph.DexItemFactory,java.util.List,java.util.List,com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode,java.lang.String,boolean,boolean,boolean,boolean,boolean,boolean,java.nio.file.Path,boolean,java.nio.file.Path,boolean,java.nio.file.Path,java.nio.file.Path,boolean,java.lang.String,com.android.tools.r8.shaking.ProguardKeepAttributes,com.android.tools.r8.shaking.ProguardPackageNameList,com.android.tools.r8.shaking.ProguardClassFilter,com.android.tools.r8.shaking.ProguardClassFilter,java.util.Set,boolean,java.nio.file.Path,boolean,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,boolean,com.android.tools.r8.shaking.ProguardClassFilter,com.android.tools.r8.shaking.ProguardPathFilter,com.android.tools.r8.shaking.ProguardPathFilter,com.android.tools.r8.shaking.ProguardPathFilter,boolean,boolean,boolean,int,com.android.tools.r8.shaking.ProguardKeepRule):486:527 -> <init>
+    1:1:boolean hasApplyMappingFile():575:575 -> A
+    1:1:boolean hasDontUseMixedCaseClassnames():691:691 -> B
+    1:1:boolean isAccessModificationAllowed():563:563 -> C
+    1:1:boolean isConfigurationDebugging():687:687 -> D
+    1:1:boolean isIgnoreWarnings():583:583 -> E
+    1:1:boolean isKeepParameterNames():659:659 -> F
+    1:1:boolean isObfuscating():591:591 -> G
+    1:1:boolean isOptimizing():587:587 -> H
+    1:1:boolean isOverloadAggressively():643:643 -> I
+    1:1:boolean isPrintConfiguration():599:599 -> J
+    1:1:boolean isPrintMapping():567:567 -> K
+    1:1:boolean isPrintSeeds():679:679 -> L
+    1:1:boolean isPrintUsage():607:607 -> M
+    1:1:boolean isProtoShrinkingEnabled():695:695 -> N
+    1:1:boolean isShrinking():595:595 -> O
+    1:1:boolean isVerbose():615:615 -> P
+    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder builder(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):535:535 -> a
+    2:2:com.android.tools.r8.shaking.ProguardClassFilter getAdaptClassStrings():663:663 -> a
+    1:1:com.android.tools.r8.shaking.ProguardPathFilter getAdaptResourceFileContents():671:671 -> b
+    1:1:com.android.tools.r8.shaking.ProguardPathFilter getAdaptResourceFilenames():667:667 -> c
+    1:1:java.nio.file.Path getApplyMappingFile():579:579 -> d
+    1:1:java.util.List getClassObfuscationDictionary():651:651 -> e
+    1:1:com.android.tools.r8.graph.DexItemFactory getDexItemFactory():543:543 -> f
+    1:1:com.android.tools.r8.shaking.ProguardClassFilter getDontNotePatterns():635:635 -> g
+    1:1:com.android.tools.r8.shaking.ProguardClassFilter getDontWarnPatterns():631:631 -> h
+    1:1:java.util.List getInjars():547:547 -> i
+    1:1:com.android.tools.r8.shaking.ProguardKeepRule getKeepAllRule():703:703 -> j
+    1:1:com.android.tools.r8.shaking.ProguardKeepAttributes getKeepAttributes():623:623 -> k
+    1:1:com.android.tools.r8.shaking.ProguardPathFilter getKeepDirectories():675:675 -> l
+    1:1:com.android.tools.r8.shaking.ProguardPackageNameList getKeepPackageNamesPatterns():627:627 -> m
+    1:1:java.util.List getLibraryjars():551:551 -> n
+    1:1:int getMaxRemovedAndroidLogLevel():699:699 -> o
+    1:1:java.util.List getObfuscationDictionary():647:647 -> p
+    1:1:java.util.List getPackageObfuscationDictionary():655:655 -> q
+    1:1:com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode getPackageObfuscationMode():555:555 -> r
+    1:1:java.lang.String getPackagePrefix():559:559 -> s
+    1:1:java.lang.String getParsedConfiguration():539:539 -> t
+    1:2:java.lang.String toString():708:709 -> toString
     3:3:boolean com.android.tools.r8.shaking.ProguardKeepAttributes.isEmpty():219:219 -> toString
-    3:3:java.lang.String toString():715 -> toString
-    4:11:java.lang.String toString():716:723 -> toString
-    1:1:java.nio.file.Path getPrintMappingFile():572:572 -> u
-    1:1:java.nio.file.Path getPrintUsageFile():612:612 -> v
-    1:1:java.lang.String getRenameSourceFileAttribute():620:620 -> w
-    1:1:java.util.List getRules():645:645 -> x
-    1:1:java.nio.file.Path getSeedFile():689:689 -> y
-    1:1:boolean hasApplyMappingFile():576:576 -> z
+    3:3:java.lang.String toString():709 -> toString
+    4:11:java.lang.String toString():710:717 -> toString
+    1:1:java.nio.file.Path getPrintConfigurationFile():603:603 -> u
+    1:1:java.nio.file.Path getPrintMappingFile():571:571 -> v
+    1:1:java.nio.file.Path getPrintUsageFile():611:611 -> w
+    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.X0$a:
 com.android.tools.r8.shaking.ProguardConfiguration$Builder -> com.android.tools.r8.shaking.X0$b:
     boolean printConfiguration -> m
@@ -75276,84 +75822,84 @@
     java.util.List injars -> c
     boolean $assertionsDisabled -> a
     boolean printSeeds -> B
-    1:1:void <clinit>():23:23 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.shaking.ProguardConfiguration$1):23:23 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):78:78 -> <init>
-    3:58:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):25:80 -> <init>
-    1:1:void addParsedConfiguration(java.lang.String):84:84 -> a
-    2:2:void addInjars(java.util.List):88:88 -> a
-    3:3:void setAllowAccessModification(boolean):110:110 -> a
-    4:4:boolean isShrinking():136:136 -> a
-    4:4:void lambda$build$1(com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder):388 -> a
-    5:5:void lambda$build$1(com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder):388:388 -> a
-    6:6:boolean isOptimizing():132:132 -> a
-    6:6:void lambda$build$1(com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder):389 -> a
-    7:7:void lambda$build$1(com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder):389:389 -> a
-    8:8:boolean isObfuscating():128:128 -> a
-    8:8:void lambda$build$1(com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder):390 -> a
-    9:9:void lambda$build$1(com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder):390:390 -> a
-    10:10:void setApplyMappingFile(java.nio.file.Path):171:171 -> a
-    11:11:void addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):192:192 -> a
-    12:12:void addKeepPackageNamesPattern(boolean,com.android.tools.r8.shaking.ProguardPackageMatcher):196:196 -> a
-    13:16:void setKeepParameterNames(boolean,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):233:236 -> a
-    17:17:void addAdaptClassStringsPattern(com.android.tools.r8.shaking.ProguardClassNameList):252:252 -> a
-    18:18:void addAdaptResourceFileContents(com.android.tools.r8.shaking.ProguardPathList):261:261 -> a
-    19:19:java.lang.String[] lambda$synthesizeKeepRulesForRecompilation$0(int):322:322 -> a
-    20:20:com.android.tools.r8.shaking.ProguardConfiguration build():377:377 -> a
-    21:21:boolean isObfuscating():128:128 -> a
-    21:21:com.android.tools.r8.shaking.ProguardConfiguration build():377 -> a
-    22:22:com.android.tools.r8.shaking.ProguardConfiguration build():379:379 -> a
-    23:23:boolean isShrinking():136:136 -> a
-    23:23:com.android.tools.r8.shaking.ProguardConfiguration build():384 -> a
-    24:24:boolean isObfuscating():128:128 -> a
-    24:24:com.android.tools.r8.shaking.ProguardConfiguration build():384 -> a
-    25:25:boolean isOptimizing():132:132 -> a
-    25:25:com.android.tools.r8.shaking.ProguardConfiguration build():384 -> a
-    26:41:com.android.tools.r8.shaking.ProguardConfiguration build():385:400 -> a
-    1:2:void setFlattenPackagePrefix(java.lang.String):105:106 -> b
-    3:3:com.android.tools.r8.shaking.ProguardConfiguration$Builder addKeepAttributePatterns(java.util.List):187:187 -> b
-    4:4:void addDontNotePattern(com.android.tools.r8.shaking.ProguardClassNameList):204:204 -> b
-    5:5:void setClassObfuscationDictionary(java.nio.file.Path):220:220 -> b
-    6:6:com.android.tools.r8.shaking.ProguardConfiguration$Builder addAdaptResourceFilenames(com.android.tools.r8.shaking.ProguardPathList):256:256 -> b
-    7:7:void setConfigurationDebugging(boolean):285:285 -> b
-    8:8:void setMaxRemovedAndroidLogLevel(int):305:305 -> b
-    9:53:com.android.tools.r8.shaking.ProguardConfiguration buildRaw():327:371 -> b
-    1:1:void addLibraryJars(java.util.List):92:92 -> c
-    2:3:void setPackagePrefix(java.lang.String):100:101 -> c
-    4:4:com.android.tools.r8.shaking.ProguardConfiguration$Builder disableObfuscation():123:123 -> c
-    5:5:void addDontWarnPattern(com.android.tools.r8.shaking.ProguardClassNameList):200:200 -> c
-    6:6:void setObfuscationDictionary(java.nio.file.Path):216:216 -> c
-    7:7:void addKeepDirectories(com.android.tools.r8.shaking.ProguardPathList):269:269 -> c
-    8:8:void setDontUseMixedCaseClassnames(boolean):293:293 -> c
-    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder disableOptimization():118:118 -> d
-    2:2:void setRenameSourceFileAttribute(java.lang.String):183:183 -> d
-    3:3:void setPackageObfuscationDictionary(java.nio.file.Path):224:224 -> d
-    4:4:void setForceProguardCompatibility(boolean):273:273 -> d
-    1:1:void setIgnoreWarnings(boolean):114:114 -> e
-    2:2:com.android.tools.r8.shaking.ProguardConfiguration$Builder disableShrinking():140:140 -> e
-    3:4:void setPrintConfigurationFile(java.nio.file.Path):149:150 -> e
-    1:2:void setPrintMappingFile(java.nio.file.Path):166:167 -> f
-    3:3:void enableKeepDirectories():265:265 -> f
-    4:4:void setOverloadAggressively(boolean):277:277 -> f
-    1:1:void setPrintConfiguration(boolean):145:145 -> g
-    2:2:void setPrintUsageFile(java.nio.file.Path):158:158 -> g
-    3:3:void enableKeepRuleSynthesisForRecompilation():281:281 -> g
-    1:1:void setPrintMapping(boolean):162:162 -> h
-    2:2:void setSeedFile(java.nio.file.Path):208:208 -> h
-    3:3:void enableProtoShrinking():297:297 -> h
-    1:1:void setPrintSeeds(boolean):212:212 -> i
-    2:2:com.android.tools.r8.origin.Origin getKeepParameterNamesOptionOrigin():244:244 -> i
-    1:1:void setPrintUsage(boolean):154:154 -> j
-    2:2:com.android.tools.r8.position.Position getKeepParameterNamesOptionPosition():248:248 -> j
-    1:1:com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode getPackageObfuscationMode():96:96 -> k
-    2:2:void setVerbose(boolean):179:179 -> k
-    1:1:boolean hasApplyMappingFile():175:175 -> l
-    1:1:boolean isConfigurationDebugging():289:289 -> m
-    1:1:boolean isKeepParameterNames():240:240 -> n
-    1:1:boolean isObfuscating():128:128 -> o
-    1:10:void synthesizeKeepRulesForRecompilation():313:322 -> p
-    11:11:void synthesizeKeepRulesForRecompilation():319:319 -> p
-    12:12:void synthesizeKeepRulesForRecompilation():318:318 -> p
+    1:1:void <clinit>():22:22 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.shaking.ProguardConfiguration$1):22:22 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):77:77 -> <init>
+    3:58:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):24:79 -> <init>
+    1:1:void addParsedConfiguration(java.lang.String):83:83 -> a
+    2:2:void addInjars(java.util.List):87:87 -> a
+    3:3:void setAllowAccessModification(boolean):109:109 -> a
+    4:4:boolean isShrinking():135:135 -> a
+    4:4:void lambda$build$1(com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder):387 -> a
+    5:5:void lambda$build$1(com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder):387:387 -> a
+    6:6:boolean isOptimizing():131:131 -> a
+    6:6:void lambda$build$1(com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder):388 -> a
+    7:7:void lambda$build$1(com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder):388:388 -> a
+    8:8:boolean isObfuscating():127:127 -> a
+    8:8:void lambda$build$1(com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder):389 -> a
+    9:9:void lambda$build$1(com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder):389:389 -> a
+    10:10:void setApplyMappingFile(java.nio.file.Path):170:170 -> a
+    11:11:void addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):191:191 -> a
+    12:12:void addKeepPackageNamesPattern(boolean,com.android.tools.r8.shaking.ProguardPackageMatcher):195:195 -> a
+    13:16:void setKeepParameterNames(boolean,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):232:235 -> a
+    17:17:void addAdaptClassStringsPattern(com.android.tools.r8.shaking.ProguardClassNameList):251:251 -> a
+    18:18:void addAdaptResourceFileContents(com.android.tools.r8.shaking.ProguardPathList):260:260 -> a
+    19:19:java.lang.String[] lambda$synthesizeKeepRulesForRecompilation$0(int):321:321 -> a
+    20:20:com.android.tools.r8.shaking.ProguardConfiguration build():376:376 -> a
+    21:21:boolean isObfuscating():127:127 -> a
+    21:21:com.android.tools.r8.shaking.ProguardConfiguration build():376 -> a
+    22:22:com.android.tools.r8.shaking.ProguardConfiguration build():378:378 -> a
+    23:23:boolean isShrinking():135:135 -> a
+    23:23:com.android.tools.r8.shaking.ProguardConfiguration build():383 -> a
+    24:24:boolean isObfuscating():127:127 -> a
+    24:24:com.android.tools.r8.shaking.ProguardConfiguration build():383 -> a
+    25:25:boolean isOptimizing():131:131 -> a
+    25:25:com.android.tools.r8.shaking.ProguardConfiguration build():383 -> a
+    26:41:com.android.tools.r8.shaking.ProguardConfiguration build():384:399 -> a
+    1:2:void setFlattenPackagePrefix(java.lang.String):104:105 -> b
+    3:3:com.android.tools.r8.shaking.ProguardConfiguration$Builder addKeepAttributePatterns(java.util.List):186:186 -> b
+    4:4:void addDontNotePattern(com.android.tools.r8.shaking.ProguardClassNameList):203:203 -> b
+    5:5:void setClassObfuscationDictionary(java.nio.file.Path):219:219 -> b
+    6:6:com.android.tools.r8.shaking.ProguardConfiguration$Builder addAdaptResourceFilenames(com.android.tools.r8.shaking.ProguardPathList):255:255 -> b
+    7:7:void setConfigurationDebugging(boolean):284:284 -> b
+    8:8:void setMaxRemovedAndroidLogLevel(int):304:304 -> b
+    9:53:com.android.tools.r8.shaking.ProguardConfiguration buildRaw():326:370 -> b
+    1:1:void addLibraryJars(java.util.List):91:91 -> c
+    2:3:void setPackagePrefix(java.lang.String):99:100 -> c
+    4:4:com.android.tools.r8.shaking.ProguardConfiguration$Builder disableObfuscation():122:122 -> c
+    5:5:void addDontWarnPattern(com.android.tools.r8.shaking.ProguardClassNameList):199:199 -> c
+    6:6:void setObfuscationDictionary(java.nio.file.Path):215:215 -> c
+    7:7:void addKeepDirectories(com.android.tools.r8.shaking.ProguardPathList):268:268 -> c
+    8:8:void setDontUseMixedCaseClassnames(boolean):292:292 -> c
+    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder disableOptimization():117:117 -> d
+    2:2:void setRenameSourceFileAttribute(java.lang.String):182:182 -> d
+    3:3:void setPackageObfuscationDictionary(java.nio.file.Path):223:223 -> d
+    4:4:void setForceProguardCompatibility(boolean):272:272 -> d
+    1:1:void setIgnoreWarnings(boolean):113:113 -> e
+    2:2:com.android.tools.r8.shaking.ProguardConfiguration$Builder disableShrinking():139:139 -> e
+    3:4:void setPrintConfigurationFile(java.nio.file.Path):148:149 -> e
+    1:2:void setPrintMappingFile(java.nio.file.Path):165:166 -> f
+    3:3:void enableKeepDirectories():264:264 -> f
+    4:4:void setOverloadAggressively(boolean):276:276 -> f
+    1:1:void setPrintConfiguration(boolean):144:144 -> g
+    2:2:void setPrintUsageFile(java.nio.file.Path):157:157 -> g
+    3:3:void enableKeepRuleSynthesisForRecompilation():280:280 -> g
+    1:1:void setPrintMapping(boolean):161:161 -> h
+    2:2:void setSeedFile(java.nio.file.Path):207:207 -> h
+    3:3:void enableProtoShrinking():296:296 -> h
+    1:1:void setPrintSeeds(boolean):211:211 -> i
+    2:2:com.android.tools.r8.origin.Origin getKeepParameterNamesOptionOrigin():243:243 -> i
+    1:1:void setPrintUsage(boolean):153:153 -> j
+    2:2:com.android.tools.r8.position.Position getKeepParameterNamesOptionPosition():247:247 -> j
+    1:1:com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode getPackageObfuscationMode():95:95 -> k
+    2:2:void setVerbose(boolean):178:178 -> k
+    1:1:boolean hasApplyMappingFile():174:174 -> l
+    1:1:boolean isConfigurationDebugging():288:288 -> m
+    1:1:boolean isKeepParameterNames():239:239 -> n
+    1:1:boolean isObfuscating():127:127 -> o
+    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.Y0:
     boolean allowTestOptions -> n
     int $r8$clinit -> j
@@ -75369,53 +75915,55 @@
     java.util.List WARNED_CLASS_DESCRIPTOR_OPTIONS -> h
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> l
     java.util.List WARNED_FLAG_OPTIONS -> g
-    1:49:void <clinit>():58:106 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):120:120 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,boolean):124:129 -> <init>
-    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder access$000(com.android.tools.r8.shaking.ProguardConfigurationParser):46:46 -> a
-    2:2:java.util.List access$1000():46:46 -> a
-    3:8:com.android.tools.r8.com.google.common.collect.ImmutableList parse(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):110:115 -> a
-    9:9:void parse(java.nio.file.Path):179:179 -> a
-    10:10:void parse(com.android.tools.r8.shaking.ProguardConfigurationSource):183:183 -> a
-    11:18:void parse(java.util.List):187:194 -> a
-    19:21:void parse(java.util.List):191:191 -> a
-    27:27:void parse(java.util.List):197:197 -> a
-    1:1:com.android.tools.r8.utils.Reporter access$100(com.android.tools.r8.shaking.ProguardConfigurationParser):46:46 -> b
-    2:2:java.util.List access$1100():46:46 -> b
-    1:1:com.android.tools.r8.graph.DexItemFactory access$1200(com.android.tools.r8.shaking.ProguardConfigurationParser):46:46 -> c
-    2:2:java.util.List access$300():46:46 -> c
-    1:1:boolean access$200(com.android.tools.r8.shaking.ProguardConfigurationParser):46:46 -> d
-    2:2:java.util.List access$400():46:46 -> d
-    1:1:java.util.List access$500():46:46 -> e
-    1:1:java.util.List access$600():46:46 -> f
-    1:1:java.util.List access$700():46:46 -> g
-    1:1:java.util.List access$800():46:46 -> h
-    1:1:java.util.List access$900():46:46 -> i
-    1:2:com.android.tools.r8.shaking.ProguardConfiguration getConfig():165:166 -> j
-    1:2:com.android.tools.r8.shaking.ProguardConfiguration getConfigRawForTesting():174:175 -> k
-    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder getConfigurationBuilder():133:133 -> l
-    1:7:void validate():137:143 -> m
-    8:24:void validate():140:156 -> m
+    1:49:void <clinit>():57:105 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):119:119 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,boolean):123:128 -> <init>
+    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder access$000(com.android.tools.r8.shaking.ProguardConfigurationParser):45:45 -> a
+    2:2:java.util.List access$1000():45:45 -> a
+    3:8:com.android.tools.r8.com.google.common.collect.ImmutableList parse(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):109:114 -> a
+    9:9:void parse(java.nio.file.Path):178:178 -> a
+    10:10:void parse(com.android.tools.r8.shaking.ProguardConfigurationSource):182:182 -> a
+    11:18:void parse(java.util.List):186:193 -> a
+    19:21:void parse(java.util.List):190:190 -> a
+    27:27:void parse(java.util.List):196:196 -> a
+    1:1:com.android.tools.r8.utils.Reporter access$100(com.android.tools.r8.shaking.ProguardConfigurationParser):45:45 -> b
+    2:2:java.util.List access$1100():45:45 -> b
+    1:1:com.android.tools.r8.graph.DexItemFactory access$1200(com.android.tools.r8.shaking.ProguardConfigurationParser):45:45 -> c
+    2:2:java.util.List access$300():45:45 -> c
+    1:1:boolean access$200(com.android.tools.r8.shaking.ProguardConfigurationParser):45:45 -> d
+    2:2:java.util.List access$400():45:45 -> d
+    1:1:java.util.List access$500():45:45 -> e
+    1:1:java.util.List access$600():45:45 -> f
+    1:1:java.util.List access$700():45:45 -> g
+    1:1:java.util.List access$800():45:45 -> h
+    1:1:java.util.List access$900():45:45 -> i
+    1:2:com.android.tools.r8.shaking.ProguardConfiguration getConfig():164:165 -> j
+    1:2:com.android.tools.r8.shaking.ProguardConfiguration getConfigRawForTesting():173:174 -> k
+    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder getConfigurationBuilder():132:132 -> l
+    1:7:void validate():136:142 -> m
+    8:24:void validate():139:155 -> m
 com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards -> com.android.tools.r8.shaking.Y0$a:
     java.util.List wildcards -> b
     java.lang.String pattern -> a
-    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
+    1:3:void <init>(java.lang.String,java.util.List):2191:2193 -> <init>
+    1:1:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards withoutWildcards(java.lang.String):2197:2197 -> a
+    2:3:boolean hasBackreference():2205:2206 -> a
+    1:15:boolean hasUnusualCharacters():2210:2224 -> b
 com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation -> com.android.tools.r8.shaking.Y0$b:
     com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards patternWithWildcards -> a
     boolean negated -> b
-    1:3:void <init>(java.lang.String,java.util.List,boolean):2220:2222 -> <init>
+    1:3:void <init>(java.lang.String,java.util.List,boolean):2235:2237 -> <init>
 com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType -> com.android.tools.r8.shaking.Y0$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>():201:203 -> <clinit>
-    1:1:void <init>(java.lang.String,int):200:200 -> <init>
+    1:3:void <clinit>():200:202 -> <clinit>
+    1:1:void <init>(java.lang.String,int):199:199 -> <init>
 com.android.tools.r8.shaking.ProguardConfigurationParser$ProguardConfigurationSourceParser -> com.android.tools.r8.shaking.Y0$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
     java.nio.file.Path baseDirectory -> h
-    com.android.tools.r8.shaking.ProguardConfigurationParser this$0 -> j
     int line -> f
     int lineStartPosition -> g
     int position -> d
@@ -75424,985 +75972,1016 @@
     boolean $assertionsDisabled -> a
     java.lang.String contents -> c
     java.lang.String name -> b
-    1:1:void <clinit>():206:206 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):216:216 -> <init>
-    2:14:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):209:221 -> <init>
-    1:4:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):546:546 -> a
-    5:5:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):749:749 -> a
+    1:1:void <clinit>():205:205 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):215:215 -> <init>
+    2:1533:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):208:1739 -> <init>
+    1534:1537:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):217:220 -> <init>
+    1:4:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):550:550 -> a
+    5:5:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):753:753 -> a
     6:6:com.android.tools.r8.shaking.ProguardCheckDiscardRule$Builder com.android.tools.r8.shaking.ProguardCheckDiscardRule.builder():74:74 -> a
-    6:6:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):749 -> a
-    7:7:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):749:749 -> a
+    6:6:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):753 -> a
+    7:7:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):753:753 -> a
     8:8:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> a
-    8:8:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):750 -> a
+    8:8:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):754 -> a
     9:9:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:58 -> a
-    9:9:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):751 -> a
-    10:12:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):752:754 -> a
+    9:9:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):755 -> a
+    10:12:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):756:758 -> a
     13:13:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> a
-    13:13:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):755 -> a
-    14:14:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):756:756 -> a
-    15:15:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):762:762 -> a
+    13:13:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):759 -> a
+    14:14:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):760:760 -> a
+    15:15:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):766:766 -> a
     16:16:com.android.tools.r8.shaking.ClassInlineRule$Builder com.android.tools.r8.shaking.ClassInlineRule.builder():91:91 -> a
-    16:16:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):762 -> a
-    17:17:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):762:762 -> a
+    16:16:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):766 -> a
+    17:17:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):766:766 -> a
     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 -> a
-    18:18:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):762 -> a
+    18:18:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):766 -> a
     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 -> a
-    19:19:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):762 -> a
+    19:19:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):766 -> a
     20:20: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
-    20:20:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):762 -> a
-    21:23:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):763:765 -> a
+    20:20:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):766 -> a
+    21:23:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):767:769 -> a
     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 -> a
-    24:24:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):766 -> a
+    24:24:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):770 -> a
     25:35:com.android.tools.r8.shaking.ClassInlineRule com.android.tools.r8.shaking.ClassInlineRule$Builder.build():38:48 -> a
-    25:35:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):767 -> a
-    36:36:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):817:817 -> a
+    25:35:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):771 -> a
+    36:36:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):832:832 -> a
     37:37:com.android.tools.r8.shaking.InlineRule$Builder com.android.tools.r8.shaking.InlineRule.builder():100:100 -> a
-    37:37:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):817 -> a
-    38:38:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):817:817 -> a
+    37:37:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):832 -> a
+    38:38:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):832:832 -> a
     39:39:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> a
-    39:39:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):818 -> a
+    39:39:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):833 -> a
     40:40:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:58 -> a
-    40:40:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):819 -> a
+    40:40:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):834 -> a
     41:41:com.android.tools.r8.shaking.InlineRule$Builder com.android.tools.r8.shaking.InlineRule$Builder.setType(com.android.tools.r8.shaking.InlineRule$Type) -> a
-    41:41:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):820 -> a
-    42:44:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):821:823 -> a
+    41:41:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):835 -> a
+    42:44:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):836:838 -> a
     45:45:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> a
-    45:45:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):824 -> a
+    45:45:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):839 -> a
     46:56:com.android.tools.r8.shaking.InlineRule com.android.tools.r8.shaking.InlineRule$Builder.build():47:57 -> a
-    46:56:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):825 -> a
-    57:57:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):891:891 -> a
+    46:56:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):840 -> a
+    57:57:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):906:906 -> a
     58:58:com.android.tools.r8.shaking.ReprocessClassInitializerRule$Builder com.android.tools.r8.shaking.ReprocessClassInitializerRule.builder():92:92 -> a
-    58:58:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):891 -> a
-    59:59:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):891:891 -> a
+    58:58:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):906 -> a
+    59:59:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):906:906 -> a
     60:60:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> a
-    60:60:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):891 -> a
+    60:60:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):906 -> a
     61:61:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:58 -> a
-    61:61:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):891 -> a
-    62:65:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):891:894 -> a
+    61:61:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):906 -> a
+    62:65:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):906:909 -> a
     66:66:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> a
-    66:66:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):895 -> a
-    67:67:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):896:896 -> a
-    68:68:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):902:902 -> a
+    66:66:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):910 -> a
+    67:67:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):911:911 -> a
+    68:68:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):917:917 -> a
     69:69:com.android.tools.r8.shaking.ReprocessMethodRule$Builder com.android.tools.r8.shaking.ReprocessMethodRule.builder():92:92 -> a
-    69:69:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):902 -> a
-    70:70:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):902:902 -> a
+    69:69:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):917 -> a
+    70:70:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):917:917 -> a
     71:71:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> a
-    71:71:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):902 -> a
+    71:71:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):917 -> a
     72:72:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:58 -> a
-    72:72:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):902 -> a
-    73:76:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):902:905 -> a
+    72:72:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):917 -> a
+    73:76:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):917:920 -> a
     77:77:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> a
-    77:77:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):906 -> a
-    78:78:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):907:907 -> a
-    79:83:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1058:1062 -> a
-    79:83:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):950 -> a
-    84:85:boolean parseNegation():1049:1050 -> a
-    84:85:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1064 -> a
-    84:85:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):950 -> a
+    77:77:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):921 -> a
+    78:78:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):922:922 -> a
+    79:83:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1073:1077 -> a
+    79:83:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):965 -> a
+    84:85:boolean parseNegation():1064:1065 -> a
+    84:85:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1079 -> a
+    84:85:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):965 -> a
     86:86:com.android.tools.r8.shaking.ProguardAccessFlags com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getNegatedClassAccessFlags():160:160 -> a
-    86:86:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1065 -> a
-    86:86:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):950 -> a
+    86:86:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1080 -> a
+    86:86:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):965 -> a
     87:87:com.android.tools.r8.shaking.ProguardAccessFlags com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getClassAccessFlags():151:151 -> a
-    87:87:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1066 -> a
-    87:87:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):950 -> a
-    88:97:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1067:1076 -> a
-    88:97:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):950 -> a
-    98:100:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1089:1091 -> a
-    98:100:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):951 -> a
+    87:87:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1081 -> a
+    87:87:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):965 -> a
+    88:97:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1082:1091 -> a
+    88:97:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):965 -> a
+    98:100:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1104:1106 -> a
+    98:100:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):966 -> a
     101:102:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassTypeNegated(boolean):146:147 -> a
-    101:102:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1092 -> a
-    101:102:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):951 -> a
-    103:106:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1094:1097 -> a
-    103:106:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):951 -> a
+    101:102:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1107 -> a
+    101:102:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):966 -> a
+    103:106:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1109:1112 -> a
+    103:106:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):966 -> a
     107:108:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):137:138 -> a
-    107:108:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1097 -> a
-    107:108:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):951 -> a
-    109:109:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1099:1099 -> a
-    109:109:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):951 -> a
-    110:111:com.android.tools.r8.utils.StringDiagnostic parseClassTypeUnexpected(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.TextPosition):1084:1085 -> a
-    110:111:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1099 -> a
-    110:111:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):951 -> a
-    112:115:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1099:1102 -> a
-    112:115:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):951 -> a
+    107:108:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1112 -> a
+    107:108:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):966 -> a
+    109:109:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1114:1114 -> a
+    109:109:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):966 -> a
+    110:111:com.android.tools.r8.utils.StringDiagnostic parseClassTypeUnexpected(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.TextPosition):1099:1100 -> a
+    110:111:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1114 -> a
+    110:111:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):966 -> a
+    112:115:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1114:1117 -> a
+    112:115:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):966 -> a
     116:117:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):137:138 -> a
-    116:117:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1102 -> a
-    116:117:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):951 -> a
-    118:119:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1103:1104 -> a
-    118:119:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):951 -> a
+    116:117:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1117 -> a
+    116:117:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):966 -> a
+    118:119:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1118:1119 -> a
+    118:119:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):966 -> a
     120:121:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):137:138 -> a
-    120:121:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1104 -> a
-    120:121:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):951 -> a
-    122:123:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1105:1106 -> a
-    122:123:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):951 -> a
+    120:121:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1119 -> a
+    120:121:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):966 -> a
+    122:123:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1120:1121 -> a
+    122:123:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):966 -> a
     124:125:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):137:138 -> a
-    124:125:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1106 -> a
-    124:125:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):951 -> a
-    126:126:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952:952 -> a
-    127:128:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1115:1116 -> a
-    127:128:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):953 -> a
+    124:125:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1121 -> a
+    124:125:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):966 -> a
+    126:126:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):967:967 -> a
+    127:128:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1130:1131 -> a
+    127:128:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):968 -> a
     129:130:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setInheritanceIsExtends(boolean):96:97 -> a
-    129:130:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1117 -> a
-    129:130:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):953 -> a
-    131:131:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1118:1118 -> a
-    131:131:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):953 -> a
+    129:130:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1132 -> a
+    129:130:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):968 -> a
+    131:131:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1133:1133 -> a
+    131:131:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):968 -> a
     132:133:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setInheritanceIsExtends(boolean):96:97 -> a
-    132:133:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1119 -> a
-    132:133:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):953 -> a
-    134:136:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1123:1125 -> a
-    134:136:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):953 -> a
-    137:137:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1124:1124 -> a
-    137:137:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):953 -> a
+    132:133:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1134 -> a
+    132:133:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):968 -> a
+    134:136:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1138:1140 -> a
+    134:136:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):968 -> a
+    137:137:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1139:1139 -> a
+    137:137:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):968 -> a
     138:139:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setInheritanceClassName(com.android.tools.r8.shaking.ProguardTypeMatcher):109:110 -> a
-    138:139:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1124 -> a
-    138:139:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):953 -> a
-    140:141:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1134:1135 -> a
-    140:141:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
-    142:143:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1147:1148 -> a
-    142:143:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
-    142:143:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
-    144:144:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1156:1156 -> a
-    144:144:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1149 -> a
-    144:144:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
-    144:144:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
-    145:146:boolean parseNegation():1049:1050 -> a
-    145:146:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1158 -> a
-    145:146:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1149 -> a
-    145:146:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
-    145:146:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
-    147:192:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1160:1205 -> a
-    147:192:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1149 -> a
-    147:192:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
-    147:192:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
-    193:210:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1193:1210 -> a
-    193:210:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1149 -> a
-    193:210:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
-    193:210:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
-    211:216:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1184:1189 -> a
-    211:216:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1149 -> a
-    211:216:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
-    211:216:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
-    217:218:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1179:1180 -> a
-    217:218:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1149 -> a
-    217:218:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
-    217:218:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
-    219:220:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1174:1175 -> a
-    219:220:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1149 -> a
-    219:220:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
-    219:220:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
-    221:222:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1169:1170 -> a
-    221:222:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1149 -> a
-    221:222:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
-    221:222:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
-    223:279:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1164:1220 -> a
-    223:279:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1149 -> a
-    223:279:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
-    223:279:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
-    280:317:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1228:1265 -> a
-    280:317:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1150 -> a
-    280:317:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
-    280:317:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
+    138:139:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1139 -> a
+    138:139:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):968 -> a
+    140:141:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1149:1150 -> a
+    140:141:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):969 -> a
+    142:143:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1162:1163 -> a
+    142:143:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1152 -> a
+    142:143:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):969 -> a
+    144:144:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1171:1171 -> a
+    144:144:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1164 -> a
+    144:144:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1152 -> a
+    144:144:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):969 -> a
+    145:146:boolean parseNegation():1064:1065 -> a
+    145:146:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1173 -> a
+    145:146:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1164 -> a
+    145:146:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1152 -> a
+    145:146:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):969 -> a
+    147:192:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1175:1220 -> a
+    147:192:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1164 -> a
+    147:192:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1152 -> a
+    147:192:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):969 -> a
+    193:210:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1208:1225 -> a
+    193:210:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1164 -> a
+    193:210:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1152 -> a
+    193:210:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):969 -> a
+    211:216:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1199:1204 -> a
+    211:216:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1164 -> a
+    211:216:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1152 -> a
+    211:216:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):969 -> a
+    217:218:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1194:1195 -> a
+    217:218:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1164 -> a
+    217:218:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1152 -> a
+    217:218:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):969 -> a
+    219:220:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1189:1190 -> a
+    219:220:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1164 -> a
+    219:220:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1152 -> a
+    219:220:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):969 -> a
+    221:222:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1184:1185 -> a
+    221:222:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1164 -> a
+    221:222:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1152 -> a
+    221:222:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):969 -> a
+    223:279:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1179:1235 -> a
+    223:279:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1164 -> a
+    223:279:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1152 -> a
+    223:279:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):969 -> a
+    280:317:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1243:1280 -> a
+    280:317:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1165 -> a
+    280:317:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1152 -> a
+    280:317:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):969 -> a
     318:318:boolean com.android.tools.r8.shaking.ProguardTypeMatcher.matchesSpecificType():147:147 -> a
-    318:318:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1266 -> a
-    318:318:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1150 -> a
-    318:318:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
-    318:318:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
-    319:325:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1267:1273 -> a
-    319:325:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1150 -> a
-    319:325:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
-    319:325:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
-    326:334:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1268:1276 -> a
-    326:334:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1150 -> a
-    326:334:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
-    326:334:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
+    318:318:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1281 -> a
+    318:318:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1165 -> a
+    318:318:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1152 -> a
+    318:318:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):969 -> a
+    319:325:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1282:1288 -> a
+    319:325:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1165 -> a
+    319:325:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1152 -> a
+    319:325:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):969 -> a
+    326:334:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1283:1291 -> a
+    326:334:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1165 -> a
+    326:334:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1152 -> a
+    326:334:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):969 -> a
     335:335:boolean com.android.tools.r8.shaking.ProguardTypeMatcher.matchesSpecificType():147:147 -> a
-    335:335:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1277 -> a
-    335:335:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1150 -> a
-    335:335:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
-    335:335:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
-    336:342:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1278:1284 -> a
-    336:342:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1150 -> a
-    336:342:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
-    336:342:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
-    343:365:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1279:1301 -> a
-    343:365:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1150 -> a
-    343:365:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
-    343:365:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
-    366:380:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1300:1314 -> a
-    366:380:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1150 -> a
-    366:380:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
-    366:380:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
-    381:395:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1313:1327 -> a
-    381:395:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1150 -> a
-    381:395:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
-    381:395:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
-    396:401:java.lang.String acceptFieldNameOrIntegerForReturn():1864:1869 -> a
-    396:401:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1328 -> a
-    396:401:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1150 -> a
-    396:401:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
-    396:401:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
-    402:402:char peekCharAt(int):1662:1662 -> a
-    402:402:java.lang.String acceptFieldNameOrIntegerForReturn():1869 -> a
-    402:402:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1328 -> a
-    402:402:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1150 -> a
-    402:402:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
-    402:402:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
-    403:403:boolean eof(int):1611:1611 -> a
-    403:403:char peekCharAt(int):1662 -> a
-    403:403:java.lang.String acceptFieldNameOrIntegerForReturn():1869 -> a
-    403:403:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1328 -> a
-    403:403:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1150 -> a
-    403:403:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
-    403:403:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
-    404:405:char peekCharAt(int):1662:1663 -> a
-    404:405:java.lang.String acceptFieldNameOrIntegerForReturn():1869 -> a
-    404:405:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1328 -> a
-    404:405:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1150 -> a
-    404:405:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
-    404:405:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
-    406:418:java.lang.String acceptFieldNameOrIntegerForReturn():1873:1885 -> a
-    406:418:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1328 -> a
-    406:418:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1150 -> a
-    406:418:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
-    406:418:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
-    419:420:boolean isInteger(java.lang.String):1598:1599 -> a
-    419:420:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1330 -> a
-    419:420:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1150 -> a
-    419:420:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
-    419:420:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
-    421:435:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1331:1345 -> a
-    421:435:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1150 -> a
-    421:435:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
-    421:435:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
-    436:436:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1344:1344 -> a
-    436:436:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1150 -> a
-    436:436:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
-    436:436:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
-    437:449:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1342:1354 -> a
-    437:449:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1150 -> a
-    437:449:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
-    437:449:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
-    450:450:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1353:1353 -> a
-    450:450:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1150 -> a
-    450:450:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
-    450:450:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
-    451:456:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1352:1357 -> a
-    451:456:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1150 -> a
-    451:456:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
-    451:456:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
-    457:480:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1356:1379 -> a
-    457:480:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1150 -> a
-    457:480:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
-    457:480:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
-    481:481:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1151:1151 -> a
-    481:481:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
-    481:481:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
+    335:335:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1292 -> a
+    335:335:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1165 -> a
+    335:335:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1152 -> a
+    335:335:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):969 -> a
+    336:342:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1293:1299 -> a
+    336:342:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1165 -> a
+    336:342:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1152 -> a
+    336:342:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):969 -> a
+    343:365:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1294:1316 -> a
+    343:365:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1165 -> a
+    343:365:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1152 -> a
+    343:365:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):969 -> a
+    366:380:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1315:1329 -> a
+    366:380:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1165 -> a
+    366:380:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1152 -> a
+    366:380:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):969 -> a
+    381:395:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1328:1342 -> a
+    381:395:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1165 -> a
+    381:395:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1152 -> a
+    381:395:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):969 -> a
+    396:401:java.lang.String acceptFieldNameOrIntegerForReturn():1879:1884 -> a
+    396:401:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1343 -> a
+    396:401:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1165 -> a
+    396:401:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1152 -> a
+    396:401:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):969 -> a
+    402:402:char peekCharAt(int):1677:1677 -> a
+    402:402:java.lang.String acceptFieldNameOrIntegerForReturn():1884 -> a
+    402:402:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1343 -> a
+    402:402:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1165 -> a
+    402:402:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1152 -> a
+    402:402:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):969 -> a
+    403:403:boolean eof(int):1626:1626 -> a
+    403:403:char peekCharAt(int):1677 -> a
+    403:403:java.lang.String acceptFieldNameOrIntegerForReturn():1884 -> a
+    403:403:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1343 -> a
+    403:403:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1165 -> a
+    403:403:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1152 -> a
+    403:403:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):969 -> a
+    404:405:char peekCharAt(int):1677:1678 -> a
+    404:405:java.lang.String acceptFieldNameOrIntegerForReturn():1884 -> a
+    404:405:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1343 -> a
+    404:405:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1165 -> a
+    404:405:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1152 -> a
+    404:405:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):969 -> a
+    406:418:java.lang.String acceptFieldNameOrIntegerForReturn():1888:1900 -> a
+    406:418:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1343 -> a
+    406:418:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1165 -> a
+    406:418:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1152 -> a
+    406:418:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):969 -> a
+    419:420:boolean isInteger(java.lang.String):1613:1614 -> a
+    419:420:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1345 -> a
+    419:420:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1165 -> a
+    419:420:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1152 -> a
+    419:420:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):969 -> a
+    421:435:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1346:1360 -> a
+    421:435:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1165 -> a
+    421:435:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1152 -> a
+    421:435:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):969 -> a
+    436:436:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1359:1359 -> a
+    436:436:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1165 -> a
+    436:436:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1152 -> a
+    436:436:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):969 -> a
+    437:449:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1357:1369 -> a
+    437:449:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1165 -> a
+    437:449:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1152 -> a
+    437:449:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):969 -> a
+    450:450:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1368:1368 -> a
+    450:450:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1165 -> a
+    450:450:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1152 -> a
+    450:450:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):969 -> a
+    451:456:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1367:1372 -> a
+    451:456:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1165 -> a
+    451:456:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1152 -> a
+    451:456:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):969 -> a
+    457:480:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1371:1394 -> a
+    457:480:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1165 -> a
+    457:480:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1152 -> a
+    457:480:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):969 -> a
+    481:481:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1166:1166 -> a
+    481:481:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1152 -> a
+    481:481:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):969 -> a
     482:482:java.util.List com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getMemberRules():83:83 -> a
-    482:482:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1138 -> a
-    482:482:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
-    483:486:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1138:1141 -> a
-    483:486:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
-    487:487:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1108:1108 -> a
-    487:487:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):951 -> a
-    488:489:com.android.tools.r8.utils.StringDiagnostic parseClassTypeUnexpected(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.TextPosition):1084:1085 -> a
-    488:489:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1108 -> a
-    488:489:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):951 -> a
-    490:490:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1108:1108 -> a
-    490:490:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):951 -> a
-    491:500:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1386:1395 -> a
-    501:501:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1392:1392 -> a
-    502:523:java.nio.file.Path parseFileName(boolean):1463:1484 -> a
-    524:524:java.nio.file.Path parseFileName(boolean):1482:1482 -> a
-    525:545:java.lang.String replaceSystemPropertyReferences(java.lang.String):1429:1449 -> a
-    525:545:java.nio.file.Path parseFileName(boolean):1487 -> a
-    546:558:java.lang.String replaceSystemPropertyReferences(java.lang.String):1447:1459 -> a
-    546:558:java.nio.file.Path parseFileName(boolean):1487 -> a
-    559:559:java.nio.file.Path parseFileName(boolean):1489:1489 -> a
-    560:560:java.nio.file.Path parseFileName(boolean):1478:1478 -> a
-    561:561:java.nio.file.Path parseFileName(boolean):1467:1467 -> a
-    562:564:boolean lambda$parseFileName$1(boolean,char,boolean,int):1473:1475 -> a
-    565:565:boolean eof(int):1611:1611 -> a
-    566:567:boolean acceptChar(char):1633:1634 -> a
-    568:568:int remainingChars():1671:1671 -> a
-    568:568:boolean acceptString(java.lang.String):1681 -> a
-    569:577:boolean acceptString(java.lang.String):1681:1689 -> a
-    578:578:boolean lambda$acceptQuotedOrUnquotedString$4(char,int):1699:1699 -> a
-    579:579:java.lang.String acceptClassName():1732:1732 -> 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:681:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1787:1829 -> a
-    682:682:boolean isPackageName(int):1725:1725 -> a
-    682:682:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1830 -> a
-    683:683:boolean isClassName(int):1715:1715 -> a
-    683:683:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1831 -> a
-    684:692:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1834:1842 -> a
-    693:693:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1838:1838 -> a
-    694:694:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1832:1832 -> a
-    695:722:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1827:1854 -> a
-    723:730:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1853:1860 -> a
-    731:745:java.lang.String acceptString(java.util.function.IntPredicate):1931:1945 -> a
-    746:748:void parseClassFilter(java.util.function.Consumer):1977:1979 -> a
-    749:749:com.android.tools.r8.shaking.ProguardTypeMatcher com.android.tools.r8.shaking.ProguardTypeMatcher.defaultAllMatcher():129:129 -> a
-    749:749:void parseClassFilter(java.util.function.Consumer):1982 -> a
-    750:750:void parseClassFilter(java.util.function.Consumer):1982:1982 -> a
-    751:751:void parseClassFilter(java.util.function.Consumer):1981:1981 -> a
-    752:752:boolean pathFilterMatcher(java.lang.Integer):2025:2025 -> a
-    753:755:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2109:2109 -> a
-    756:758:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2119:2119 -> a
-    759:765:void warnUnusualCharacters(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2125:2125 -> a
-    766:769:com.android.tools.r8.position.Position getPosition(com.android.tools.r8.position.TextPosition):2139:2142 -> a
-    770:771:java.lang.String getSourceSnippet(java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.position.Position):2155:2156 -> a
-    772:772: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):46:46 -> a
-    772:772:java.lang.String getSourceSnippet(java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.position.Position):2156 -> a
-    773:779: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):2162:2168 -> a
-    773:779: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):46 -> a
-    773:779: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):583:585 -> b
-    4:7:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):584:587 -> b
-    8:16:boolean parseOptimizationOption(com.android.tools.r8.position.TextPosition):678:686 -> b
-    8:16:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):588 -> b
-    17:17:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):714:714 -> b
+    482:482:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1153 -> a
+    482:482:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):969 -> a
+    483:486:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1153:1156 -> a
+    483:486:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):969 -> a
+    487:487:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1123:1123 -> a
+    487:487:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):966 -> a
+    488:489:com.android.tools.r8.utils.StringDiagnostic parseClassTypeUnexpected(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.TextPosition):1099:1100 -> a
+    488:489:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1123 -> a
+    488:489:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):966 -> a
+    490:490:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1123:1123 -> a
+    490:490:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):966 -> a
+    491:500:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1401:1410 -> a
+    501:501:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1407:1407 -> a
+    502:523:java.nio.file.Path parseFileName(boolean):1478:1499 -> a
+    524:524:java.nio.file.Path parseFileName(boolean):1497:1497 -> a
+    525:545:java.lang.String replaceSystemPropertyReferences(java.lang.String):1444:1464 -> a
+    525:545:java.nio.file.Path parseFileName(boolean):1502 -> a
+    546:558:java.lang.String replaceSystemPropertyReferences(java.lang.String):1462:1474 -> a
+    546:558:java.nio.file.Path parseFileName(boolean):1502 -> a
+    559:559:java.nio.file.Path parseFileName(boolean):1504:1504 -> a
+    560:560:java.nio.file.Path parseFileName(boolean):1493:1493 -> a
+    561:561:java.nio.file.Path parseFileName(boolean):1482:1482 -> a
+    562:565:boolean lambda$parseFileName$1(boolean,char,boolean,java.lang.Integer):1488:1491 -> a
+    566:566:boolean eof(int):1626:1626 -> a
+    567:568:boolean acceptChar(char):1648:1649 -> a
+    569:569:int remainingChars():1686:1686 -> a
+    569:569:boolean acceptString(java.lang.String):1696 -> a
+    570:578:boolean acceptString(java.lang.String):1696:1704 -> a
+    579:579:boolean lambda$acceptQuotedOrUnquotedString$4(char,java.lang.Integer):1714:1714 -> a
+    580:584:java.lang.Integer acceptInteger():1722:1726 -> a
+    585:590:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType):1752:1757 -> a
+    591:617:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1762:1788 -> a
+    618:620:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1783:1783 -> a
+    628:631:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1791:1791 -> a
+    637:643:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1797:1803 -> a
+    644:699:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1802:1857 -> a
+    700:700:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1853:1853 -> a
+    701:701:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1847:1847 -> a
+    702:729:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1842:1869 -> a
+    730:737:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1868:1875 -> a
+    738:741:boolean lambda$acceptPattern$7(java.lang.Integer):1939:1942 -> a
+    742:756:java.lang.String acceptString(java.util.function.Predicate):1946:1960 -> a
+    757:759:void parseClassFilter(java.util.function.Consumer):1992:1994 -> a
+    760:760:com.android.tools.r8.shaking.ProguardTypeMatcher com.android.tools.r8.shaking.ProguardTypeMatcher.defaultAllMatcher():129:129 -> a
+    760:760:void parseClassFilter(java.util.function.Consumer):1997 -> a
+    761:761:void parseClassFilter(java.util.function.Consumer):1997:1997 -> a
+    762:762:void parseClassFilter(java.util.function.Consumer):1996:1996 -> a
+    763:765:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2124:2124 -> a
+    766:768:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2134:2134 -> a
+    769:775:void warnUnusualCharacters(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2140:2140 -> a
+    776:779:com.android.tools.r8.position.Position getPosition(com.android.tools.r8.position.TextPosition):2154:2157 -> a
+    780:781:java.lang.String getSourceSnippet(java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.position.Position):2170:2171 -> a
+    782:782: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:45 -> a
+    782:782:java.lang.String getSourceSnippet(java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.position.Position):2171 -> a
+    783:789: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):2177:2183 -> a
+    783:789: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
+    783:789:java.lang.String getSourceSnippet(java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.position.Position):2171 -> a
+    1:3:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):587:589 -> b
+    4:7:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):588:591 -> b
+    8:16:boolean parseOptimizationOption(com.android.tools.r8.position.TextPosition):682:690 -> b
+    8:16:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):592 -> b
+    17:17:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):718:718 -> 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):715 -> b
+    18:18:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):719 -> 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):716 -> 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):717 -> b
+    19:19:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):720 -> b
+    20:21:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):973:974 -> b
+    20:21:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):721 -> 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):960 -> b
-    22:22:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):717 -> 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):717 -> b
+    22:22:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):975 -> b
+    22:22:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):721 -> b
+    23:30:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):975:982 -> b
+    23:30:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):721 -> 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):968 -> b
-    31:31:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):717 -> 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):717 -> b
+    31:31:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):983 -> b
+    31:31:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):721 -> b
+    32:34:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):983:985 -> b
+    32:34:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):721 -> 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):971 -> b
-    35:35:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):717 -> 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):717 -> b
-    43:43:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):541:541 -> 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):717 -> 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):717 -> b
-    52:52:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):541:541 -> 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):717 -> 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):717 -> b
+    35:35:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):986 -> b
+    35:35:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):721 -> b
+    36:42:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):986:992 -> b
+    36:42:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):721 -> b
+    43:43:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):545:545 -> b
+    43:43:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):993 -> b
+    43:43:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):721 -> b
+    44:51:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):996:1003 -> b
+    44:51:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):721 -> b
+    52:52:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):545:545 -> b
+    52:52:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1004 -> b
+    52:52:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):721 -> b
+    53:58:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1010:1015 -> b
+    53:58:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1006 -> b
+    53:58:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):721 -> 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):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):717 -> 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):717 -> b
+    59:59:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1016 -> b
+    59:59:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1006 -> b
+    59:59:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):721 -> b
+    60:61:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1016:1017 -> b
+    60:61:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1006 -> b
+    60:61:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):721 -> 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):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):717 -> 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):717 -> b
+    62:62:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1018 -> b
+    62:62:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1006 -> b
+    62:62:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):721 -> b
+    63:64:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1018:1019 -> b
+    63:64:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1006 -> b
+    63:64:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):721 -> 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):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):717 -> 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):717 -> b
+    65:65:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1020 -> b
+    65:65:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1006 -> b
+    65:65:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):721 -> b
+    66:67:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1020:1021 -> b
+    66:67:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1006 -> b
+    66:67:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):721 -> 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):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):717 -> 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):717 -> b
+    68:68:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1022 -> b
+    68:68:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1006 -> b
+    68:68:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):721 -> b
+    69:71:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1022:1024 -> b
+    69:71:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1006 -> b
+    69:71:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):721 -> 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):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):717 -> 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):717 -> 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):717 -> 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):717 -> b
-    79:79:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):718:718 -> b
+    72:72:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1025 -> b
+    72:72:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1006 -> b
+    72:72:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):721 -> b
+    73:74:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1025:1026 -> b
+    73:74:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1006 -> b
+    73:74:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):721 -> b
+    75:77:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):2149:2149 -> b
+    75:77:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1027 -> b
+    75:77:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1006 -> b
+    75:77:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):721 -> b
+    78:78:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1029:1029 -> b
+    78:78:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1006 -> b
+    78:78:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):721 -> b
+    79:79:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):722:722 -> 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):719 -> b
-    81:86:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):719:724 -> b
-    87:90:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):723:726 -> b
+    80:80:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):723 -> b
+    81:86:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):723:728 -> b
+    87:90:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):727:730 -> 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):727 -> b
-    92:95:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):727:730 -> b
+    91:91:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):731 -> b
+    92:95:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):731:734 -> 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):731 -> b
-    97:97:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):732:732 -> b
-    98:99:void expectChar(char):1675:1676 -> b
-    100:104:java.lang.Integer acceptInteger():1707:1711 -> b
-    105:105:boolean isClassName(int):1715:1715 -> b
-    106:110:void parsePathFilter(java.util.function.Consumer):2030:2034 -> b
-    111:111:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):2089:2089 -> b
-    112:121:java.lang.String snippetForPosition():2065:2074 -> b
-    112:121:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):2089 -> b
-    122:128:java.lang.String snippetForPosition():2070:2076 -> b
-    122:128:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):2089 -> b
-    129:129:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):2089:2089 -> b
-    130:131: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):563:570 -> c
-    9:9:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):569:569 -> 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):577 -> c
-    13:15:boolean skipFlag(java.lang.String):626:628 -> c
-    16:20:void expectClosingQuote(char):1646:1650 -> c
-    21:21:void expectClosingQuote(char):1648:1648 -> c
-    22:22:java.lang.String acceptPattern():1922:1922 -> c
-    23:23:boolean lambda$acceptPattern$5(int):1924:1924 -> c
-    1:4:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):552:555 -> d
-    5:5:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):554:554 -> d
-    6:15:boolean skipOptionWithClassSpec(java.lang.String):661:670 -> d
-    16:19:boolean hasNextChar(char):1615:1618 -> d
-    20:20:char acceptQuoteIfPresent():1642:1642 -> d
-    21:24:boolean hasNextChar(java.util.function.Predicate):1622:1625 -> d
-    21:24:char acceptQuoteIfPresent():1642 -> d
-    25:25:char readChar():1667:1667 -> d
-    25:25:char acceptQuoteIfPresent():1642 -> d
-    26:26:boolean lambda$acceptString$3(int):1694:1694 -> d
+    96:96:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):735 -> b
+    97:97:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):736:736 -> b
+    98:99:void expectChar(char):1690:1691 -> b
+    100:100:boolean lambda$acceptString$3(java.lang.Integer):1709:1709 -> b
+    101:101:java.lang.String acceptPattern():1937:1937 -> b
+    102:106:void parsePathFilter(java.util.function.Consumer):2045:2049 -> b
+    107:107:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):2104:2104 -> b
+    108:117:java.lang.String snippetForPosition():2080:2089 -> b
+    108:117:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):2104 -> b
+    118:124:java.lang.String snippetForPosition():2085:2091 -> b
+    118:124:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):2104 -> b
+    125:125:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):2104:2104 -> b
+    126:127:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition):2119:2120 -> b
+    1:8:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):567:574 -> c
+    9:9:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):573:573 -> c
+    10:12:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2129:2129 -> c
+    10:12:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):581 -> c
+    13:15:boolean skipFlag(java.lang.String):630:632 -> c
+    16:16:char acceptQuoteIfPresent():1657:1657 -> c
+    17:20:boolean hasNextChar(java.util.function.Predicate):1637:1640 -> c
+    17:20:char acceptQuoteIfPresent():1657 -> c
+    21:21:char readChar():1682:1682 -> c
+    21:21:char acceptQuoteIfPresent():1657 -> c
+    22:26:void expectClosingQuote(char):1661:1665 -> c
+    27:27:void expectClosingQuote(char):1663:1663 -> c
+    28:34:boolean lambda$new$5(java.lang.Integer):1731:1737 -> c
+    1:4:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):556:559 -> d
+    5:5:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):558:558 -> d
+    6:15:boolean skipOptionWithClassSpec(java.lang.String):665:674 -> d
+    16:19:boolean hasNextChar(char):1630:1633 -> d
+    20:23:java.lang.String acceptQuotedOrUnquotedString():1713:1716 -> d
+    24:27:boolean lambda$new$6(java.lang.Integer):1741:1744 -> d
     boolean isQuote(char) -> e
-    1:7:boolean skipOptionWithOptionalSingleArg(java.lang.String):647:653 -> e
-    8:8:boolean lambda$parseFileFilter$2(int):1532:1532 -> e
-    9:12:java.lang.String acceptQuotedOrUnquotedString():1698:1701 -> e
-    13:16:java.lang.String snippetForPosition(com.android.tools.r8.position.TextPosition):2081:2084 -> e
-    1:5:boolean skipOptionWithSingleArg(java.lang.String):636:640 -> f
-    6:6:boolean lambda$skipOptimizationName$0(int):698:698 -> f
-    7:7:java.lang.String acceptString():1694:1694 -> f
-    1:1:boolean eof():1607:1607 -> g
-    2:5:void unacceptString(java.lang.String):1949:1952 -> g
-    1:1:com.android.tools.r8.position.TextPosition getPosition():2147:2147 -> h
-    2:2:int getColumn():2151:2151 -> h
-    2:2:com.android.tools.r8.position.TextPosition getPosition():2147 -> h
-    3:3:com.android.tools.r8.position.TextPosition getPosition():2147:2147 -> h
-    1:1:boolean isOptionalArgumentGiven():1629:1629 -> i
-    1:6:void parse():226:231 -> j
-    7:12:void parse():230:235 -> j
-    1:13:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1031:1043 -> k
-    14:14:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1042:1042 -> k
-    1:7:java.util.List parseAnnotationList():1021:1027 -> l
-    1:12:java.util.List parseArgumentList():1401:1412 -> m
-    13:22:java.util.List parseArgumentList():1409:1418 -> m
-    23:25:java.util.List parseArgumentList():1417:1419 -> m
-    26:33:java.util.List parseArgumentList():1416:1423 -> m
-    1:2:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2016:2017 -> n
-    1:2:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2009 -> n
-    3:4:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2010:2011 -> n
-    5:5:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2019:2019 -> n
-    5:5:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2009 -> n
-    1:1:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1996:1996 -> o
-    2:3:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2016:2017 -> o
-    2:3:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1988 -> o
-    2:3:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1998 -> o
-    4:7:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1989:1989 -> o
-    4:7:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1998 -> o
-    10:10:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1992:1992 -> o
-    10:10:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1998 -> o
-    11:12:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1999:2000 -> o
-    13:13:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2019:2019 -> o
-    13:13:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1988 -> o
-    13:13:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1998 -> o
-    1:10:java.util.List parseClassPath():1493:1502 -> p
-    1:14:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1508:1521 -> q
-    15:20:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1518:1523 -> q
-    1:7:java.lang.String parseFileFilter():1528:1534 -> r
-    1:10:void parseInclude():592:601 -> s
-    11:12:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):2099:2100 -> s
-    11:12:void parseInclude():601 -> s
-    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 -> s
-    13:14:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):2100 -> s
-    13:14:void parseInclude():601 -> s
-    15:15:void parseInclude():601:601 -> s
-    16:16:void parseInclude():598:598 -> s
-    17:18:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):2099:2100 -> s
-    17:18:void parseInclude():598 -> s
-    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 -> s
-    19:20:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):2100 -> s
-    19:20:void parseInclude():598 -> s
-    21:21:void parseInclude():598:598 -> s
-    1:1:boolean parseOption():239:239 -> t
-    2:2:int remainingChars():1671:1671 -> t
-    2:2:boolean acceptArobaseInclude():607 -> t
-    2:2:boolean parseOption():242 -> t
-    3:6:boolean acceptArobaseInclude():610:613 -> t
-    3:6:boolean parseOption():242 -> t
-    7:10:boolean parseOption():245:248 -> t
-    11:12:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):443:444 -> t
-    11:12:boolean parseOption():249 -> t
-    13:13:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1554:1554 -> t
-    13:13:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):446 -> t
-    13:13:boolean parseOption():249 -> t
-    14:14:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule.builder():75:75 -> t
-    14:14:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1554 -> t
-    14:14:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):446 -> t
-    14:14:boolean parseOption():249 -> t
-    15:15:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1554:1554 -> t
-    15:15:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):446 -> t
-    15:15:boolean parseOption():249 -> t
-    16:17:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> t
-    16:17:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1554 -> t
-    16:17:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):446 -> t
-    16:17:boolean parseOption():249 -> t
-    18:18:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1554:1554 -> t
-    18:18:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):446 -> t
-    18:18:boolean parseOption():249 -> t
-    19:20:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> t
-    19:20:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1554 -> t
-    19:20:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):446 -> t
-    19:20:boolean parseOption():249 -> t
-    21:24:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1554:1557 -> t
-    21:24:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):446 -> t
-    21:24:boolean parseOption():249 -> t
-    25:25:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> t
-    25:25:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1558 -> t
-    25:25:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):446 -> t
-    25:25:boolean parseOption():249 -> t
-    26:36:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder.build() -> t
-    26:36:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1559 -> t
-    26:36:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):446 -> t
-    26:36:boolean parseOption():249 -> t
-    37:48:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):447:458 -> t
-    37:48:boolean parseOption():249 -> t
-    49:49:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):868:868 -> t
-    49:49:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):459 -> t
-    49:49:boolean parseOption():249 -> t
-    50:50:com.android.tools.r8.shaking.ConstantArgumentRule$Builder com.android.tools.r8.shaking.ConstantArgumentRule.builder():74:74 -> t
-    50:50:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):868 -> t
-    50:50:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):459 -> t
-    50:50:boolean parseOption():249 -> t
-    51:51:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):868:868 -> t
-    51:51:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):459 -> t
-    51:51:boolean parseOption():249 -> t
-    52:53:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> t
-    52:53:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):868 -> t
-    52:53:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):459 -> t
-    52:53:boolean parseOption():249 -> t
-    54:54:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):868:868 -> t
-    54:54:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):459 -> t
-    54:54:boolean parseOption():249 -> t
-    55:56:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> t
-    55:56:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):868 -> t
-    55:56:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):459 -> t
-    55:56:boolean parseOption():249 -> t
-    57:60:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):868:871 -> t
-    57:60:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):459 -> t
-    57:60:boolean parseOption():249 -> t
-    61:61:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> t
-    61:61:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):872 -> t
-    61:61:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):459 -> t
-    61:61:boolean parseOption():249 -> t
-    62:72:com.android.tools.r8.shaking.ConstantArgumentRule com.android.tools.r8.shaking.ConstantArgumentRule$Builder.build():26:36 -> t
-    62:72:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):873 -> t
-    62:72:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):459 -> t
-    62:72:boolean parseOption():249 -> t
-    73:76:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):460:463 -> t
-    73:76:boolean parseOption():249 -> t
-    77:77:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):879:879 -> t
-    77:77:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):464 -> t
-    77:77:boolean parseOption():249 -> t
-    78:78:com.android.tools.r8.shaking.UnusedArgumentRule$Builder com.android.tools.r8.shaking.UnusedArgumentRule.builder():74:74 -> t
-    78:78:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):879 -> t
-    78:78:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):464 -> t
-    78:78:boolean parseOption():249 -> t
-    79:79:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):879:879 -> t
-    79:79:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):464 -> t
-    79:79:boolean parseOption():249 -> t
-    80:81:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> t
-    80:81:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):879 -> t
-    80:81:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):464 -> t
-    80:81:boolean parseOption():249 -> t
-    82:82:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):879:879 -> t
-    82:82:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):464 -> t
-    82:82:boolean parseOption():249 -> t
-    83:84:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> t
-    83:84:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):879 -> t
-    83:84:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):464 -> t
-    83:84:boolean parseOption():249 -> t
-    85:88:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):879:882 -> t
-    85:88:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):464 -> t
-    85:88:boolean parseOption():249 -> t
-    89:89:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> t
-    89:89:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):883 -> t
-    89:89:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):464 -> t
-    89:89:boolean parseOption():249 -> t
-    90:100:com.android.tools.r8.shaking.UnusedArgumentRule com.android.tools.r8.shaking.UnusedArgumentRule$Builder.build():26:36 -> t
-    90:100:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):884 -> t
-    90:100:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):464 -> t
-    90:100:boolean parseOption():249 -> t
-    101:124:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):465:488 -> t
-    101:124:boolean parseOption():249 -> t
-    125:125:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):773:773 -> t
-    125:125:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):489 -> t
-    125:125:boolean parseOption():249 -> t
-    126:126:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule$Builder com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule.builder():76:76 -> t
-    126:126:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):773 -> t
-    126:126:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):489 -> t
-    126:126:boolean parseOption():249 -> t
-    127:127:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):773:773 -> t
-    127:127:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):489 -> t
-    127:127:boolean parseOption():249 -> t
-    128:129:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> t
-    128:129:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):773 -> t
-    128:129:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):489 -> t
-    128:129:boolean parseOption():249 -> t
-    130:130:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):773:773 -> t
-    130:130:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):489 -> t
-    130:130:boolean parseOption():249 -> t
-    131:132:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> t
-    131:132:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):773 -> t
-    131:132:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):489 -> t
-    131:132:boolean parseOption():249 -> t
-    133:136:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):773:776 -> t
-    133:136:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):489 -> t
-    133:136:boolean parseOption():249 -> t
-    137:137:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> t
-    137:137:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):777 -> t
-    137:137:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):489 -> t
-    137:137:boolean parseOption():249 -> t
-    138:148:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule$Builder.build():28:38 -> t
-    138:148:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):778 -> t
-    138:148:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):489 -> t
-    138:148:boolean parseOption():249 -> t
-    149:152:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):490:493 -> t
-    149:152:boolean parseOption():249 -> t
-    153:153:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):784:784 -> t
-    153:153:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):494 -> t
-    153:153:boolean parseOption():249 -> t
-    154:154:com.android.tools.r8.shaking.NoVerticalClassMergingRule$Builder com.android.tools.r8.shaking.NoVerticalClassMergingRule.builder():76:76 -> t
-    154:154:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):784 -> t
-    154:154:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):494 -> t
-    154:154:boolean parseOption():249 -> t
-    155:155:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):784:784 -> t
-    155:155:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):494 -> t
-    155:155:boolean parseOption():249 -> t
-    156:157:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> t
-    156:157:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):784 -> t
-    156:157:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):494 -> t
-    156:157:boolean parseOption():249 -> t
-    158:158:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):784:784 -> t
-    158:158:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):494 -> t
-    158:158:boolean parseOption():249 -> t
-    159:160:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> t
-    159:160:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):784 -> t
-    159:160:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):494 -> t
-    159:160:boolean parseOption():249 -> t
-    161:164:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):784:787 -> t
-    161:164:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):494 -> t
-    161:164:boolean parseOption():249 -> t
-    165:165:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> t
-    165:165:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):788 -> t
-    165:165:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):494 -> t
-    165:165:boolean parseOption():249 -> t
-    166:176:com.android.tools.r8.shaking.NoVerticalClassMergingRule com.android.tools.r8.shaking.NoVerticalClassMergingRule$Builder.build():28:38 -> t
-    166:176:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):789 -> t
-    166:176:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):494 -> t
-    166:176:boolean parseOption():249 -> t
-    177:180:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):495:498 -> t
-    177:180:boolean parseOption():249 -> t
-    181:181:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):795:795 -> t
-    181:181:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):499 -> t
-    181:181:boolean parseOption():249 -> t
-    182:182:com.android.tools.r8.shaking.NoHorizontalClassMergingRule$Builder com.android.tools.r8.shaking.NoHorizontalClassMergingRule.builder():77:77 -> t
-    182:182:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):795 -> t
-    182:182:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):499 -> t
-    182:182:boolean parseOption():249 -> t
-    183:183:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):795:795 -> t
-    183:183:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):499 -> t
-    183:183:boolean parseOption():249 -> t
-    184:185:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> t
-    184:185:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):795 -> t
-    184:185:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):499 -> t
-    184:185:boolean parseOption():249 -> t
-    186:186:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):795:795 -> t
-    186:186:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):499 -> t
-    186:186:boolean parseOption():249 -> t
-    187:188:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> t
-    187:188:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):795 -> t
-    187:188:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):499 -> t
-    187:188:boolean parseOption():249 -> t
-    189:192:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):795:798 -> t
-    189:192:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):499 -> t
-    189:192:boolean parseOption():249 -> t
-    193:193:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> t
-    193:193:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):799 -> t
-    193:193:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):499 -> t
-    193:193:boolean parseOption():249 -> t
-    194:194:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):800:800 -> t
-    194:194:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):499 -> t
-    194:194:boolean parseOption():249 -> t
-    195:199:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):500:504 -> t
-    195:199:boolean parseOption():249 -> t
-    200:200:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):807:807 -> t
-    200:200:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):505 -> t
-    200:200:boolean parseOption():249 -> t
-    201:201:com.android.tools.r8.shaking.MemberValuePropagationRule$Builder com.android.tools.r8.shaking.MemberValuePropagationRule.builder():91:91 -> t
-    201:201:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):807 -> t
-    201:201:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):505 -> t
-    201:201:boolean parseOption():249 -> t
-    202:202:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):807:807 -> t
-    202:202:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):505 -> t
-    202:202:boolean parseOption():249 -> t
-    203:204:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> t
-    203:204:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):807 -> t
-    203:204:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):505 -> t
-    203:204:boolean parseOption():249 -> t
-    205:205:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):807:807 -> t
-    205:205:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):505 -> t
-    205:205:boolean parseOption():249 -> t
-    206:207:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> t
-    206:207:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):807 -> t
-    206:207:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):505 -> t
-    206:207:boolean parseOption():249 -> t
-    208:208:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):807:807 -> t
-    208:208:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):505 -> t
-    208:208:boolean parseOption():249 -> t
-    209:209:com.android.tools.r8.shaking.MemberValuePropagationRule$Builder com.android.tools.r8.shaking.MemberValuePropagationRule$Builder.setType(com.android.tools.r8.shaking.MemberValuePropagationRule$Type):32:32 -> t
-    209:209:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):807 -> t
-    209:209:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):505 -> t
-    209:209:boolean parseOption():249 -> t
-    210:212:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):808:810 -> t
-    210:212:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):505 -> t
-    210:212:boolean parseOption():249 -> t
-    213:213:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> t
-    213:213:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):811 -> t
-    213:213:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):505 -> t
-    213:213:boolean parseOption():249 -> t
-    214:224:com.android.tools.r8.shaking.MemberValuePropagationRule com.android.tools.r8.shaking.MemberValuePropagationRule$Builder.build():38:48 -> t
-    214:224:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):812 -> t
-    214:224:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):505 -> t
-    214:224:boolean parseOption():249 -> t
-    225:230:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):506:511 -> t
-    225:230:boolean parseOption():249 -> t
-    231:238:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):510:517 -> t
-    231:238:boolean parseOption():249 -> t
-    239:245:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):516:522 -> t
-    239:245:boolean parseOption():249 -> t
-    246:253:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):521:528 -> t
-    246:253:boolean parseOption():249 -> t
-    254:258:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):527:531 -> t
-    254:258:boolean parseOption():249 -> t
-    259:259:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):913:913 -> t
-    259:259:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):532 -> t
-    259:259:boolean parseOption():249 -> t
-    260:260:com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder com.android.tools.r8.shaking.WhyAreYouNotInliningRule.builder():74:74 -> t
-    260:260:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):913 -> t
-    260:260:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):532 -> t
-    260:260:boolean parseOption():249 -> t
-    261:261:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):913:913 -> t
-    261:261:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):532 -> t
-    261:261:boolean parseOption():249 -> t
-    262:263:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> t
-    262:263:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):913 -> t
-    262:263:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):532 -> t
-    262:263:boolean parseOption():249 -> t
-    264:264:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):913:913 -> t
-    264:264:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):532 -> t
-    264:264:boolean parseOption():249 -> t
-    265:266:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> t
-    265:266:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):913 -> t
-    265:266:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):532 -> t
-    265:266:boolean parseOption():249 -> t
-    267:270:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):913:916 -> t
-    267:270:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):532 -> t
-    267:270:boolean parseOption():249 -> t
-    271:271:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> t
-    271:271:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):917 -> t
-    271:271:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):532 -> t
-    271:271:boolean parseOption():249 -> t
-    272:282:com.android.tools.r8.shaking.WhyAreYouNotInliningRule com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder.build():26:36 -> t
-    272:282:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):918 -> t
-    272:282:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):532 -> t
-    272:282:boolean parseOption():249 -> t
-    283:283:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):533:533 -> t
-    283:283:boolean parseOption():249 -> t
-    284:291:boolean parseOption():250:257 -> t
-    292:304:boolean parseOption():253:265 -> t
-    305:332:java.util.List acceptPatternList():1889:1916 -> t
-    305:332:void parseKeepAttributes():618 -> t
-    305:332:boolean parseOption():266 -> t
-    333:336:void parseKeepAttributes():619:622 -> t
-    333:336:boolean parseOption():266 -> t
-    337:337:void parseKeepAttributes():620:620 -> t
-    337:337:boolean parseOption():266 -> t
-    338:339:boolean parseOption():267:268 -> t
-    340:349:void parsePackageFilter(java.util.function.BiConsumer):1958:1967 -> t
-    340:349:boolean parseOption():268 -> t
-    350:353:void parsePackageFilter(java.util.function.BiConsumer):1966:1969 -> t
-    350:353:boolean parseOption():268 -> t
-    354:361:void parsePackageFilter(java.util.function.BiConsumer):1964:1971 -> t
-    354:361:boolean parseOption():268 -> t
-    362:376:boolean parseOption():269:283 -> t
-    377:377:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):737:737 -> t
-    377:377:boolean parseOption():284 -> t
-    378:378:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule.builder():74:74 -> t
-    378:378:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):737 -> t
-    378:378:boolean parseOption():284 -> t
-    379:379:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):737:737 -> t
-    379:379:boolean parseOption():284 -> t
-    380:381:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> t
-    380:381:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):738 -> t
-    380:381:boolean parseOption():284 -> t
-    382:382:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):738:738 -> t
-    382:382:boolean parseOption():284 -> t
-    383:384:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> t
-    383:384:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):739 -> t
-    383:384:boolean parseOption():284 -> t
-    385:388:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):739:742 -> t
-    385:388:boolean parseOption():284 -> t
-    389:389:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> t
-    389:389:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):743 -> t
-    389:389:boolean parseOption():284 -> t
-    390:400:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder.build():26:36 -> t
-    390:400:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):744 -> t
-    390:400:boolean parseOption():284 -> t
-    401:411:boolean parseOption():285:295 -> t
-    412:414:boolean parseOption():292:292 -> t
-    418:493:boolean parseOption():296:371 -> t
-    494:494:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1541:1541 -> t
-    494:494:boolean parseOption():372 -> t
-    495:495:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule.builder():77:77 -> t
-    495:495:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1541 -> t
-    495:495:boolean parseOption():372 -> t
-    496:496:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1541:1541 -> t
-    496:496:boolean parseOption():372 -> t
-    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 -> t
-    497:498:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1542 -> t
-    497:498:boolean parseOption():372 -> t
-    499:499:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1542:1542 -> t
-    499:499:boolean parseOption():372 -> t
-    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 -> t
-    500:501:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1543 -> t
-    500:501:boolean parseOption():372 -> t
-    502:505:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1543:1546 -> t
-    502:505:boolean parseOption():372 -> t
-    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 -> t
-    506:506:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1547 -> t
-    506:506:boolean parseOption():372 -> t
-    507:507:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1548:1548 -> t
-    507:507:boolean parseOption():372 -> t
-    508:509:boolean parseOption():373:374 -> t
-    510:510:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1564:1564 -> t
-    510:510:boolean parseOption():375 -> t
-    511:511:com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder com.android.tools.r8.shaking.ProguardAssumeValuesRule.builder():77:77 -> t
-    511:511:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1564 -> t
-    511:511:boolean parseOption():375 -> t
-    512:512:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1564:1564 -> t
-    512:512:boolean parseOption():375 -> t
-    513:514:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> t
-    513:514:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1565 -> t
-    513:514:boolean parseOption():375 -> t
-    515:515:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1565:1565 -> t
-    515:515:boolean parseOption():375 -> t
-    516:517:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> t
-    516:517:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1566 -> t
-    516:517:boolean parseOption():375 -> t
-    518:521:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1566:1569 -> t
-    518:521:boolean parseOption():375 -> t
-    522:522:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> t
-    522:522:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1570 -> t
-    522:522:boolean parseOption():375 -> t
-    523:533:com.android.tools.r8.shaking.ProguardAssumeValuesRule com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder.build():26:36 -> t
-    523:533:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1571 -> t
-    523:533:boolean parseOption():375 -> t
-    534:538:boolean parseOption():376:380 -> t
-    539:573:boolean parseOption():379:413 -> t
-    574:574:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):831:831 -> t
-    574:574:boolean parseOption():413 -> t
-    575:575:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder com.android.tools.r8.shaking.ProguardIdentifierNameStringRule.builder():73:73 -> t
-    575:575:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):831 -> t
-    575:575:boolean parseOption():413 -> t
-    576:576:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):831:831 -> t
-    576:576:boolean parseOption():413 -> t
-    577:578:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> t
-    577:578:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):832 -> t
-    577:578:boolean parseOption():413 -> t
-    579:579:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):832:832 -> t
-    579:579:boolean parseOption():413 -> t
-    580:581:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> t
-    580:581:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):833 -> t
-    580:581:boolean parseOption():413 -> t
-    582:585:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):833:836 -> t
-    582:585:boolean parseOption():413 -> t
-    586:586:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> t
-    586:586:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):837 -> t
-    586:586:boolean parseOption():413 -> t
-    587:597:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder.build():25:35 -> t
-    587:597:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):838 -> t
-    587:597:boolean parseOption():413 -> t
-    598:600:boolean parseOption():413:415 -> t
-    601:601:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):843:843 -> t
-    601:601:boolean parseOption():415 -> t
-    602:602:com.android.tools.r8.shaking.ProguardIfRule$Builder com.android.tools.r8.shaking.ProguardIfRule.builder():121:121 -> t
-    602:602:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):843 -> t
-    602:602:boolean parseOption():415 -> t
-    603:603:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):843:843 -> t
-    603:603:boolean parseOption():415 -> t
-    604:605:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> t
-    604:605:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):844 -> t
-    604:605:boolean parseOption():415 -> t
-    606:606:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):844:844 -> t
-    606:606:boolean parseOption():415 -> t
-    607:608:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> t
-    607:608:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):845 -> t
-    607:608:boolean parseOption():415 -> t
-    609:616:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):845:852 -> t
-    609:616:boolean parseOption():415 -> t
-    617:617:void com.android.tools.r8.shaking.ProguardIfRule$Builder.setSubsequentRule(com.android.tools.r8.shaking.ProguardKeepRule):59:59 -> t
-    617:617:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):853 -> t
-    617:617:boolean parseOption():415 -> t
-    618:619:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):854:855 -> t
-    618:619:boolean parseOption():415 -> t
-    620:620:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> t
-    620:620:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):856 -> t
-    620:620:boolean parseOption():415 -> t
-    621:632:com.android.tools.r8.shaking.ProguardIfRule com.android.tools.r8.shaking.ProguardIfRule$Builder.build():64:75 -> t
-    621:632:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):857 -> t
-    621:632:boolean parseOption():415 -> t
-    633:633:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):858:858 -> t
-    633:633:boolean parseOption():415 -> t
-    634:646:void verifyAndLinkBackReferences(java.lang.Iterable):922:934 -> t
-    634:646:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):858 -> t
-    634:646:boolean parseOption():415 -> t
-    647:651:void verifyAndLinkBackReferences(java.lang.Iterable):929:929 -> t
-    647:651:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):858 -> t
-    647:651:boolean parseOption():415 -> t
-    658:660:void verifyAndLinkBackReferences(java.lang.Iterable):936:938 -> t
-    658:660:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):858 -> t
-    658:660:boolean parseOption():415 -> t
-    661:661:boolean parseOption():415:415 -> t
-    662:664:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):861:861 -> t
-    662:664:boolean parseOption():415 -> t
-    665:685:boolean parseOption():416:436 -> t
-    1:1:java.lang.String parsePackageNameOrEmptyString():2004:2004 -> u
-    1:20:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():2039:2058 -> v
-    21:26:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():2055:2060 -> v
-    27:27:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():2045:2045 -> v
-    1:1:char peekChar():1658:1658 -> w
-    1:11:void skipOptimizationName():691:701 -> x
-    1:2:void skipSingleArgument():706:707 -> y
-    3:3:char readChar():1667:1667 -> y
-    3:3:void skipSingleArgument():708 -> y
-    1:6:void skipWhitespace():1575:1580 -> z
-    7:14:void skipComment():1586:1593 -> z
-    7:14:void skipWhitespace():1582 -> z
+    1:7:boolean skipOptionWithOptionalSingleArg(java.lang.String):651:657 -> e
+    8:9:boolean lambda$parseFileFilter$2(java.lang.Integer):1546:1547 -> e
+    10:10:java.lang.String acceptString():1709:1709 -> e
+    11:14:java.lang.String snippetForPosition(com.android.tools.r8.position.TextPosition):2096:2099 -> e
+    1:5:boolean skipOptionWithSingleArg(java.lang.String):640:644 -> f
+    6:6:boolean lambda$skipOptimizationName$0(java.lang.Integer):702:702 -> f
+    7:7:boolean eof():1622:1622 -> f
+    1:4:void unacceptString(java.lang.String):1964:1967 -> g
+    5:5:boolean pathFilterMatcher(java.lang.Integer):2040:2040 -> g
+    6:6:com.android.tools.r8.position.TextPosition getPosition():2162:2162 -> g
+    7:7:int getColumn():2166:2166 -> g
+    7:7:com.android.tools.r8.position.TextPosition getPosition():2162 -> g
+    8:8:com.android.tools.r8.position.TextPosition getPosition():2162:2162 -> g
+    1:1:boolean isOptionalArgumentGiven():1644:1644 -> h
+    1:6:void parse():225:230 -> i
+    7:12:void parse():229:234 -> i
+    1:13:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1046:1058 -> j
+    14:14:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1057:1057 -> j
+    1:7:java.util.List parseAnnotationList():1036:1042 -> k
+    1:12:java.util.List parseArgumentList():1416:1427 -> l
+    13:22:java.util.List parseArgumentList():1424:1433 -> l
+    23:25:java.util.List parseArgumentList():1432:1434 -> l
+    26:33:java.util.List parseArgumentList():1431:1438 -> l
+    1:2:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2031:2032 -> m
+    1:2:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2024 -> m
+    3:4:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2025:2026 -> m
+    5:5:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2034:2034 -> m
+    5:5:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2024 -> m
+    1:1:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2011:2011 -> n
+    2:3:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2031:2032 -> n
+    2:3:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2003 -> n
+    2:3:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2013 -> n
+    4:7:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2004:2004 -> n
+    4:7:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2013 -> n
+    10:10:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2007:2007 -> n
+    10:10:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2013 -> n
+    11:12:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2014:2015 -> n
+    13:13:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2034:2034 -> n
+    13:13:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2003 -> n
+    13:13:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2013 -> n
+    1:10:java.util.List parseClassPath():1508:1517 -> o
+    1:14:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1523:1536 -> p
+    15:20:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1533:1538 -> p
+    1:7:java.lang.String parseFileFilter():1543:1549 -> q
+    1:10:void parseInclude():596:605 -> r
+    11:12:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):2114:2115 -> r
+    11:12:void parseInclude():605 -> 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):2115 -> r
+    13:14:void parseInclude():605 -> r
+    15:15:void parseInclude():605:605 -> r
+    16:16:void parseInclude():602:602 -> r
+    17:18:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):2114:2115 -> r
+    17:18:void parseInclude():602 -> 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):2115 -> r
+    19:20:void parseInclude():602 -> r
+    21:21:void parseInclude():602:602 -> r
+    1:1:boolean parseOption():238:238 -> s
+    2:2:int remainingChars():1686:1686 -> s
+    2:2:boolean acceptArobaseInclude():611 -> s
+    2:2:boolean parseOption():241 -> s
+    3:6:boolean acceptArobaseInclude():614:617 -> s
+    3:6:boolean parseOption():241 -> s
+    7:10:boolean parseOption():244:247 -> s
+    11:12:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):442:443 -> s
+    11:12:boolean parseOption():248 -> s
+    13:13:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1569:1569 -> s
+    13:13:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):445 -> s
+    13:13:boolean parseOption():248 -> s
+    14:14:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule.builder():75:75 -> s
+    14:14:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1569 -> s
+    14:14:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):445 -> s
+    14:14:boolean parseOption():248 -> s
+    15:15:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1569:1569 -> s
+    15:15:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):445 -> s
+    15:15:boolean parseOption():248 -> s
+    16:17:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> s
+    16:17:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1569 -> s
+    16:17:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):445 -> s
+    16:17:boolean parseOption():248 -> s
+    18:18:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1569:1569 -> s
+    18:18:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):445 -> s
+    18:18:boolean parseOption():248 -> s
+    19:20:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> s
+    19:20:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1569 -> s
+    19:20:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):445 -> s
+    19:20:boolean parseOption():248 -> s
+    21:24:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1569:1572 -> s
+    21:24:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):445 -> s
+    21:24:boolean parseOption():248 -> s
+    25:25:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> s
+    25:25:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1573 -> s
+    25:25:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):445 -> s
+    25:25:boolean parseOption():248 -> s
+    26:36:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder.build() -> s
+    26:36:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1574 -> s
+    26:36:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):445 -> s
+    26:36:boolean parseOption():248 -> s
+    37:48:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):446:457 -> s
+    37:48:boolean parseOption():248 -> s
+    49:49:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):883:883 -> s
+    49:49:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):458 -> s
+    49:49:boolean parseOption():248 -> s
+    50:50:com.android.tools.r8.shaking.ConstantArgumentRule$Builder com.android.tools.r8.shaking.ConstantArgumentRule.builder():74:74 -> s
+    50:50:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):883 -> s
+    50:50:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):458 -> s
+    50:50:boolean parseOption():248 -> s
+    51:51:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):883:883 -> s
+    51:51:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):458 -> s
+    51:51:boolean parseOption():248 -> s
+    52:53:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> s
+    52:53:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):883 -> s
+    52:53:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):458 -> s
+    52:53:boolean parseOption():248 -> s
+    54:54:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):883:883 -> s
+    54:54:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):458 -> s
+    54:54:boolean parseOption():248 -> s
+    55:56:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> s
+    55:56:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):883 -> s
+    55:56:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):458 -> s
+    55:56:boolean parseOption():248 -> s
+    57:60:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):883:886 -> s
+    57:60:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):458 -> s
+    57:60:boolean parseOption():248 -> s
+    61:61:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> s
+    61:61:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):887 -> s
+    61:61:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):458 -> s
+    61:61:boolean parseOption():248 -> s
+    62:72:com.android.tools.r8.shaking.ConstantArgumentRule com.android.tools.r8.shaking.ConstantArgumentRule$Builder.build():26:36 -> s
+    62:72:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):888 -> s
+    62:72:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):458 -> s
+    62:72:boolean parseOption():248 -> s
+    73:76:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):459:462 -> s
+    73:76:boolean parseOption():248 -> s
+    77:77:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):894:894 -> s
+    77:77:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):463 -> s
+    77:77:boolean parseOption():248 -> s
+    78:78:com.android.tools.r8.shaking.UnusedArgumentRule$Builder com.android.tools.r8.shaking.UnusedArgumentRule.builder():74:74 -> s
+    78:78:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):894 -> s
+    78:78:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):463 -> s
+    78:78:boolean parseOption():248 -> s
+    79:79:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):894:894 -> s
+    79:79:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):463 -> s
+    79:79:boolean parseOption():248 -> s
+    80:81:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> s
+    80:81:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):894 -> s
+    80:81:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):463 -> s
+    80:81:boolean parseOption():248 -> s
+    82:82:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):894:894 -> s
+    82:82:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):463 -> s
+    82:82:boolean parseOption():248 -> s
+    83:84:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> s
+    83:84:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):894 -> s
+    83:84:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):463 -> s
+    83:84:boolean parseOption():248 -> s
+    85:88:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):894:897 -> s
+    85:88:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):463 -> s
+    85:88:boolean parseOption():248 -> s
+    89:89:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> s
+    89:89:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):898 -> s
+    89:89:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):463 -> s
+    89:89:boolean parseOption():248 -> s
+    90:100:com.android.tools.r8.shaking.UnusedArgumentRule com.android.tools.r8.shaking.UnusedArgumentRule$Builder.build():26:36 -> s
+    90:100:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):899 -> s
+    90:100:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):463 -> s
+    90:100:boolean parseOption():248 -> s
+    101:124:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):464:487 -> s
+    101:124:boolean parseOption():248 -> s
+    125:125:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):777:777 -> s
+    125:125:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):488 -> s
+    125:125:boolean parseOption():248 -> s
+    126:126:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule$Builder com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule.builder():76:76 -> s
+    126:126:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):777 -> s
+    126:126:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):488 -> s
+    126:126:boolean parseOption():248 -> s
+    127:127:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):777:777 -> s
+    127:127:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):488 -> s
+    127:127:boolean parseOption():248 -> s
+    128:129:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> s
+    128:129:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):777 -> s
+    128:129:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):488 -> s
+    128:129:boolean parseOption():248 -> s
+    130:130:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):777:777 -> s
+    130:130:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):488 -> s
+    130:130:boolean parseOption():248 -> s
+    131:132:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> s
+    131:132:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):777 -> s
+    131:132:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):488 -> s
+    131:132:boolean parseOption():248 -> s
+    133:136:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):777:780 -> s
+    133:136:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):488 -> s
+    133:136:boolean parseOption():248 -> s
+    137:137:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> s
+    137:137:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):781 -> s
+    137:137:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):488 -> s
+    137:137:boolean parseOption():248 -> s
+    138:148:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule$Builder.build():28:38 -> s
+    138:148:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):782 -> s
+    138:148:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):488 -> s
+    138:148:boolean parseOption():248 -> s
+    149:152:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):489:492 -> s
+    149:152:boolean parseOption():248 -> s
+    153:153:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):788:788 -> s
+    153:153:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):493 -> s
+    153:153:boolean parseOption():248 -> s
+    154:154:com.android.tools.r8.shaking.NoVerticalClassMergingRule$Builder com.android.tools.r8.shaking.NoVerticalClassMergingRule.builder():76:76 -> s
+    154:154:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):788 -> s
+    154:154:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):493 -> s
+    154:154:boolean parseOption():248 -> s
+    155:155:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):788:788 -> s
+    155:155:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):493 -> s
+    155:155:boolean parseOption():248 -> s
+    156:157:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> s
+    156:157:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):788 -> s
+    156:157:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):493 -> s
+    156:157:boolean parseOption():248 -> s
+    158:158:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):788:788 -> s
+    158:158:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):493 -> s
+    158:158:boolean parseOption():248 -> s
+    159:160:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> s
+    159:160:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):788 -> s
+    159:160:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):493 -> s
+    159:160:boolean parseOption():248 -> s
+    161:164:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):788:791 -> s
+    161:164:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):493 -> s
+    161:164:boolean parseOption():248 -> s
+    165:165:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> s
+    165:165:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):792 -> s
+    165:165:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):493 -> s
+    165:165:boolean parseOption():248 -> s
+    166:176:com.android.tools.r8.shaking.NoVerticalClassMergingRule com.android.tools.r8.shaking.NoVerticalClassMergingRule$Builder.build():28:38 -> s
+    166:176:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):793 -> s
+    166:176:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):493 -> s
+    166:176:boolean parseOption():248 -> s
+    177:180:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):494:497 -> s
+    177:180:boolean parseOption():248 -> s
+    181:181:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):799:799 -> s
+    181:181:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):498 -> s
+    181:181:boolean parseOption():248 -> s
+    182:182:com.android.tools.r8.shaking.NoHorizontalClassMergingRule$Builder com.android.tools.r8.shaking.NoHorizontalClassMergingRule.builder():77:77 -> s
+    182:182:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):799 -> s
+    182:182:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):498 -> s
+    182:182:boolean parseOption():248 -> s
+    183:183:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):799:799 -> s
+    183:183:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):498 -> s
+    183:183:boolean parseOption():248 -> s
+    184:185:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> s
+    184:185:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):799 -> s
+    184:185:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):498 -> s
+    184:185:boolean parseOption():248 -> s
+    186:186:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):799:799 -> s
+    186:186:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):498 -> s
+    186:186:boolean parseOption():248 -> s
+    187:188:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> s
+    187:188:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):799 -> s
+    187:188:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):498 -> s
+    187:188:boolean parseOption():248 -> s
+    189:192:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):799:802 -> s
+    189:192:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):498 -> s
+    189:192:boolean parseOption():248 -> s
+    193:193:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> s
+    193:193:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):803 -> s
+    193:193:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):498 -> s
+    193:193:boolean parseOption():248 -> s
+    194:194:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):804:804 -> s
+    194:194:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):498 -> s
+    194:194:boolean parseOption():248 -> s
+    195:198:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):499:502 -> s
+    195:198:boolean parseOption():248 -> s
+    199:199:com.android.tools.r8.shaking.NoStaticClassMergingRule parseNoStaticClassMergingRule(com.android.tools.r8.position.Position):810:810 -> s
+    199:199:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):503 -> s
+    199:199:boolean parseOption():248 -> s
+    200:200:com.android.tools.r8.shaking.NoStaticClassMergingRule$Builder com.android.tools.r8.shaking.NoStaticClassMergingRule.builder():76:76 -> s
+    200:200:com.android.tools.r8.shaking.NoStaticClassMergingRule parseNoStaticClassMergingRule(com.android.tools.r8.position.Position):810 -> s
+    200:200:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):503 -> s
+    200:200:boolean parseOption():248 -> s
+    201:201:com.android.tools.r8.shaking.NoStaticClassMergingRule parseNoStaticClassMergingRule(com.android.tools.r8.position.Position):810:810 -> s
+    201:201:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):503 -> s
+    201:201:boolean parseOption():248 -> s
+    202:203:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> s
+    202:203:com.android.tools.r8.shaking.NoStaticClassMergingRule parseNoStaticClassMergingRule(com.android.tools.r8.position.Position):810 -> s
+    202:203:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):503 -> s
+    202:203:boolean parseOption():248 -> s
+    204:204:com.android.tools.r8.shaking.NoStaticClassMergingRule parseNoStaticClassMergingRule(com.android.tools.r8.position.Position):810:810 -> s
+    204:204:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):503 -> s
+    204:204:boolean parseOption():248 -> s
+    205:206:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> s
+    205:206:com.android.tools.r8.shaking.NoStaticClassMergingRule parseNoStaticClassMergingRule(com.android.tools.r8.position.Position):810 -> s
+    205:206:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):503 -> s
+    205:206:boolean parseOption():248 -> s
+    207:210:com.android.tools.r8.shaking.NoStaticClassMergingRule parseNoStaticClassMergingRule(com.android.tools.r8.position.Position):810:813 -> s
+    207:210:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):503 -> s
+    207:210:boolean parseOption():248 -> s
+    211:211:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> s
+    211:211:com.android.tools.r8.shaking.NoStaticClassMergingRule parseNoStaticClassMergingRule(com.android.tools.r8.position.Position):814 -> s
+    211:211:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):503 -> s
+    211:211:boolean parseOption():248 -> s
+    212:222:com.android.tools.r8.shaking.NoStaticClassMergingRule com.android.tools.r8.shaking.NoStaticClassMergingRule$Builder.build():28:38 -> s
+    212:222:com.android.tools.r8.shaking.NoStaticClassMergingRule parseNoStaticClassMergingRule(com.android.tools.r8.position.Position):815 -> s
+    212:222:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):503 -> s
+    212:222:boolean parseOption():248 -> s
+    223:227:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):504:508 -> s
+    223:227:boolean parseOption():248 -> s
+    228:228:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):822:822 -> s
+    228:228:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):509 -> s
+    228:228:boolean parseOption():248 -> s
+    229:229:com.android.tools.r8.shaking.MemberValuePropagationRule$Builder com.android.tools.r8.shaking.MemberValuePropagationRule.builder():91:91 -> s
+    229:229:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):822 -> s
+    229:229:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):509 -> s
+    229:229:boolean parseOption():248 -> s
+    230:230:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):822:822 -> s
+    230:230:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):509 -> s
+    230:230:boolean parseOption():248 -> s
+    231:232:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> s
+    231:232:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):822 -> s
+    231:232:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):509 -> s
+    231:232:boolean parseOption():248 -> s
+    233:233:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):822:822 -> s
+    233:233:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):509 -> s
+    233:233:boolean parseOption():248 -> s
+    234:235:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> s
+    234:235:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):822 -> s
+    234:235:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):509 -> s
+    234:235:boolean parseOption():248 -> s
+    236:236:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):822:822 -> s
+    236:236:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):509 -> s
+    236:236:boolean parseOption():248 -> s
+    237:237: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
+    237:237:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):822 -> s
+    237:237:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):509 -> s
+    237:237:boolean parseOption():248 -> s
+    238:240:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):823:825 -> s
+    238:240:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):509 -> s
+    238:240:boolean parseOption():248 -> s
+    241:241:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> s
+    241:241:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):826 -> s
+    241:241:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):509 -> s
+    241:241:boolean parseOption():248 -> s
+    242:252:com.android.tools.r8.shaking.MemberValuePropagationRule com.android.tools.r8.shaking.MemberValuePropagationRule$Builder.build():38:48 -> s
+    242:252:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):827 -> s
+    242:252:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):509 -> s
+    242:252:boolean parseOption():248 -> s
+    253:258:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):510:515 -> s
+    253:258:boolean parseOption():248 -> s
+    259:266:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):514:521 -> s
+    259:266:boolean parseOption():248 -> s
+    267:273:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):520:526 -> s
+    267:273:boolean parseOption():248 -> s
+    274:281:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):525:532 -> s
+    274:281:boolean parseOption():248 -> s
+    282:286:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):531:535 -> s
+    282:286:boolean parseOption():248 -> s
+    287:287:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):928:928 -> s
+    287:287:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):536 -> s
+    287:287:boolean parseOption():248 -> s
+    288:288:com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder com.android.tools.r8.shaking.WhyAreYouNotInliningRule.builder():74:74 -> s
+    288:288:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):928 -> s
+    288:288:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):536 -> s
+    288:288:boolean parseOption():248 -> s
+    289:289:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):928:928 -> s
+    289:289:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):536 -> s
+    289:289:boolean parseOption():248 -> s
+    290:291:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> s
+    290:291:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):928 -> s
+    290:291:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):536 -> s
+    290:291:boolean parseOption():248 -> s
+    292:292:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):928:928 -> s
+    292:292:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):536 -> s
+    292:292:boolean parseOption():248 -> s
+    293:294:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> s
+    293:294:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):928 -> s
+    293:294:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):536 -> s
+    293:294:boolean parseOption():248 -> s
+    295:298:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):928:931 -> s
+    295:298:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):536 -> s
+    295:298:boolean parseOption():248 -> s
+    299:299:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> s
+    299:299:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):932 -> s
+    299:299:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):536 -> s
+    299:299:boolean parseOption():248 -> s
+    300:310:com.android.tools.r8.shaking.WhyAreYouNotInliningRule com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder.build():26:36 -> s
+    300:310:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):933 -> s
+    300:310:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):536 -> s
+    300:310:boolean parseOption():248 -> s
+    311:311:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):537:537 -> s
+    311:311:boolean parseOption():248 -> s
+    312:319:boolean parseOption():249:256 -> s
+    320:332:boolean parseOption():252:264 -> s
+    333:360:java.util.List acceptPatternList():1904:1931 -> s
+    333:360:void parseKeepAttributes():622 -> s
+    333:360:boolean parseOption():265 -> s
+    361:364:void parseKeepAttributes():623:626 -> s
+    361:364:boolean parseOption():265 -> s
+    365:365:void parseKeepAttributes():624:624 -> s
+    365:365:boolean parseOption():265 -> s
+    366:367:boolean parseOption():266:267 -> s
+    368:377:void parsePackageFilter(java.util.function.BiConsumer):1973:1982 -> s
+    368:377:boolean parseOption():267 -> s
+    378:381:void parsePackageFilter(java.util.function.BiConsumer):1981:1984 -> s
+    378:381:boolean parseOption():267 -> s
+    382:389:void parsePackageFilter(java.util.function.BiConsumer):1979:1986 -> s
+    382:389:boolean parseOption():267 -> s
+    390:404:boolean parseOption():268:282 -> s
+    405:405:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):741:741 -> s
+    405:405:boolean parseOption():283 -> s
+    406:406:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule.builder():74:74 -> s
+    406:406:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):741 -> s
+    406:406:boolean parseOption():283 -> s
+    407:407:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):741:741 -> s
+    407:407:boolean parseOption():283 -> s
+    408:409:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> s
+    408:409:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):742 -> s
+    408:409:boolean parseOption():283 -> s
+    410:410:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):742:742 -> s
+    410:410:boolean parseOption():283 -> s
+    411:412:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> s
+    411:412:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):743 -> s
+    411:412:boolean parseOption():283 -> s
+    413:416:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):743:746 -> s
+    413:416:boolean parseOption():283 -> s
+    417:417:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> s
+    417:417:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):747 -> s
+    417:417:boolean parseOption():283 -> s
+    418:428:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder.build():26:36 -> s
+    418:428:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):748 -> s
+    418:428:boolean parseOption():283 -> s
+    429:439:boolean parseOption():284:294 -> s
+    440:442:boolean parseOption():291:291 -> s
+    446:521:boolean parseOption():295:370 -> s
+    522:522:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1556:1556 -> s
+    522:522:boolean parseOption():371 -> s
+    523:523:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule.builder():77:77 -> s
+    523:523:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1556 -> s
+    523:523:boolean parseOption():371 -> s
+    524:524:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1556:1556 -> s
+    524:524:boolean parseOption():371 -> s
+    525:526:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> s
+    525:526:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1557 -> s
+    525:526:boolean parseOption():371 -> s
+    527:527:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1557:1557 -> s
+    527:527:boolean parseOption():371 -> s
+    528:529:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> s
+    528:529:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1558 -> s
+    528:529:boolean parseOption():371 -> s
+    530:533:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1558:1561 -> s
+    530:533:boolean parseOption():371 -> s
+    534:534:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> s
+    534:534:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1562 -> s
+    534:534:boolean parseOption():371 -> s
+    535:535:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1563:1563 -> s
+    535:535:boolean parseOption():371 -> s
+    536:537:boolean parseOption():372:373 -> s
+    538:538:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1579:1579 -> s
+    538:538:boolean parseOption():374 -> s
+    539:539:com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder com.android.tools.r8.shaking.ProguardAssumeValuesRule.builder():77:77 -> s
+    539:539:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1579 -> s
+    539:539:boolean parseOption():374 -> s
+    540:540:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1579:1579 -> s
+    540:540:boolean parseOption():374 -> s
+    541:542:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> s
+    541:542:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1580 -> s
+    541:542:boolean parseOption():374 -> s
+    543:543:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1580:1580 -> s
+    543:543:boolean parseOption():374 -> s
+    544:545:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> s
+    544:545:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1581 -> s
+    544:545:boolean parseOption():374 -> s
+    546:549:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1581:1584 -> s
+    546:549:boolean parseOption():374 -> s
+    550:550:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> s
+    550:550:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1585 -> s
+    550:550:boolean parseOption():374 -> s
+    551:561:com.android.tools.r8.shaking.ProguardAssumeValuesRule com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder.build():26:36 -> s
+    551:561:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1586 -> s
+    551:561:boolean parseOption():374 -> s
+    562:566:boolean parseOption():375:379 -> s
+    567:601:boolean parseOption():378:412 -> s
+    602:602:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):846:846 -> s
+    602:602:boolean parseOption():412 -> s
+    603:603:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder com.android.tools.r8.shaking.ProguardIdentifierNameStringRule.builder():73:73 -> s
+    603:603:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):846 -> s
+    603:603:boolean parseOption():412 -> s
+    604:604:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):846:846 -> s
+    604:604:boolean parseOption():412 -> s
+    605:606:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> s
+    605:606:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):847 -> s
+    605:606:boolean parseOption():412 -> s
+    607:607:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):847:847 -> s
+    607:607:boolean parseOption():412 -> s
+    608:609:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> s
+    608:609:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):848 -> s
+    608:609:boolean parseOption():412 -> s
+    610:613:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):848:851 -> s
+    610:613:boolean parseOption():412 -> s
+    614:614:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> s
+    614:614:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):852 -> s
+    614:614:boolean parseOption():412 -> s
+    615:625:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder.build():25:35 -> s
+    615:625:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):853 -> s
+    615:625:boolean parseOption():412 -> s
+    626:628:boolean parseOption():412:414 -> s
+    629:629:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):858:858 -> s
+    629:629:boolean parseOption():414 -> s
+    630:630:com.android.tools.r8.shaking.ProguardIfRule$Builder com.android.tools.r8.shaking.ProguardIfRule.builder():121:121 -> s
+    630:630:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):858 -> s
+    630:630:boolean parseOption():414 -> s
+    631:631:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):858:858 -> s
+    631:631:boolean parseOption():414 -> s
+    632:633:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> s
+    632:633:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):859 -> s
+    632:633:boolean parseOption():414 -> s
+    634:634:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):859:859 -> s
+    634:634:boolean parseOption():414 -> s
+    635:636:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> s
+    635:636:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):860 -> s
+    635:636:boolean parseOption():414 -> s
+    637:644:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):860:867 -> s
+    637:644:boolean parseOption():414 -> s
+    645:645:void com.android.tools.r8.shaking.ProguardIfRule$Builder.setSubsequentRule(com.android.tools.r8.shaking.ProguardKeepRule):59:59 -> s
+    645:645:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):868 -> s
+    645:645:boolean parseOption():414 -> s
+    646:647:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):869:870 -> s
+    646:647:boolean parseOption():414 -> s
+    648:648:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> s
+    648:648:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):871 -> s
+    648:648:boolean parseOption():414 -> s
+    649:660:com.android.tools.r8.shaking.ProguardIfRule com.android.tools.r8.shaking.ProguardIfRule$Builder.build():64:75 -> s
+    649:660:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):872 -> s
+    649:660:boolean parseOption():414 -> s
+    661:661:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):873:873 -> s
+    661:661:boolean parseOption():414 -> s
+    662:674:void verifyAndLinkBackReferences(java.lang.Iterable):937:949 -> s
+    662:674:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):873 -> s
+    662:674:boolean parseOption():414 -> s
+    675:679:void verifyAndLinkBackReferences(java.lang.Iterable):944:944 -> s
+    675:679:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):873 -> s
+    675:679:boolean parseOption():414 -> s
+    686:688:void verifyAndLinkBackReferences(java.lang.Iterable):951:953 -> s
+    686:688:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):873 -> s
+    686:688:boolean parseOption():414 -> s
+    689:689:boolean parseOption():414:414 -> s
+    690:692:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):876:876 -> s
+    690:692:boolean parseOption():414 -> s
+    693:713:boolean parseOption():415:435 -> s
+    1:1:java.lang.String acceptClassName():1747:1747 -> t
+    1:1:java.lang.String parsePackageNameOrEmptyString():2019 -> t
+    1:20:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():2054:2073 -> u
+    21:26:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():2070:2075 -> u
+    27:27:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():2060:2060 -> u
+    1:1:char peekChar():1673:1673 -> v
+    1:11:void skipOptimizationName():695:705 -> w
+    1:2:void skipSingleArgument():710:711 -> x
+    3:3:char readChar():1682:1682 -> x
+    3:3:void skipSingleArgument():712 -> x
+    1:6:void skipWhitespace():1590:1595 -> y
+    7:14:void skipComment():1601:1608 -> y
+    7:14:void skipWhitespace():1597 -> y
 com.android.tools.r8.shaking.ProguardConfigurationRule -> com.android.tools.r8.shaking.Z0:
     boolean $assertionsDisabled -> o
     boolean used -> p
@@ -76413,7 +76992,10 @@
     1:5:java.lang.Iterable relevantCandidatesForRule(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):108:112 -> a
     6:6:boolean com.android.tools.r8.shaking.ProguardTypeMatcher.hasSpecificType():0:0 -> a
     6:6:java.lang.Iterable relevantCandidatesForRule(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):112 -> a
-    7:15:java.lang.Iterable relevantCandidatesForRule(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):113:121 -> a
+    7:10:java.lang.Iterable relevantCandidatesForRule(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):113:116 -> a
+    11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    11:11:java.lang.Iterable relevantCandidatesForRule(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):117 -> a
+    12:15:java.lang.Iterable relevantCandidatesForRule(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):118:121 -> a
     16:16:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
     16:16:java.lang.Iterable relevantCandidatesForRule(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):119 -> a
     17:17:java.lang.Iterable relevantCandidatesForRule(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):123:123 -> a
@@ -76434,9 +77016,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.nw:
+com.android.tools.r8.shaking.ProguardConfigurationSource -> com.android.tools.r8.internal.gv:
     java.nio.file.Path getBaseDirectory() -> a
-com.android.tools.r8.shaking.ProguardConfigurationSourceBytes -> com.android.tools.r8.internal.ow:
+com.android.tools.r8.shaking.ProguardConfigurationSourceBytes -> com.android.tools.r8.internal.hv:
     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>
@@ -76444,14 +77026,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.pw:
+com.android.tools.r8.shaking.ProguardConfigurationSourceFile -> com.android.tools.r8.internal.iv:
     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.qw:
+com.android.tools.r8.shaking.ProguardConfigurationSourceStrings -> com.android.tools.r8.internal.jv:
     java.util.List config -> b
     com.android.tools.r8.origin.Origin origin -> c
     java.nio.file.Path basePath -> a
@@ -76479,18 +77061,15 @@
     37:40:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):116:119 -> a
     41:41:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):110:110 -> a
     42:53:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):109:120 -> a
-    54:69:boolean hasExplicitAssumeValuesOrAssumeNoSideEffectsRuleForMinSdk(com.android.tools.r8.graph.DexItemFactory,java.util.List):129:144 -> a
-    70:70:boolean com.android.tools.r8.shaking.ProguardClassNameList.hasWildcards():94:94 -> a
-    70:70:boolean hasExplicitAssumeValuesOrAssumeNoSideEffectsRuleForMinSdk(com.android.tools.r8.graph.DexItemFactory,java.util.List):144 -> a
-    71:100:boolean hasExplicitAssumeValuesOrAssumeNoSideEffectsRuleForMinSdk(com.android.tools.r8.graph.DexItemFactory,java.util.List):145:174 -> a
-    101:104:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):185:188 -> a
-    105:105:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> a
-    105:105:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):189 -> a
-    106:111:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):189:194 -> a
-    112:112:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):137:137 -> a
-    112:112:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):191 -> a
-    113:114:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):195:196 -> a
-    115:115:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):187:187 -> a
+    54:92:boolean hasExplicitAssumeValuesOrAssumeNoSideEffectsRuleForMinSdk(com.android.tools.r8.graph.DexItemFactory,java.util.List):129:167 -> a
+    93:96:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):178:181 -> a
+    97:97:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> a
+    97:97:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):182 -> a
+    98:103:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):182:187 -> a
+    104:104:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):137:137 -> a
+    104:104:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):184 -> a
+    105:106:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):188:189 -> a
+    107:107: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.a1:
     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.b1:
@@ -76574,7 +77153,7 @@
     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.rw:
+com.android.tools.r8.shaking.ProguardKeepAttributes -> com.android.tools.r8.internal.kv:
     boolean runtimeVisibleAnnotations -> m
     boolean runtimeInvisibleAnnotations -> n
     boolean runtimeVisibleParameterAnnotations -> o
@@ -76624,7 +77203,7 @@
     38:38:com.android.tools.r8.shaking.ProguardKeepRule defaultKeepAllRule(java.util.function.Consumer):149 -> a
     39:39:void com.android.tools.r8.shaking.ProguardClassSpecification$Builder.matchAllSpecification():184:184 -> a
     39:39:com.android.tools.r8.shaking.ProguardKeepRule defaultKeepAllRule(java.util.function.Consumer):149 -> a
-    40:42:com.android.tools.r8.shaking.ProguardMemberRule com.android.tools.r8.shaking.ProguardMemberRule.defaultKeepAllRule():442:444 -> a
+    40:42:com.android.tools.r8.shaking.ProguardMemberRule com.android.tools.r8.shaking.ProguardMemberRule.defaultKeepAllRule():441:443 -> a
     40:42:void com.android.tools.r8.shaking.ProguardClassSpecification$Builder.matchAllSpecification():185 -> a
     40:42:com.android.tools.r8.shaking.ProguardKeepRule defaultKeepAllRule(java.util.function.Consumer):149 -> a
     43:43:void com.android.tools.r8.shaking.ProguardClassSpecification$Builder.matchAllSpecification():185:185 -> a
@@ -76686,7 +77265,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.sw:
+com.android.tools.r8.shaking.ProguardKeepRuleType -> com.android.tools.r8.internal.lv:
     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
@@ -76697,7 +77276,7 @@
     1:1:void <init>(java.lang.String,int):8:8 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardKeepRuleType[] values():8:8 -> a
     1:11:java.lang.String toString():16:26 -> toString
-com.android.tools.r8.shaking.ProguardKeepRuleType$1 -> com.android.tools.r8.internal.sw$a:
+com.android.tools.r8.shaking.ProguardKeepRuleType$1 -> com.android.tools.r8.internal.lv$a:
     int[] $SwitchMap$com$android$tools$r8$shaking$ProguardKeepRuleType -> a
     1:1:void <clinit>():16:16 -> <clinit>
 com.android.tools.r8.shaking.ProguardMemberRule -> com.android.tools.r8.shaking.l1:
@@ -76709,40 +77288,40 @@
     com.android.tools.r8.shaking.ProguardAccessFlags accessFlags -> b
     java.util.List arguments -> g
     com.android.tools.r8.shaking.ProguardMemberRuleReturnValue returnValue -> h
-    1:1:void <init>(java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardMemberType,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardNameMatcher,java.util.List,com.android.tools.r8.shaking.ProguardMemberRuleReturnValue,com.android.tools.r8.shaking.ProguardMemberRule$1):24:24 -> <init>
-    2:10:void <init>(java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardMemberType,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardNameMatcher,java.util.List,com.android.tools.r8.shaking.ProguardMemberRuleReturnValue):125:133 -> <init>
-    1:1:com.android.tools.r8.shaking.ProguardMemberRule$Builder builder():140:140 -> a
-    2:34:boolean matches(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.shaking.DexStringCache):188:220 -> a
-    35:40:boolean matches(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.shaking.DexStringCache):194:199 -> a
-    41:89:boolean matches(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.shaking.DexStringCache):239:287 -> a
+    1:1:void <init>(java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardMemberType,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardNameMatcher,java.util.List,com.android.tools.r8.shaking.ProguardMemberRuleReturnValue,com.android.tools.r8.shaking.ProguardMemberRule$1):23:23 -> <init>
+    2:10:void <init>(java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardMemberType,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardNameMatcher,java.util.List,com.android.tools.r8.shaking.ProguardMemberRuleReturnValue):124:132 -> <init>
+    1:1:com.android.tools.r8.shaking.ProguardMemberRule$Builder builder():139:139 -> a
+    2:34:boolean matches(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.shaking.DexStringCache):187:219 -> a
+    35:40:boolean matches(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.shaking.DexStringCache):193:198 -> a
+    41:89:boolean matches(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.shaking.DexStringCache):238:286 -> a
     90:90:boolean com.android.tools.r8.shaking.ProguardTypeMatcher.isTripleDotPattern():0:0 -> a
-    90:90:boolean matches(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.shaking.DexStringCache):287 -> a
-    91:96:boolean matches(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.shaking.DexStringCache):290:295 -> a
-    97:110:boolean matches(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.shaking.DexStringCache):242:255 -> a
-    111:111:java.util.stream.Stream lambda$getWildcards$0(java.lang.Iterable):331:331 -> a
-    112:124:com.android.tools.r8.shaking.ProguardMemberRule materialize(com.android.tools.r8.graph.DexItemFactory):337:349 -> a
-    125:125:com.android.tools.r8.shaking.ProguardTypeMatcher lambda$materialize$1(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.ProguardTypeMatcher):347:347 -> a
-    1:1:com.android.tools.r8.shaking.ProguardAccessFlags getAccessFlags():148:148 -> b
-    1:1:java.util.List getAnnotations():144:144 -> c
-    1:1:java.util.List getArguments():168:168 -> d
-    1:1:com.android.tools.r8.shaking.ProguardNameMatcher getName():164:164 -> e
-    1:25:boolean equals(java.lang.Object):354:378 -> equals
-    1:1:com.android.tools.r8.shaking.ProguardAccessFlags getNegatedAccessFlags():152:152 -> f
-    1:1:com.android.tools.r8.shaking.ProguardMemberRuleReturnValue getReturnValue():176:176 -> g
-    1:1:com.android.tools.r8.shaking.ProguardMemberType getRuleType():156:156 -> h
-    1:7:int hashCode():383:389 -> hashCode
-    1:1:com.android.tools.r8.shaking.ProguardTypeMatcher getType():160:160 -> i
-    1:10:java.lang.Iterable getWildcards():324:333 -> j
+    90:90:boolean matches(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.shaking.DexStringCache):286 -> a
+    91:96:boolean matches(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.shaking.DexStringCache):289:294 -> a
+    97:110:boolean matches(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.shaking.DexStringCache):241:254 -> a
+    111:111:java.util.stream.Stream lambda$getWildcards$0(java.lang.Iterable):330:330 -> a
+    112:124:com.android.tools.r8.shaking.ProguardMemberRule materialize(com.android.tools.r8.graph.DexItemFactory):336:348 -> a
+    125:125:com.android.tools.r8.shaking.ProguardTypeMatcher lambda$materialize$1(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.ProguardTypeMatcher):346:346 -> a
+    1:1:com.android.tools.r8.shaking.ProguardAccessFlags getAccessFlags():147:147 -> b
+    1:1:java.util.List getAnnotations():143:143 -> c
+    1:1:java.util.List getArguments():167:167 -> d
+    1:1:com.android.tools.r8.shaking.ProguardNameMatcher getName():163:163 -> e
+    1:25:boolean equals(java.lang.Object):353:377 -> equals
+    1:1:com.android.tools.r8.shaking.ProguardAccessFlags getNegatedAccessFlags():151:151 -> f
+    1:1:com.android.tools.r8.shaking.ProguardMemberRuleReturnValue getReturnValue():175:175 -> g
+    1:1:com.android.tools.r8.shaking.ProguardMemberType getRuleType():155:155 -> h
+    1:7:int hashCode():382:388 -> hashCode
+    1:1:com.android.tools.r8.shaking.ProguardTypeMatcher getType():159:159 -> i
+    1:10:java.lang.Iterable getWildcards():323:332 -> j
     11:11:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable,java.lang.Iterable,java.lang.Iterable):469:469 -> j
-    11:11:java.lang.Iterable getWildcards():324 -> j
-    1:1:boolean hasReturnValue():172:172 -> k
-    1:39:java.lang.String toString():395:433 -> toString
-    40:49:java.lang.String toString():410:419 -> toString
-    50:68:java.lang.String toString():407:425 -> toString
-    69:103:java.lang.String toString():404:438 -> toString
+    11:11:java.lang.Iterable getWildcards():323 -> j
+    1:1:boolean hasReturnValue():171:171 -> k
+    1:39:java.lang.String toString():394:432 -> toString
+    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.l1$a:
     int[] $SwitchMap$com$android$tools$r8$shaking$ProguardMemberType -> a
-    1:1:void <clinit>():189:189 -> <clinit>
+    1:1:void <clinit>():188:188 -> <clinit>
 com.android.tools.r8.shaking.ProguardMemberRule$Builder -> com.android.tools.r8.shaking.l1$b:
     java.util.List annotations -> b
     com.android.tools.r8.shaking.ProguardNameMatcher name -> g
@@ -76753,22 +77332,22 @@
     com.android.tools.r8.shaking.ProguardMemberRuleReturnValue returnValue -> i
     boolean $assertionsDisabled -> a
     com.android.tools.r8.shaking.ProguardAccessFlags negatedAccessFlags -> d
-    1:1:void <clinit>():26:26 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.ProguardMemberRule$1):26:26 -> <init>
-    2:2:void <init>():37:37 -> <init>
-    3:5:void <init>():28:30 -> <init>
-    1:2:void setAnnotations(java.util.List):40:41 -> a
-    3:3:com.android.tools.r8.shaking.ProguardMemberRule$Builder setAccessFlags(com.android.tools.r8.shaking.ProguardAccessFlags):49:49 -> a
-    4:4:com.android.tools.r8.shaking.ProguardMemberRule$Builder setRuleType(com.android.tools.r8.shaking.ProguardMemberType):62:62 -> a
-    5:5:com.android.tools.r8.shaking.ProguardMemberRule$Builder setTypeMatcher(com.android.tools.r8.shaking.ProguardTypeMatcher):71:71 -> a
-    6:6:com.android.tools.r8.shaking.ProguardMemberRule$Builder setName(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards):76:76 -> a
-    7:7:com.android.tools.r8.shaking.ProguardMemberRule$Builder setReturnValue(com.android.tools.r8.shaking.ProguardMemberRuleReturnValue):86:86 -> a
-    8:9:com.android.tools.r8.shaking.ProguardMemberRule build():95:96 -> a
-    1:1:com.android.tools.r8.shaking.ProguardAccessFlags getAccessFlags():45:45 -> b
-    2:2:com.android.tools.r8.shaking.ProguardMemberRule$Builder setArguments(java.util.List):81:81 -> b
-    1:1:com.android.tools.r8.shaking.ProguardAccessFlags getNegatedAccessFlags():54:54 -> c
-    1:1:com.android.tools.r8.shaking.ProguardTypeMatcher getTypeMatcher():67:67 -> d
-    1:1:boolean isValid():91:91 -> e
+    1:1:void <clinit>():25:25 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.ProguardMemberRule$1):25:25 -> <init>
+    2:2:void <init>():36:36 -> <init>
+    3:5:void <init>():27:29 -> <init>
+    1:2:void setAnnotations(java.util.List):39:40 -> a
+    3:3:com.android.tools.r8.shaking.ProguardMemberRule$Builder setAccessFlags(com.android.tools.r8.shaking.ProguardAccessFlags):48:48 -> a
+    4:4:com.android.tools.r8.shaking.ProguardMemberRule$Builder setRuleType(com.android.tools.r8.shaking.ProguardMemberType):61:61 -> a
+    5:5:com.android.tools.r8.shaking.ProguardMemberRule$Builder setTypeMatcher(com.android.tools.r8.shaking.ProguardTypeMatcher):70:70 -> a
+    6:6:com.android.tools.r8.shaking.ProguardMemberRule$Builder setName(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards):75:75 -> a
+    7:7:com.android.tools.r8.shaking.ProguardMemberRule$Builder setReturnValue(com.android.tools.r8.shaking.ProguardMemberRuleReturnValue):85:85 -> a
+    8:9:com.android.tools.r8.shaking.ProguardMemberRule build():94:95 -> a
+    1:1:com.android.tools.r8.shaking.ProguardAccessFlags getAccessFlags():44:44 -> b
+    2:2:com.android.tools.r8.shaking.ProguardMemberRule$Builder setArguments(java.util.List):80:80 -> b
+    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.m1:
     com.android.tools.r8.utils.LongInterval longInterval -> d
     com.android.tools.r8.graph.DexField field -> e
@@ -76780,17 +77359,16 @@
     6:10:void <init>(com.android.tools.r8.utils.LongInterval):30:34 -> <init>
     11:15:void <init>(com.android.tools.r8.graph.DexField):37:41 -> <init>
     16:20:void <init>():44:48 -> <init>
-    1:2:boolean getBoolean():72:73 -> a
-    1:2:com.android.tools.r8.graph.DexField getField():109:110 -> b
-    1:8:long getSingleValue():93:100 -> c
-    1:2:com.android.tools.r8.utils.LongInterval getValueRange():104:105 -> d
+    1:2:boolean getBoolean():68:69 -> a
+    1:2:com.android.tools.r8.graph.DexField getField():105:106 -> b
+    1:8:long getSingleValue():89:96 -> c
+    1:2:com.android.tools.r8.utils.LongInterval getValueRange():100:101 -> d
     1:1:boolean isBoolean():52:52 -> e
     1:1:boolean isField():60:60 -> f
-    1:1:boolean isNonNull():64:64 -> g
-    1:1:boolean isNull():68:68 -> h
-    1:1:boolean isSingleValue():82:82 -> i
-    1:1:boolean isValueRange():56:56 -> j
-    1:17:java.lang.String toString():115:131 -> toString
+    1:1:boolean isNull():64:64 -> g
+    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.m1$a:
     com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type BOOLEAN -> a
     com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type FIELD -> c
@@ -76798,7 +77376,7 @@
     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.uw:
+com.android.tools.r8.shaking.ProguardMemberType -> com.android.tools.r8.internal.nv:
     com.android.tools.r8.shaking.ProguardMemberType METHOD -> h
     com.android.tools.r8.shaking.ProguardMemberType CONSTRUCTOR -> g
     com.android.tools.r8.shaking.ProguardMemberType INIT -> f
@@ -76824,7 +77402,7 @@
     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():2186:2186 -> a
+    4:4:boolean com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards.isMatchAllNames():2201:2201 -> 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
@@ -76858,7 +77436,7 @@
     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.vw:
+com.android.tools.r8.shaking.ProguardPackageMatcher -> com.android.tools.r8.internal.ov:
     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
@@ -76943,7 +77521,7 @@
     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.ww:
+com.android.tools.r8.shaking.ProguardRuleParserException -> com.android.tools.r8.internal.pv:
     com.android.tools.r8.origin.Origin origin -> c
     com.android.tools.r8.position.Position position -> d
     java.lang.String message -> a
@@ -76970,6 +77548,7 @@
     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
+    boolean hasSpecificType() -> d
 com.android.tools.r8.shaking.ProguardTypeMatcher$1 -> com.android.tools.r8.shaking.v1$a:
 com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType -> com.android.tools.r8.shaking.v1$b:
     com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType CLASS -> a
@@ -76988,7 +77567,7 @@
     1:1:com.android.tools.r8.shaking.ProguardTypeMatcher materialize(com.android.tools.r8.graph.DexItemFactory):150 -> a
     1:1:boolean matches(com.android.tools.r8.graph.DexType):166:166 -> b
     1:1:java.lang.Iterable getWildcards():172:172 -> c
-    1:1:com.android.tools.r8.shaking.ProguardTypeMatcher access$000():150:150 -> d
+    1:1:com.android.tools.r8.shaking.ProguardTypeMatcher access$000():150:150 -> e
     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.v1$d:
@@ -76996,7 +77575,7 @@
     1:1:void <clinit>():198:198 -> <clinit>
     1:1:void <init>():196:196 -> <init>
     boolean matches(com.android.tools.r8.graph.DexType) -> b
-    1:1:com.android.tools.r8.shaking.ProguardTypeMatcher access$100():196:196 -> d
+    1:1:com.android.tools.r8.shaking.ProguardTypeMatcher access$100():196:196 -> e
     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.v1$e:
@@ -77011,7 +77590,7 @@
     1:1:com.android.tools.r8.shaking.ProguardTypeMatcher materialize(com.android.tools.r8.graph.DexItemFactory):281 -> a
     1:2:boolean matches(com.android.tools.r8.graph.DexType):297:298 -> b
     1:1:java.lang.Iterable getWildcards():306:306 -> c
-    1:1:com.android.tools.r8.shaking.ProguardTypeMatcher access$400():281:281 -> d
+    1:1:com.android.tools.r8.shaking.ProguardTypeMatcher access$400():281:281 -> e
     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.v1$f:
@@ -77032,9 +77611,9 @@
     1:1:com.android.tools.r8.shaking.ProguardTypeMatcher materialize(com.android.tools.r8.graph.DexItemFactory):226 -> a
     1:2:boolean matches(com.android.tools.r8.graph.DexType):248:249 -> b
     1:1:java.lang.Iterable getWildcards():257:257 -> c
-    1:1:com.android.tools.r8.shaking.ProguardTypeMatcher access$200():226:226 -> d
-    1:1:com.android.tools.r8.shaking.ProguardTypeMatcher access$300():226:226 -> e
+    1:1:com.android.tools.r8.shaking.ProguardTypeMatcher access$200():226:226 -> e
     1:1:boolean equals(java.lang.Object):272:272 -> equals
+    1:1:com.android.tools.r8.shaking.ProguardTypeMatcher access$300():226:226 -> f
     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.v1$g:
@@ -77059,7 +77638,7 @@
     9:17:com.android.tools.r8.shaking.ProguardTypeMatcher materialize(com.android.tools.r8.graph.DexItemFactory):414:422 -> a
     18:35:java.lang.String removeMaterializedBackReferencesFromPattern(java.lang.String,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):442:459 -> a
     18:35:com.android.tools.r8.shaking.ProguardTypeMatcher materialize(com.android.tools.r8.graph.DexItemFactory):423 -> a
-    36:38:boolean com.android.tools.r8.utils.StringUtils.onlyContainsDigits(java.lang.String):312:314 -> a
+    36:38:boolean com.android.tools.r8.utils.StringUtils.onlyContainsDigits(java.lang.String):308:310 -> a
     36:38:java.lang.String removeMaterializedBackReferencesFromPattern(java.lang.String,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):459 -> a
     36:38:com.android.tools.r8.shaking.ProguardTypeMatcher materialize(com.android.tools.r8.graph.DexItemFactory):423 -> a
     39:64:java.lang.String removeMaterializedBackReferencesFromPattern(java.lang.String,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):463:488 -> a
@@ -77173,470 +77752,474 @@
     3:3:void <clinit>():13:13 -> <clinit>
     1:1:void <init>(java.lang.String,int):13:13 -> <init>
     1:1:com.android.tools.r8.shaking.ReprocessMethodRule$Type[] values():13:13 -> a
-com.android.tools.r8.shaking.RootSetUtils -> com.android.tools.r8.shaking.G1:
-com.android.tools.r8.shaking.RootSetUtils$1 -> com.android.tools.r8.shaking.G1$a:
+com.android.tools.r8.shaking.RootSetBuilder -> com.android.tools.r8.shaking.G1:
+    java.util.Set noUnusedInterfaceRemoval -> w
+    java.util.Set noHorizontalClassMerging -> y
+    java.util.Queue delayedRootSetActionItems -> I
+    java.util.Set reprocess -> s
+    java.lang.Iterable rules -> e
+    java.util.LinkedHashMap reasonAsked -> i
+    java.util.Set neverPropagateValue -> A
+    com.android.tools.r8.utils.InternalOptions options -> J
+    java.util.Map dependentNoShrinking -> B
+    java.util.Set identifierNameStrings -> H
+    com.android.tools.r8.shaking.DexStringCache dexStringCache -> K
+    java.util.Map dependentKeepClassCompatRule -> D
+    com.android.tools.r8.graph.DirectMappedDexApplication application -> d
+    java.util.Set bypassClinitforInlining -> o
+    java.util.Set keepParametersWithConstantValue -> q
+    java.util.Set alwaysInline -> k
+    java.util.Map noSideEffects -> F
+    java.util.Set ifRules -> L
+    java.util.Set neverInline -> m
+    com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules softPinned -> g
+    java.util.Set noVerticalClassMerging -> x
+    java.util.Set noStaticClassMerging -> z
+    com.android.tools.r8.graph.AppView appView -> b
+    java.util.Map assumeNoSideEffectsWarnings -> M
+    java.util.Set neverReprocess -> t
+    java.util.Set neverClassInline -> v
+    com.android.tools.r8.utils.PredicateSet alwaysClassInline -> u
+    java.util.LinkedHashMap checkDiscarded -> j
+    java.util.Set noObfuscation -> h
+    java.util.Map dependentSoftPinned -> C
+    com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules noShrinking -> f
+    java.util.Set whyAreYouNotInlining -> p
+    com.android.tools.r8.graph.SubtypingInfo subtypingInfo -> c
+    java.util.Set keepUnusedArguments -> r
+    boolean $assertionsDisabled -> a
+    java.util.Map mayHaveSideEffects -> E
+    java.util.Set forceInline -> l
+    java.util.Map assumedValues -> G
+    java.util.Set neverInlineDueToSingleCaller -> n
+    1:1:void <clinit>():81:81 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):132:132 -> <init>
+    2:52:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):87:137 -> <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):81:81 -> a
+    2:2:com.android.tools.r8.graph.DexDefinition access$600(com.android.tools.r8.graph.DexDefinition,java.util.Map):81:81 -> 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):81:81 -> a
+    4:19:void runPerRule(java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):275:290 -> a
+    20:20:void runPerRule(java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):289:289 -> a
+    21:26:void lambda$runPerRule$4(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):293:298 -> a
+    27:62:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):305:340 -> a
+    63:66:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):339:342 -> a
+    67:67:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():569:569 -> a
+    67:67:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):342 -> a
+    68:100:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):342:374 -> a
+    101:101:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):321:321 -> a
+    102:113:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):378:389 -> a
+    114:145:void propagateAssumeRules(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.util.Set,java.util.Map):399:430 -> a
+    146:156:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet buildConsequentRootSet():435:445 -> a
+    157:158: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):490:491 -> a
+    159:160:boolean canInsertForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):632:633 -> a
+    159:160:boolean access$400(com.android.tools.r8.shaking.RootSetBuilder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):81 -> a
+    161:171: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):644:654 -> a
+    172:172:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    172:172: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 -> a
+    173:183: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):658:668 -> a
+    184:185: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):680:681 -> a
+    186:186: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):711:711 -> a
+    187:188: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):713:714 -> a
+    189:244:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):722:777 -> a
+    245:246:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexType):725:726 -> a
+    247:253:void lambda$writeSeeds$12(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):733:739 -> a
+    254:254:void lambda$writeSeeds$12(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):734:734 -> a
+    255:258:void lambda$writeSeeds$13(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):746:749 -> a
+    259:259:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
+    259:259:void lambda$writeSeeds$13(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):749 -> a
+    260:275:void lambda$writeSeeds$13(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):749:764 -> a
+    276:288:void lambda$writeSeeds$13(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):763:775 -> a
+    289:290:boolean satisfyAccessFlag(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):785:786 -> a
+    291:302:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):848:859 -> a
+    303:303:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):937:937 -> a
+    303:303:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):859 -> a
+    304:320:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):861:877 -> a
+    321:326:boolean anySourceMatchesInheritanceRuleDirectly(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,boolean):884:889 -> a
+    327:327:boolean lambda$anySourceMatchesInheritanceRuleDirectly$14(boolean,com.android.tools.r8.graph.DexType):888:888 -> a
+    328:328:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    328:328:boolean lambda$anySourceMatchesInheritanceRuleDirectly$14(boolean,com.android.tools.r8.graph.DexType):888 -> a
+    329:329:boolean lambda$anySourceMatchesInheritanceRuleDirectly$14(boolean,com.android.tools.r8.graph.DexType):888:888 -> a
+    330:330:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):894:894 -> a
+    331:334:boolean ruleSatisfied(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexClass):907:910 -> a
+    331:334:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):895 -> a
+    335:337:boolean ruleSatisfiedByFields(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):925:927 -> a
+    338:349:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexEncodedMember,java.util.function.Consumer):946:957 -> a
+    350:354:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexAnnotationSet):967:971 -> a
+    355:356:com.android.tools.r8.graph.DexAnnotation getFirstAnnotationThatMatches(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexAnnotationSet):984:985 -> a
+    355:356:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexAnnotationSet):973 -> a
+    357:359:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexAnnotationSet):977:979 -> a
+    360:367: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:1007 -> a
+    368:368:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    368:368: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 -> a
+    369:371: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):1011:1013 -> a
+    372:375: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):1024:1027 -> a
+    376:376:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    376:376: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):1027 -> a
+    377:377: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):1030:1030 -> a
+    378:379:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1036:1037 -> a
+    380:380:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    380:380:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1037 -> a
+    381:381:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1039:1039 -> a
+    382:391:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):1043:1052 -> a
+    392:392:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    392:392:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):1052 -> a
+    393:401:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):1053:1061 -> a
+    402:402:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():569:569 -> a
+    402:402:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):1061 -> a
+    403:403:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):1062:1062 -> a
+    404:405: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):1087:1088 -> a
+    406:406:boolean com.android.tools.r8.graph.DexDefinition.isDexEncodedField():0:0 -> a
+    406:406: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):1088 -> a
+    407:425: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):1089:1107 -> a
+    426:426:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):256:256 -> a
+    426:426: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):1107 -> a
+    427:430: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:1116 -> a
+    431:431:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    431:431: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):1116 -> a
+    432:433: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):1117:1118 -> a
+    434:442:boolean com.android.tools.r8.shaking.ProguardMemberRule.isSpecific():310:318 -> a
+    434:442: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):1118 -> a
+    443:447: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):1119:1119 -> a
+    458:497: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):1130:1169 -> a
+    498:498:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():569:569 -> a
+    498:498: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):1169 -> a
+    499:503: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):1169:1173 -> a
+    504:508:void includeDescriptorClasses(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):1067:1071 -> a
+    504: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):1174 -> a
+    509:509:boolean com.android.tools.r8.graph.DexDefinition.isDexEncodedField():0:0 -> a
+    509:509:void includeDescriptorClasses(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):1073 -> 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):1174 -> a
+    510:513:void includeDescriptorClasses(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):1074:1077 -> 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):1174 -> a
+    514:525: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):1175:1186 -> a
+    526:561: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):1185:1220 -> a
+    562:562: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):1217:1217 -> a
+    563:563: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):1214:1214 -> a
+    564:564: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):1211:1211 -> a
+    565:586: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):1208:1229 -> a
+    587: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):1226:1230 -> a
+    592:592:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isClassInlineRule():0:0 -> a
+    592:592: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):1230 -> a
+    593:611: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):1231:1249 -> a
+    612:620: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):1243:1251 -> a
+    621:656: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):1234:1269 -> a
+    657:657:boolean com.android.tools.r8.graph.DexDefinition.isDexEncodedField():0:0 -> a
+    657:657: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):1269 -> a
+    658:675: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):1270:1287 -> a
+    676:676:boolean com.android.tools.r8.graph.DexDefinition.isDexEncodedField():0:0 -> a
+    676:676: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):1287 -> a
+    677:699: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):1288:1310 -> a
+    700:708: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):1304:1312 -> a
+    709:709:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isReprocessMethodRule():0:0 -> a
+    709:709: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):1314 -> a
+    710:720: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):1315:1325 -> a
+    721:737: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):1319:1335 -> a
+    738:738:java.util.Set lambda$addItemToSets$16(com.android.tools.r8.graph.DexType):1140:1140 -> a
+    739:739:com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules lambda$addItemToSets$17(com.android.tools.r8.graph.DexReference):1148:1148 -> a
+    740:744:void reportAssumeNoSideEffectsWarningForJavaLangClassMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule):1716:1720 -> a
+    745:745:java.util.Set lambda$reportAssumeNoSideEffectsWarningForJavaLangClassMethod$21(com.android.tools.r8.utils.OriginWithPosition):1719:1719 -> a
+    746:746:boolean isWaitOrNotifyMethod(com.android.tools.r8.graph.DexMethod):1724:1724 -> a
+    747:758:void lambda$generateAssumeNoSideEffectsWarnings$22(com.android.tools.r8.utils.OriginWithPosition,java.util.Set):1743:1754 -> a
+    759:759:void lambda$generateAssumeNoSideEffectsWarnings$22(com.android.tools.r8.utils.OriginWithPosition,java.util.Set):1749:1749 -> a
+    1:1:com.android.tools.r8.shaking.DexStringCache access$300(com.android.tools.r8.shaking.RootSetBuilder):81:81 -> b
+    2:2:boolean lambda$process$1(com.android.tools.r8.graph.DexDefinition):205:205 -> b
+    3:12:com.android.tools.r8.graph.DexDefinition testAndGetPrecondition(com.android.tools.r8.graph.DexDefinition,java.util.Map):455:464 -> 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):498:499 -> 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):665:666 -> 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):678:678 -> 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):693:701 -> 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):698:699 -> b
+    29:29:boolean satisfyClassType(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):781:781 -> b
+    29:29:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):154 -> b
+    30:30:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):157:157 -> b
+    31:31:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):790:790 -> b
+    31:31:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):160 -> b
+    32:32:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):937:937 -> b
+    32:32:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):790 -> b
+    32:32:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):160 -> b
+    33:86:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):164:217 -> b
+    87:106:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):194:213 -> b
+    107:186:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):187:266 -> b
+    187:188:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):257:258 -> b
+    189:189:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):250:250 -> b
+    190:192:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):241:243 -> b
+    193:195:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):242:244 -> b
+    196:196:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):224:224 -> b
+    197:197:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):790:790 -> b
+    198:198:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):937:937 -> b
+    198:198:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):790 -> b
+    199:199:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):802:802 -> b
+    199:199:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):794 -> b
+    200:210:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):812:822 -> b
+    200:210:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):802 -> b
+    200:210:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):794 -> b
+    211:211:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):937:937 -> b
+    211:211:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):822 -> b
+    211:211:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):802 -> b
+    211:211:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):794 -> b
+    212:216:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):824:828 -> b
+    212:216:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):802 -> b
+    212:216:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):794 -> b
+    217:217:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):807:807 -> b
+    217:217:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):794 -> b
+    218:223:boolean satisfyImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):834:839 -> b
+    218:223:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):798 -> b
+    224:226:boolean ruleSatisfiedByMethods(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):914:916 -> b
+    227:227:com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules lambda$addItemToSets$18(com.android.tools.r8.graph.DexReference):1157:1157 -> b
+    228:237:void generateAssumeNoSideEffectsWarnings():1731:1740 -> 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):81:81 -> 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):476:510 -> 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):511 -> 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):512:515 -> 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):1058:1058 -> e
+com.android.tools.r8.shaking.RootSetBuilder$1 -> com.android.tools.r8.shaking.G1$a:
+    int[] $SwitchMap$com$android$tools$r8$shaking$ReprocessMethodRule$Type -> f
     int[] $SwitchMap$com$android$tools$r8$shaking$InlineRule$Type -> b
     int[] $SwitchMap$com$android$tools$r8$shaking$ClassInlineRule$Type -> c
-    int[] $SwitchMap$com$android$tools$r8$shaking$ReprocessClassInitializerRule$Type -> d
-    int[] $SwitchMap$com$android$tools$r8$shaking$ReprocessMethodRule$Type -> e
+    int[] $SwitchMap$com$android$tools$r8$shaking$MemberValuePropagationRule$Type -> d
+    int[] $SwitchMap$com$android$tools$r8$shaking$ReprocessClassInitializerRule$Type -> e
     int[] $SwitchMap$com$android$tools$r8$shaking$ProguardKeepRuleType -> a
-    1:1:void <clinit>():1331:1331 -> <clinit>
-    2:2:void <clinit>():1316:1316 -> <clinit>
-    3:3:void <clinit>():1279:1279 -> <clinit>
-    4:4:void <clinit>():1258:1258 -> <clinit>
-    5:5:void <clinit>():1223:1223 -> <clinit>
-    6:6:void <clinit>():186:186 -> <clinit>
-com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet -> com.android.tools.r8.shaking.G1$b:
-    1:1:void <init>(java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules,com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.List):2176:2176 -> <init>
-com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSetBuilder -> com.android.tools.r8.shaking.G1$c:
-    com.android.tools.r8.shaking.Enqueuer enqueuer -> N
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.RootSetUtils$1):2139:2139 -> <init>
-    2:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.Enqueuer):2147:2148 -> <init>
-    1:1:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2153:2153 -> a
-    2:2:boolean com.android.tools.r8.shaking.AnnotationMatchResult.isConcreteAnnotationMatchResult():0:0 -> a
-    2:2:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2154 -> a
-    3:5:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2155:2155 -> a
-com.android.tools.r8.shaking.RootSetUtils$ItemsWithRules -> com.android.tools.r8.shaking.G1$d:
-    1:1:void <init>():1537:1537 -> <init>
+    1:1:void <clinit>():1317:1317 -> <clinit>
+    2:2:void <clinit>():1302:1302 -> <clinit>
+    3:3:void <clinit>():1265:1265 -> <clinit>
+    4:4:void <clinit>():1241:1241 -> <clinit>
+    5:5:void <clinit>():1206:1206 -> <clinit>
+    6:6:void <clinit>():184:184 -> <clinit>
+com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet -> com.android.tools.r8.shaking.G1$b:
+    1:1:void <init>(java.util.Set,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):2133:2133 -> <init>
+com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules -> com.android.tools.r8.shaking.G1$c:
+    1:1:void <init>():1481:1481 -> <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):1550:1550 -> a
+    1:1:boolean containsReference(com.android.tools.r8.graph.DexReference):1494:1494 -> 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):1580:1580 -> b
-com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules -> com.android.tools.r8.shaking.G1$e:
+    1:1:java.util.Set getRulesForReference(com.android.tools.r8.graph.DexReference):1524:1524 -> b
+com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules -> com.android.tools.r8.shaking.G1$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
-    com.android.tools.r8.shaking.RootSetUtils$ItemsWithRules EMPTY -> a
-    1:3:void <clinit>():1587:1589 -> <clinit>
-    1:1:void <init>():1596:1596 -> <init>
-    2:5:void <init>(java.util.Map,java.util.Map,java.util.Map):1602:1605 -> <init>
-    1:1:com.android.tools.r8.shaking.RootSetUtils$ItemsWithRules access$800():1585:1585 -> a
-    2:2:void addAll(com.android.tools.r8.shaking.RootSetUtils$ItemsWithRules):1609:1609 -> a
-    3:3:void forEachClass(java.util.function.BiConsumer):1675:1675 -> a
-    3:3:void addAll(com.android.tools.r8.shaking.RootSetUtils$ItemsWithRules):1609 -> a
-    4:4:void addAll(com.android.tools.r8.shaking.RootSetUtils$ItemsWithRules):1610:1610 -> a
-    5:5:void forEachField(java.util.function.BiConsumer):1685:1685 -> a
-    5:5:void addAll(com.android.tools.r8.shaking.RootSetUtils$ItemsWithRules):1610 -> a
-    6:6:void addAll(com.android.tools.r8.shaking.RootSetUtils$ItemsWithRules):1611:1611 -> a
-    7:7:void forEachMethod(java.util.function.BiConsumer):1708:1708 -> a
-    7:7:void addAll(com.android.tools.r8.shaking.RootSetUtils$ItemsWithRules):1611 -> a
-    8:8:void addClassWithRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):1615:1615 -> a
-    9:9:void addClassWithRules(com.android.tools.r8.graph.DexType,java.util.Set):1619:1619 -> a
-    10:10:void addFieldWithRule(com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.ProguardKeepRuleBase):1623:1623 -> a
-    11:11:void addFieldWithRules(com.android.tools.r8.graph.DexField,java.util.Set):1627:1627 -> a
-    12:12:void addMethodWithRule(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.ProguardKeepRuleBase):1631:1631 -> a
-    13:13:void addMethodWithRules(com.android.tools.r8.graph.DexMethod,java.util.Set):1635:1635 -> a
-    14:14:void addReferenceWithRule(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.ProguardKeepRuleBase):1639:1639 -> a
-    15:15:boolean containsClass(com.android.tools.r8.graph.DexType):1650:1650 -> a
-    16:16:boolean containsField(com.android.tools.r8.graph.DexField):1655:1655 -> a
-    17:17:boolean containsMethod(com.android.tools.r8.graph.DexMethod):1660:1660 -> a
-    18:18:void forEachClass(java.util.function.Consumer):1670:1670 -> a
-    1:1:java.util.Set getRulesForClass(com.android.tools.r8.graph.DexType):1713:1713 -> b
-    2:2:java.util.Set getRulesForField(com.android.tools.r8.graph.DexField):1718:1718 -> b
-    3:3:java.util.Set getRulesForMethod(com.android.tools.r8.graph.DexMethod):1723:1723 -> b
-    4:4:void putAll(com.android.tools.r8.shaking.RootSetUtils$ItemsWithRules):1743:1743 -> b
-    5:5:void forEachClass(java.util.function.BiConsumer):1675:1675 -> b
-    5:5:void putAll(com.android.tools.r8.shaking.RootSetUtils$ItemsWithRules):1743 -> b
-    6:6:void putAll(com.android.tools.r8.shaking.RootSetUtils$ItemsWithRules):1744:1744 -> b
-    7:7:void forEachField(java.util.function.BiConsumer):1685:1685 -> b
-    7:7:void putAll(com.android.tools.r8.shaking.RootSetUtils$ItemsWithRules):1744 -> b
-    8:8:void putAll(com.android.tools.r8.shaking.RootSetUtils$ItemsWithRules):1745:1745 -> b
-    9:9:void forEachMethod(java.util.function.BiConsumer):1708:1708 -> b
-    9:9:void putAll(com.android.tools.r8.shaking.RootSetUtils$ItemsWithRules):1745 -> b
-    10:10:void putClassWithRules(com.android.tools.r8.graph.DexType,java.util.Set):1749:1749 -> b
-    11:11:void putFieldWithRules(com.android.tools.r8.graph.DexField,java.util.Set):1753:1753 -> b
-    12:12:void putMethodWithRules(com.android.tools.r8.graph.DexMethod,java.util.Set):1757:1757 -> b
-    1:1:java.util.Set lambda$addClassWithRule$0(com.android.tools.r8.graph.DexType):1615:1615 -> c
-    2:2:java.util.Set lambda$addFieldWithRule$2(com.android.tools.r8.graph.DexField):1623:1623 -> c
-    3:3:java.util.Set lambda$addMethodWithRule$4(com.android.tools.r8.graph.DexMethod):1631:1631 -> c
-    4:4:void removeReference(com.android.tools.r8.graph.DexReference):1739:1739 -> c
-    1:1:java.util.Set lambda$addClassWithRules$1(com.android.tools.r8.graph.DexType):1619:1619 -> d
-    2:2:java.util.Set lambda$addFieldWithRules$3(com.android.tools.r8.graph.DexField):1627:1627 -> d
-    3:3:java.util.Set lambda$addMethodWithRules$5(com.android.tools.r8.graph.DexMethod):1635:1635 -> d
-    1:1:void removeClass(com.android.tools.r8.graph.DexType):1727:1727 -> e
-    2:2:void removeField(com.android.tools.r8.graph.DexField):1731:1731 -> e
-    3:3:void removeMethod(com.android.tools.r8.graph.DexMethod):1735:1735 -> e
-com.android.tools.r8.shaking.RootSetUtils$RootSet -> com.android.tools.r8.shaking.G1$f:
+    1:3:void <clinit>():1531:1533 -> <clinit>
+    1:1:void <init>():1540:1540 -> <init>
+    2:5:void <init>(java.util.Map,java.util.Map,java.util.Map):1546:1549 -> <init>
+    1:1:com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules access$800():1529:1529 -> a
+    2:2:void addAll(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):1553:1553 -> a
+    3:3:void forEachClass(java.util.function.BiConsumer):1619:1619 -> a
+    3:3:void addAll(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):1553 -> a
+    4:4:void addAll(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):1554:1554 -> a
+    5:5:void forEachField(java.util.function.BiConsumer):1629:1629 -> a
+    5:5:void addAll(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):1554 -> a
+    6:6:void addAll(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):1555:1555 -> a
+    7:7:void forEachMethod(java.util.function.BiConsumer):1652:1652 -> a
+    7:7:void addAll(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):1555 -> a
+    8:8:void addClassWithRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):1559:1559 -> a
+    9:9:void addClassWithRules(com.android.tools.r8.graph.DexType,java.util.Set):1563:1563 -> a
+    10:10:void addFieldWithRule(com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.ProguardKeepRuleBase):1567:1567 -> a
+    11:11:void addFieldWithRules(com.android.tools.r8.graph.DexField,java.util.Set):1571:1571 -> a
+    12:12:void addMethodWithRule(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.ProguardKeepRuleBase):1575:1575 -> a
+    13:13:void addMethodWithRules(com.android.tools.r8.graph.DexMethod,java.util.Set):1579:1579 -> a
+    14:14:void addReferenceWithRule(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.ProguardKeepRuleBase):1583:1583 -> a
+    15:15:boolean containsClass(com.android.tools.r8.graph.DexType):1594:1594 -> a
+    16:16:boolean containsField(com.android.tools.r8.graph.DexField):1599:1599 -> a
+    17:17:boolean containsMethod(com.android.tools.r8.graph.DexMethod):1604:1604 -> a
+    18:18:void forEachClass(java.util.function.Consumer):1614:1614 -> a
+    1:1:java.util.Set getRulesForClass(com.android.tools.r8.graph.DexType):1657:1657 -> b
+    2:2:java.util.Set getRulesForField(com.android.tools.r8.graph.DexField):1662:1662 -> b
+    3:3:java.util.Set getRulesForMethod(com.android.tools.r8.graph.DexMethod):1667:1667 -> b
+    4:4:void putAll(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):1687:1687 -> b
+    5:5:void forEachClass(java.util.function.BiConsumer):1619:1619 -> b
+    5:5:void putAll(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):1687 -> b
+    6:6:void putAll(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):1688:1688 -> b
+    7:7:void forEachField(java.util.function.BiConsumer):1629:1629 -> b
+    7:7:void putAll(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):1688 -> b
+    8:8:void putAll(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):1689:1689 -> b
+    9:9:void forEachMethod(java.util.function.BiConsumer):1652:1652 -> b
+    9:9:void putAll(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):1689 -> b
+    10:10:void putClassWithRules(com.android.tools.r8.graph.DexType,java.util.Set):1693:1693 -> b
+    11:11:void putFieldWithRules(com.android.tools.r8.graph.DexField,java.util.Set):1697:1697 -> b
+    12:12:void putMethodWithRules(com.android.tools.r8.graph.DexMethod,java.util.Set):1701:1701 -> b
+    1:1:java.util.Set lambda$addClassWithRule$0(com.android.tools.r8.graph.DexType):1559:1559 -> c
+    2:2:java.util.Set lambda$addFieldWithRule$2(com.android.tools.r8.graph.DexField):1567:1567 -> c
+    3:3:java.util.Set lambda$addMethodWithRule$4(com.android.tools.r8.graph.DexMethod):1575:1575 -> c
+    4:4:void removeReference(com.android.tools.r8.graph.DexReference):1683:1683 -> c
+    1:1:java.util.Set lambda$addClassWithRules$1(com.android.tools.r8.graph.DexType):1563:1563 -> d
+    2:2:java.util.Set lambda$addFieldWithRules$3(com.android.tools.r8.graph.DexField):1571:1571 -> d
+    3:3:java.util.Set lambda$addMethodWithRules$5(com.android.tools.r8.graph.DexMethod):1579:1579 -> d
+    1:1:void removeClass(com.android.tools.r8.graph.DexType):1671:1671 -> e
+    2:2:void removeField(com.android.tools.r8.graph.DexField):1675:1675 -> e
+    3:3:void removeMethod(com.android.tools.r8.graph.DexMethod):1679:1679 -> e
+com.android.tools.r8.shaking.RootSetBuilder$RootSet -> com.android.tools.r8.shaking.G1$e:
     java.util.Set noUnusedInterfaceRemoval -> w
     java.util.Set noVerticalClassMerging -> x
     java.util.Set noHorizontalClassMerging -> y
-    java.util.Set neverPropagateValue -> z
+    java.util.Set noStaticClassMerging -> z
     java.util.Set keepUnusedArguments -> s
     java.util.Set reprocess -> t
     boolean $assertionsDisabled -> k
     java.util.Set neverReprocess -> u
+    java.util.Set neverPropagateValue -> A
     com.android.tools.r8.utils.PredicateSet alwaysClassInline -> v
-    java.util.Map mayHaveSideEffects -> A
     com.android.tools.r8.com.google.common.collect.ImmutableList checkDiscarded -> m
-    java.util.Map noSideEffects -> B
-    java.util.Map assumedValues -> C
-    java.util.Set identifierNameStrings -> D
+    java.util.Map mayHaveSideEffects -> B
+    java.util.Map noSideEffects -> C
+    java.util.Map assumedValues -> D
     com.android.tools.r8.com.google.common.collect.ImmutableList reasonAsked -> l
-    java.util.Set ifRules -> E
+    java.util.Set identifierNameStrings -> E
+    java.util.Set ifRules -> F
     java.util.Set forceInline -> o
     java.util.Set bypassClinitForInlining -> p
     java.util.Set whyAreYouNotInlining -> q
     java.util.Set keepConstantArguments -> r
     java.util.Set alwaysInline -> n
-    1:1:void <clinit>():1770:1770 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules,com.android.tools.r8.shaking.RootSetUtils$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,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.RootSetUtils$1):1770:1770 -> <init>
-    2:32:void <init>(com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules,com.android.tools.r8.shaking.RootSetUtils$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,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):1824:1854 -> <init>
-    1:9:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1858:1866 -> a
-    10:24:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,boolean):1874:1888 -> a
-    25:25:java.util.Set lambda$addConsequentRootSet$0(com.android.tools.r8.graph.DexType):1886:1886 -> a
-    26:27:void lambda$addConsequentRootSet$1(com.android.tools.r8.graph.DexType,java.util.Set):1886:1887 -> a
-    28:28:void addDependentItems(java.util.Map,java.util.Map):1895:1895 -> a
-    29:29:com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules lambda$addDependentItems$2(com.android.tools.r8.graph.DexReference):1898:1898 -> a
-    30:31:void lambda$addDependentItems$3(java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.RootSetUtils$ItemsWithRules):1898:1899 -> a
-    32:36:void pruneDeadItems(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer):1929:1933 -> a
-    37:37:void pruneDeadReferences(java.util.Set,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer):1940:1940 -> a
-    38:38:boolean lambda$pruneDeadReferences$4(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexReference):1942:1942 -> a
+    1:1:void <clinit>():1758:1758 -> <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,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):1758:1758 -> <init>
+    2:33: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,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):1814:1845 -> <init>
+    1:9:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1849:1857 -> a
+    10:23:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):1865:1878 -> a
+    24:25:void lambda$addConsequentRootSet$1(com.android.tools.r8.graph.DexType,java.util.Set):1876:1877 -> a
+    26:26:java.util.Set lambda$addConsequentRootSet$0(com.android.tools.r8.graph.DexType):1877:1877 -> a
+    27:27:void addDependentItems(java.util.Map,java.util.Map):1885:1885 -> a
+    28:28:com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules lambda$addDependentItems$2(com.android.tools.r8.graph.DexReference):1888:1888 -> a
+    29:30:void lambda$addDependentItems$3(java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):1888:1889 -> a
+    31:36:void pruneDeadItems(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer):1919:1924 -> a
+    37:37:void pruneDeadReferences(java.util.Set,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer):1931:1931 -> a
+    38:38:boolean lambda$pruneDeadReferences$4(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexReference):1933:1933 -> a
     39:39:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
-    39:39:boolean lambda$pruneDeadReferences$4(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexReference):1942 -> a
-    40:52:boolean lambda$pruneDeadReferences$4(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexReference):1943:1955 -> a
+    39:39:boolean lambda$pruneDeadReferences$4(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexReference):1933 -> a
+    40:52:boolean lambda$pruneDeadReferences$4(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexReference):1934:1946 -> a
     53:53:boolean com.android.tools.r8.graph.DexDefinition.isDexEncodedField():0:0 -> a
-    53:53:boolean lambda$pruneDeadReferences$4(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexReference):1956 -> a
-    54:61:boolean lambda$pruneDeadReferences$4(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexReference):1957:1964 -> a
-    62:62:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1978:1978 -> a
-    63:63:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachField(java.util.function.Consumer):1680:1680 -> a
-    63:63:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1978 -> a
-    64:64:void lambda$verifyKeptFieldsAreAccessedAndLive$5(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexField):1980:1980 -> a
+    53:53:boolean lambda$pruneDeadReferences$4(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexReference):1947 -> a
+    54:61:boolean lambda$pruneDeadReferences$4(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexReference):1948:1955 -> a
+    62:62:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1969:1969 -> a
+    63:63:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachField(java.util.function.Consumer):1624:1624 -> a
+    63:63:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1969 -> a
+    64:64:void lambda$verifyKeptFieldsAreAccessedAndLive$5(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexField):1971:1971 -> a
     65:65:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
-    65:65:void lambda$verifyKeptFieldsAreAccessedAndLive$5(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexField):1980 -> a
-    66:66:void lambda$verifyKeptFieldsAreAccessedAndLive$5(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexField):1981:1981 -> a
-    67:67:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():209:209 -> a
-    67:67:void lambda$verifyKeptFieldsAreAccessedAndLive$5(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexField):1983 -> a
-    68:72:void lambda$verifyKeptFieldsAreAccessedAndLive$5(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexField):1984:1988 -> a
-    73:76:void lambda$verifyKeptMethodsAreTargetedAndLive$6(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexMethod):1997:2000 -> a
+    65:65:void lambda$verifyKeptFieldsAreAccessedAndLive$5(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexField):1971 -> a
+    66:66:void lambda$verifyKeptFieldsAreAccessedAndLive$5(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexField):1972:1972 -> a
+    67:67:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():199:199 -> a
+    67:67:void lambda$verifyKeptFieldsAreAccessedAndLive$5(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexField):1974 -> a
+    68:72:void lambda$verifyKeptFieldsAreAccessedAndLive$5(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexField):1975:1979 -> a
+    73:76:void lambda$verifyKeptMethodsAreTargetedAndLive$6(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexMethod):1988:1991 -> a
     77:77:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
-    77:77:void lambda$verifyKeptMethodsAreTargetedAndLive$6(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexMethod):2000 -> a
-    78:83:void lambda$verifyKeptMethodsAreTargetedAndLive$6(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexMethod):2000:2005 -> a
-    84:84:void lambda$verifyKeptTypesAreLive$7(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexType):2015:2015 -> a
-    85:86:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isLiveProgramType(com.android.tools.r8.graph.DexType):515:516 -> a
-    85:86:void lambda$verifyKeptTypesAreLive$7(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexType):2015 -> a
-    87:88:void lambda$verifyKeptTypesAreLive$7(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexType):2015:2016 -> a
-    89:89:boolean isKeptDirectlyOrIndirectly(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.AppInfoWithLiveness):2022:2022 -> a
-    90:90:boolean com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.containsClass(com.android.tools.r8.graph.DexType):1650:1650 -> a
-    90:90:boolean isKeptDirectlyOrIndirectly(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.AppInfoWithLiveness):2022 -> a
-    91:96:boolean isKeptDirectlyOrIndirectly(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.AppInfoWithLiveness):2025:2030 -> a
-    97:108:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2036:2047 -> a
-    109:109:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachField(java.util.function.Consumer):1680:1680 -> a
-    109:109:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachMember(java.util.function.Consumer):1690 -> a
-    109:109:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2047 -> a
-    110:110:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachMethod(java.util.function.Consumer):1703:1703 -> a
-    110:110:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachMember(java.util.function.Consumer):1691 -> a
-    110:110:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2047 -> a
-    111:157:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2058:2104 -> a
-    158:161: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):2042:2045 -> a
-    162:162: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):2049:2049 -> a
-    163:165:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.GraphLens.getRenamedMemberSignature(com.android.tools.r8.graph.DexMember):314:316 -> a
-    163:165: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):2049 -> a
-    166:166:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):320:320 -> a
-    166:166:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.GraphLens.getRenamedMemberSignature(com.android.tools.r8.graph.DexMember):316 -> a
-    166:166: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):2049 -> a
-    167:171: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):2050:2054 -> a
-    172:172:com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):2135:2135 -> a
-    1:1:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1995:1995 -> b
-    2:2:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachMethod(java.util.function.Consumer):1703:1703 -> b
-    2:2:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1995 -> b
-    3:3:java.util.Set lambda$verifyKeptItemsAreKept$10(com.android.tools.r8.graph.DexType):2053:2053 -> b
-    1:1:boolean verifyKeptTypesAreLive(com.android.tools.r8.shaking.AppInfoWithLiveness):2013:2013 -> c
-    2:2:java.util.Set lambda$verifyKeptItemsAreKept$8(com.android.tools.r8.graph.DexType):2045:2045 -> c
-    1:3:java.lang.String toString():2112:2114 -> toString
-    4:4:int com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.size():1766:1766 -> toString
-    4:4:java.lang.String toString():2114 -> toString
-    5:14:java.lang.String toString():2114:2123 -> toString
-com.android.tools.r8.shaking.RootSetUtils$RootSetBase -> com.android.tools.r8.shaking.G1$g:
-    com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules softPinned -> e
+    77:77:void lambda$verifyKeptMethodsAreTargetedAndLive$6(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexMethod):1991 -> a
+    78:83:void lambda$verifyKeptMethodsAreTargetedAndLive$6(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexMethod):1991:1996 -> a
+    84:84:void lambda$verifyKeptTypesAreLive$7(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexType):2006:2006 -> a
+    85:86:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isLiveProgramType(com.android.tools.r8.graph.DexType):512:513 -> a
+    85:86:void lambda$verifyKeptTypesAreLive$7(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexType):2006 -> a
+    87:88:void lambda$verifyKeptTypesAreLive$7(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexType):2006:2007 -> a
+    89:89:boolean isKeptDirectlyOrIndirectly(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.AppInfoWithLiveness):2013:2013 -> a
+    90:90:boolean com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.containsClass(com.android.tools.r8.graph.DexType):1594:1594 -> a
+    90:90:boolean isKeptDirectlyOrIndirectly(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.AppInfoWithLiveness):2013 -> a
+    91:96:boolean isKeptDirectlyOrIndirectly(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.AppInfoWithLiveness):2016:2021 -> a
+    97:108:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2027:2038 -> a
+    109:109:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachField(java.util.function.Consumer):1624:1624 -> a
+    109:109:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMember(java.util.function.Consumer):1634 -> a
+    109:109:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2038 -> a
+    110:110:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMethod(java.util.function.Consumer):1647:1647 -> a
+    110:110:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMember(java.util.function.Consumer):1635 -> a
+    110:110:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2038 -> a
+    111:152:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2049:2090 -> a
+    153:153:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    153:153:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2091 -> a
+    154:157:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2092:2095 -> a
+    158:161: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):2033:2036 -> a
+    162:162: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):2040:2040 -> a
+    163:165:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.GraphLens.getRenamedMemberSignature(com.android.tools.r8.graph.DexMember):315:317 -> a
+    163:165: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):2040 -> a
+    166:166:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):321:321 -> a
+    166:166:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.GraphLens.getRenamedMemberSignature(com.android.tools.r8.graph.DexMember):317 -> a
+    166:166: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):2040 -> a
+    167:171: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):2041:2045 -> a
+    1:1:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1986:1986 -> b
+    2:2:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMethod(java.util.function.Consumer):1647:1647 -> b
+    2:2:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1986 -> b
+    3:3:java.util.Set lambda$verifyKeptItemsAreKept$10(com.android.tools.r8.graph.DexType):2044:2044 -> b
+    1:1:boolean verifyKeptTypesAreLive(com.android.tools.r8.shaking.AppInfoWithLiveness):2004:2004 -> c
+    2:2:java.util.Set lambda$verifyKeptItemsAreKept$8(com.android.tools.r8.graph.DexType):2036:2036 -> c
+    1:3:java.lang.String toString():2103:2105 -> toString
+    4:4:int com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.size():1710:1710 -> toString
+    4:4:java.lang.String toString():2105 -> toString
+    5:14:java.lang.String toString():2105:2114 -> toString
+com.android.tools.r8.shaking.RootSetBuilder$RootSetBase -> com.android.tools.r8.shaking.G1$f:
     java.util.Set neverClassInline -> c
-    com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules noShrinking -> d
     java.util.Set noObfuscation -> f
     java.util.Map dependentKeepClassCompatRule -> i
     java.util.List delayedRootSetActionItems -> j
+    com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules softPinned -> e
     java.util.Set neverInline -> a
+    com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules noShrinking -> d
     java.util.Set neverInlineDueToSingleCaller -> b
     java.util.Map dependentNoShrinking -> g
     java.util.Map dependentSoftPinned -> h
-    1:11:void <init>(java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules,com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.List):1418:1428 -> <init>
-    1:1:void forEachMemberWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.BiConsumer):1447:1447 -> a
-    2:9: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.RootSetUtils$MutableItemsWithRules):1449:1456 -> a
-    10:11:void forEachDependentInstanceConstructor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,java.util.function.BiConsumer):1467:1468 -> a
-    12:12:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachMethod(java.util.function.BiConsumer):1708:1708 -> a
-    12:12:void forEachDependentInstanceConstructor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,java.util.function.BiConsumer):1468 -> a
-    13:13:void lambda$forEachDependentInstanceConstructor$1(com.android.tools.r8.graph.AppView,java.util.function.BiConsumer,com.android.tools.r8.graph.DexMethod,java.util.Set):1471:1471 -> a
+    1:11:void <init>(java.util.Set,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):1362:1372 -> <init>
+    1:1:void forEachMemberWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.BiConsumer):1391:1391 -> a
+    2:9: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):1393:1400 -> a
+    10:11:void forEachDependentInstanceConstructor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,java.util.function.BiConsumer):1411:1412 -> a
+    12:12:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMethod(java.util.function.BiConsumer):1652:1652 -> a
+    12:12:void forEachDependentInstanceConstructor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,java.util.function.BiConsumer):1412 -> a
+    13:13:void lambda$forEachDependentInstanceConstructor$1(com.android.tools.r8.graph.AppView,java.util.function.BiConsumer,com.android.tools.r8.graph.DexMethod,java.util.Set):1415:1415 -> a
     14:14:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
-    14:14:void lambda$forEachDependentInstanceConstructor$1(com.android.tools.r8.graph.AppView,java.util.function.BiConsumer,com.android.tools.r8.graph.DexMethod,java.util.Set):1471 -> a
-    15:19:void lambda$forEachDependentInstanceConstructor$1(com.android.tools.r8.graph.AppView,java.util.function.BiConsumer,com.android.tools.r8.graph.DexMethod,java.util.Set):1471:1475 -> a
-    20:21:void forEachDependentMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1485:1486 -> a
-    22:22:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachField(java.util.function.BiConsumer):1685:1685 -> a
-    22:22:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachMember(java.util.function.BiConsumer):1697 -> a
-    22:22:void forEachDependentMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1486 -> a
-    23:23:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachMethod(java.util.function.BiConsumer):1708:1708 -> a
-    23:23:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachMember(java.util.function.BiConsumer):1698 -> a
-    23:23:void forEachDependentMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1486 -> a
-    24:24: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):1489:1489 -> a
+    14:14:void lambda$forEachDependentInstanceConstructor$1(com.android.tools.r8.graph.AppView,java.util.function.BiConsumer,com.android.tools.r8.graph.DexMethod,java.util.Set):1415 -> a
+    15:19:void lambda$forEachDependentInstanceConstructor$1(com.android.tools.r8.graph.AppView,java.util.function.BiConsumer,com.android.tools.r8.graph.DexMethod,java.util.Set):1415:1419 -> a
+    20:21:void forEachDependentMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1429:1430 -> a
+    22:22:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachField(java.util.function.BiConsumer):1629:1629 -> a
+    22:22:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMember(java.util.function.BiConsumer):1641 -> a
+    22:22:void forEachDependentMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1430 -> a
+    23:23:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMethod(java.util.function.BiConsumer):1652:1652 -> a
+    23:23:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMember(java.util.function.BiConsumer):1642 -> a
+    23:23:void forEachDependentMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1430 -> a
+    24:24: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):1433:1433 -> a
     25:25:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
-    25:25: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):1489 -> a
-    26:26: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):1489:1489 -> a
-    27:29:com.android.tools.r8.graph.ProgramMember com.android.tools.r8.graph.DexProgramClass.lookupProgramMember(com.android.tools.r8.graph.DexMember):275:277 -> a
-    27:29: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):1491 -> a
-    30:30: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):1493:1493 -> a
-    31:32:void lambda$forEachDependentNonStaticMember$3(com.android.tools.r8.utils.Consumer3,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.ProgramMember,java.util.Set):1507:1508 -> a
-    33:33:com.android.tools.r8.shaking.RootSetUtils$ItemsWithRules getDependentItems(com.android.tools.r8.graph.DexDefinition):1528:1528 -> a
-    34:34:com.android.tools.r8.shaking.RootSetUtils$ItemsWithRules com.android.tools.r8.shaking.RootSetUtils$ItemsWithRules.empty():1540:1540 -> a
-    34:34:com.android.tools.r8.shaking.RootSetUtils$ItemsWithRules getDependentItems(com.android.tools.r8.graph.DexDefinition):1529 -> a
-    1:1:void forEachDependentNonStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1503:1503 -> b
-    2:3:void lambda$forEachDependentStaticMember$4(com.android.tools.r8.utils.Consumer3,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.ProgramMember,java.util.Set):1521:1522 -> b
-    1:1:void forEachDependentStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1517:1517 -> c
-com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder -> com.android.tools.r8.shaking.G1$h:
-    com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules softPinned -> g
-    java.util.Set noUnusedInterfaceRemoval -> w
-    java.util.Set noHorizontalClassMerging -> y
-    java.util.Set reprocess -> s
-    java.lang.Iterable rules -> e
-    java.util.LinkedHashMap reasonAsked -> i
-    java.util.Map dependentSoftPinned -> B
-    java.util.Map mayHaveSideEffects -> D
-    com.android.tools.r8.graph.DirectMappedDexApplication application -> d
-    java.util.Set bypassClinitforInlining -> o
-    java.util.Set keepParametersWithConstantValue -> q
-    java.util.Map assumeNoSideEffectsWarnings -> L
-    java.util.Set alwaysInline -> k
-    java.util.Map assumedValues -> F
-    java.util.Set neverInline -> m
-    java.util.Set noVerticalClassMerging -> x
-    com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules noShrinking -> f
-    java.util.Set neverPropagateValue -> z
-    java.util.Queue delayedRootSetActionItems -> H
-    com.android.tools.r8.graph.AppView appView -> b
-    java.util.Set neverReprocess -> t
-    java.util.Set neverClassInline -> v
-    com.android.tools.r8.utils.PredicateSet alwaysClassInline -> u
-    com.android.tools.r8.utils.InternalOptions options -> I
-    java.util.LinkedHashMap checkDiscarded -> j
-    java.util.Map dependentNoShrinking -> A
-    java.util.Set identifierNameStrings -> G
-    java.util.Set noObfuscation -> h
-    java.util.Map dependentKeepClassCompatRule -> C
-    com.android.tools.r8.shaking.DexStringCache dexStringCache -> J
-    java.util.Set whyAreYouNotInlining -> p
-    com.android.tools.r8.graph.SubtypingInfo subtypingInfo -> c
-    java.util.Set keepUnusedArguments -> r
-    boolean $assertionsDisabled -> a
-    java.util.Map noSideEffects -> E
-    java.util.Set ifRules -> K
-    java.util.Set forceInline -> l
-    java.util.Set neverInlineDueToSingleCaller -> n
-    com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple feedback -> M
-    1:1:void <clinit>():84:84 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.RootSetUtils$1):84:84 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable,com.android.tools.r8.shaking.RootSetUtils$1):84:84 -> <init>
-    3:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):137:137 -> <init>
-    4:56:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):90:142 -> <init>
-    57:57:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):147:147 -> <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.RootSetUtils$RootSetBuilder):84:84 -> a
-    2:2:com.android.tools.r8.graph.DexDefinition access$600(com.android.tools.r8.graph.DexDefinition,java.util.Map):84:84 -> a
-    3:3:void access$700(com.android.tools.r8.shaking.RootSetUtils$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):84:84 -> a
-    4:19:void runPerRule(java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):277:292 -> a
-    20:20:void runPerRule(java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):291:291 -> a
-    21:26:void lambda$runPerRule$4(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):295:300 -> a
-    27:61:com.android.tools.r8.shaking.RootSetUtils$RootSet build(java.util.concurrent.ExecutorService):307:341 -> a
-    62:65:com.android.tools.r8.shaking.RootSetUtils$RootSet build(java.util.concurrent.ExecutorService):340:343 -> a
-    66:66:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():558:558 -> a
-    66:66:com.android.tools.r8.shaking.RootSetUtils$RootSet build(java.util.concurrent.ExecutorService):343 -> a
-    67:98:com.android.tools.r8.shaking.RootSetUtils$RootSet build(java.util.concurrent.ExecutorService):343:374 -> a
-    99:99:com.android.tools.r8.shaking.RootSetUtils$RootSet build(java.util.concurrent.ExecutorService):323:323 -> a
-    100:111:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):378:389 -> a
-    112:146:void propagateAssumeRules(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.util.Set,java.util.Map):399:433 -> a
-    147:157:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet buildConsequentRootSet():438:448 -> a
-    158:159: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):495:496 -> a
-    160:161:boolean canInsertForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):638:639 -> a
-    160:161:boolean access$400(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):84 -> a
-    162:187: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:675 -> a
-    188:189: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):687:688 -> a
-    190:190: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):718:718 -> a
-    191:192: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):720:721 -> a
-    193:250:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):729:786 -> a
-    251:252:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexType):732:733 -> a
-    253:259:void lambda$writeSeeds$12(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):740:746 -> a
-    260:260:void lambda$writeSeeds$12(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):741:741 -> a
-    261:264:void lambda$writeSeeds$13(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):753:756 -> a
-    265:265:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
-    265:265:void lambda$writeSeeds$13(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):756 -> a
-    266:283:void lambda$writeSeeds$13(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):756:773 -> a
-    284:298:void lambda$writeSeeds$13(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):770:784 -> a
-    299:300:boolean satisfyAccessFlag(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):794:795 -> a
-    301:312:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):857:868 -> a
-    313:313:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):946:946 -> a
-    313:313:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):868 -> a
-    314:330:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):870:886 -> a
-    331:336:boolean anySourceMatchesInheritanceRuleDirectly(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,boolean):893:898 -> a
-    337:337:boolean lambda$anySourceMatchesInheritanceRuleDirectly$14(boolean,com.android.tools.r8.graph.DexType):897:897 -> a
-    338:338:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):903:903 -> a
-    339:342:boolean ruleSatisfied(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexClass):916:919 -> a
-    339:342:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):904 -> a
-    343:345:boolean ruleSatisfiedByFields(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):934:936 -> a
-    346:357:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexEncodedMember,java.util.function.Consumer):955:966 -> a
-    358:362:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexAnnotationSet):976:980 -> a
-    363:364:com.android.tools.r8.graph.DexAnnotation getFirstAnnotationThatMatches(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexAnnotationSet):993:994 -> a
-    363:364:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexAnnotationSet):982 -> a
-    365:367:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexAnnotationSet):986:988 -> a
-    368:376: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):1009:1017 -> a
-    377:377:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    377:377: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):1016 -> a
-    378:380: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):1020:1022 -> a
-    381:384: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):1033:1036 -> a
-    385:385:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    385:385: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):1036 -> a
-    386:386: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):1038:1038 -> a
-    387:388:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1044:1045 -> a
-    389:389:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    389:389:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1045 -> a
-    390:390:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1047:1047 -> a
-    391:409:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):1051:1069 -> a
-    410:410:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():558:558 -> a
-    410:410:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):1069 -> a
-    411:411:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):1070:1070 -> a
-    412:413: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):1095:1096 -> a
-    414:414:boolean com.android.tools.r8.graph.DexDefinition.isDexEncodedField():0:0 -> a
-    414:414: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):1096 -> a
-    415:433: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):1097:1115 -> a
-    434:434:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):261:261 -> a
-    434:434: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 -> a
-    435:440: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):1121:1126 -> a
-    441:449:boolean com.android.tools.r8.shaking.ProguardMemberRule.isSpecific():311:319 -> a
-    441:449: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 -> a
-    450:456: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):1127:1127 -> a
-    470: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):1141:1180 -> a
-    510:510:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():558:558 -> a
-    510:510: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):1180 -> a
-    511: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):1180:1184 -> a
-    516:520:void includeDescriptorClasses(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):1075:1079 -> a
-    516:520: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):1185 -> a
-    521:521:boolean com.android.tools.r8.graph.DexDefinition.isDexEncodedField():0:0 -> a
-    521:521:void includeDescriptorClasses(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):1081 -> a
-    521:521: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):1185 -> a
-    522:525:void includeDescriptorClasses(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):1082:1085 -> a
-    522:525: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):1185 -> a
-    526:537: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):1186:1197 -> a
-    538: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):1196:1237 -> 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):1234:1234 -> a
-    581:581: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):1231:1231 -> a
-    582:582: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):1228:1228 -> a
-    583:604: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):1225:1246 -> a
-    605:609: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):1243:1247 -> a
-    610:610:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isClassInlineRule():0:0 -> a
-    610:610: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):1247 -> a
-    611:629: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):1248:1266 -> a
-    630: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):1260:1268 -> a
-    639:671: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):1251:1283 -> a
-    672:672:boolean com.android.tools.r8.graph.DexDefinition.isDexEncodedField():0:0 -> a
-    672:672: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):1283 -> a
-    673:674: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):1284:1285 -> a
-    675:677:boolean com.android.tools.r8.graph.DexEncodedField.isProgramField(com.android.tools.r8.graph.DexDefinitionSupplier):102:104 -> a
-    675:677: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):1285 -> a
-    678:693: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):1286:1301 -> a
-    694:694:boolean com.android.tools.r8.graph.DexDefinition.isDexEncodedField():0:0 -> a
-    694:694: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 -> a
-    695: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):1302:1324 -> a
-    718:726: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):1318:1326 -> a
-    727:727:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isReprocessMethodRule():0:0 -> a
-    727:727: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):1328 -> a
-    728:738: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):1329:1339 -> a
-    739:755: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):1333:1349 -> a
-    756:756:java.util.Set lambda$addItemToSets$16(com.android.tools.r8.graph.DexType):1151:1151 -> a
-    757:757:com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules lambda$addItemToSets$17(com.android.tools.r8.graph.DexReference):1159:1159 -> a
-    758:762:void reportAssumeNoSideEffectsWarningForJavaLangClassMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule):1355:1359 -> a
-    763:763:java.util.Set lambda$reportAssumeNoSideEffectsWarningForJavaLangClassMethod$21(com.android.tools.r8.utils.OriginWithPosition):1358:1358 -> a
-    764:764:boolean isWaitOrNotifyMethod(com.android.tools.r8.graph.DexMethod):1363:1363 -> a
-    765:777:void lambda$generateAssumeNoSideEffectsWarnings$22(com.android.tools.r8.utils.OriginWithPosition,java.util.Set):1378:1390 -> a
-    778:778:void lambda$generateAssumeNoSideEffectsWarnings$22(com.android.tools.r8.utils.OriginWithPosition,java.util.Set):1385:1385 -> a
-    1:1:com.android.tools.r8.shaking.DexStringCache access$300(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):84:84 -> b
-    2:2:boolean lambda$process$1(com.android.tools.r8.graph.DexDefinition):207:207 -> b
-    3:12:com.android.tools.r8.graph.DexDefinition testAndGetPrecondition(com.android.tools.r8.graph.DexDefinition,java.util.Map):459:468 -> 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):503:504 -> 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):672:673 -> 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):685:685 -> 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):700:708 -> 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):705:706 -> b
-    29:29:boolean satisfyClassType(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):790:790 -> b
-    29:29:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):156 -> b
-    30:30:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):159:159 -> b
-    31:31:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):799:799 -> b
-    31:31:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):162 -> b
-    32:32:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):946:946 -> b
-    32:32:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):799 -> b
-    32:32:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):162 -> b
-    33:86:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):166:219 -> b
-    87:106:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):196:215 -> b
-    107:186:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):189:268 -> b
-    187:188:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):259:260 -> b
-    189:189:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):253:253 -> b
-    190:192:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):244:246 -> b
-    193:195:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):245:247 -> b
-    196:196:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):226:226 -> b
-    197:197:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):799:799 -> b
-    198:198:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):946:946 -> b
-    198:198:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):799 -> b
-    199:199:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):811:811 -> b
-    199:199:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):803 -> b
-    200:210:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):821:831 -> b
-    200:210:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):811 -> b
-    200:210:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):803 -> b
-    211:211:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):946:946 -> b
-    211:211:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):831 -> b
-    211:211:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):811 -> b
-    211:211:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):803 -> b
-    212:216:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):833:837 -> b
-    212:216:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):811 -> b
-    212:216:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):803 -> b
-    217:217:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):816:816 -> b
-    217:217:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):803 -> b
-    218:223:boolean satisfyImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):843:848 -> b
-    218:223:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):807 -> b
-    224:226:boolean ruleSatisfiedByMethods(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):923:925 -> b
-    227:227:com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules lambda$addItemToSets$18(com.android.tools.r8.graph.DexReference):1168:1168 -> b
-    228:234:void generateAssumeNoSideEffectsWarnings():1369:1375 -> 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.RootSetUtils$RootSetBuilder):84:84 -> c
-    2: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):480:515 -> c
-    38:38:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isProguardKeepRule():0:0 -> c
-    38:38: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):516 -> c
-    39:42: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):517:520 -> 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.RootSetUtils$MutableItemsWithRules lambda$includeDescriptor$15(com.android.tools.r8.graph.DexReference):1066:1066 -> e
-com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder$SynthesizeMissingInterfaceMethodsForMemberRules -> com.android.tools.r8.shaking.G1$h$a:
+    25:25: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):1433 -> a
+    26:26: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):1433:1433 -> a
+    27:29:com.android.tools.r8.graph.ProgramMember com.android.tools.r8.graph.DexProgramClass.lookupProgramMember(com.android.tools.r8.graph.DexMember):225:227 -> a
+    27:29: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):1435 -> a
+    30:30: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):1437:1437 -> a
+    31:32:void lambda$forEachDependentNonStaticMember$3(com.android.tools.r8.utils.Consumer3,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.ProgramMember,java.util.Set):1451:1452 -> a
+    33:33:com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules getDependentItems(com.android.tools.r8.graph.DexDefinition):1472:1472 -> a
+    34:34:com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules.empty():1484:1484 -> a
+    34:34:com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules getDependentItems(com.android.tools.r8.graph.DexDefinition):1473 -> a
+    1:1:void forEachDependentNonStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1447:1447 -> b
+    2:3:void lambda$forEachDependentStaticMember$4(com.android.tools.r8.utils.Consumer3,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.ProgramMember,java.util.Set):1465:1466 -> b
+    1:1:void forEachDependentStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1461:1461 -> c
+com.android.tools.r8.shaking.RootSetBuilder$SynthesizeMissingInterfaceMethodsForMemberRules -> com.android.tools.r8.shaking.G1$g:
     java.util.Set seenMethods -> g
     com.android.tools.r8.shaking.ProguardConfigurationRule context -> d
     java.util.Set seenTypes -> h
+    com.android.tools.r8.shaking.RootSetBuilder this$0 -> i
     java.util.Collection memberKeepRules -> c
     com.android.tools.r8.shaking.ProguardIfRule ifRule -> f
     com.android.tools.r8.graph.DexProgramClass originalClazz -> b
-    com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder this$0 -> i
     boolean $assertionsDisabled -> a
     java.util.Map preconditionSupplier -> e
-    1:1:void <clinit>():529:529 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.RootSetUtils$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.RootSetUtils$1):529:529 -> <init>
-    2:2:void <init>(com.android.tools.r8.shaking.RootSetUtils$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):544:544 -> <init>
-    3:18:void <init>(com.android.tools.r8.shaking.RootSetUtils$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):536:551 -> <init>
+    1:1:void <clinit>():524:524 -> <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):524:524 -> <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):538:538 -> <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):530:545 -> <init>
     void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult) -> a
-    1:1:void run():559:559 -> a
-    2:24:void visitAllSuperInterfaces(com.android.tools.r8.graph.DexType):563:585 -> a
-    25:49:void tryAndKeepMethodOnClass(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.ProguardMemberRule):592:616 -> a
-    50:52:void lambda$tryAndKeepMethodOnClass$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):621:623 -> a
-    53:53:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    53:53:void lambda$tryAndKeepMethodOnClass$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):622 -> a
-    54:56:void lambda$tryAndKeepMethodOnClass$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):630:632 -> a
-    57:57:void lambda$tryAndKeepMethodOnClass$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):631:631 -> a
-com.android.tools.r8.shaking.RuntimeTypeCheckInfo -> com.android.tools.r8.internal.mB:
+    1:1:void run():553:553 -> a
+    2:2:void visitAllSuperInterfaces(com.android.tools.r8.graph.DexType):557:557 -> a
+    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    3:3:void visitAllSuperInterfaces(com.android.tools.r8.graph.DexType):557 -> a
+    4:25:void visitAllSuperInterfaces(com.android.tools.r8.graph.DexType):558:579 -> a
+    26:50:void tryAndKeepMethodOnClass(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.ProguardMemberRule):586:610 -> 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):615:617 -> 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):616 -> 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):624:626 -> 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):625:625 -> a
+com.android.tools.r8.shaking.RuntimeTypeCheckInfo -> com.android.tools.r8.internal.Yz:
     java.util.Set exceptionGuardTypes -> c
     java.util.Set instanceOfTypes -> a
     java.util.Set checkCastTypes -> b
@@ -77648,7 +78231,7 @@
     3:3:boolean com.android.tools.r8.shaking.RuntimeTypeCheckInfo.isExceptionGuardType(com.android.tools.r8.graph.DexProgramClass):89:89 -> a
     3:3:boolean isRuntimeCheckType(com.android.tools.r8.graph.DexProgramClass):93 -> a
     4:7:com.android.tools.r8.shaking.RuntimeTypeCheckInfo rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):97:100 -> a
-com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder -> com.android.tools.r8.internal.mB$a:
+com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder -> com.android.tools.r8.internal.Yz$a:
     java.util.Set checkCastTypes -> c
     java.util.Set exceptionGuardTypes -> d
     java.util.Set instanceOfTypes -> b
@@ -77687,7 +78270,7 @@
     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.jC:
+com.android.tools.r8.shaking.SingleTargetLookupCache -> com.android.tools.r8.internal.UA:
     java.util.Map cache -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():16:16 -> <clinit>
@@ -77700,7 +78283,144 @@
     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.TreePruner -> com.android.tools.r8.internal.fF:
+com.android.tools.r8.shaking.StaticClassMerger -> com.android.tools.r8.internal.HB:
+    com.android.tools.r8.graph.AppView appView -> b
+    com.android.tools.r8.graph.classmerging.StaticallyMergedClasses$Builder mergedClassesBuilder -> d
+    com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap newFieldSignatures -> h
+    int numberOfMergedClasses -> j
+    com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap methodMapping -> i
+    com.android.tools.r8.shaking.MainDexTracingResult mainDexClasses -> c
+    com.android.tools.r8.com.google.common.base.Equivalence methodEquivalence -> f
+    com.android.tools.r8.com.google.common.base.Equivalence fieldEquivalence -> e
+    boolean $assertionsDisabled -> a
+    java.util.Map representatives -> g
+    1:1:void <clinit>():64:64 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.shaking.MainDexTracingResult):212:212 -> <init>
+    2:29:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.shaking.MainDexTracingResult):194:221 -> <init>
+    1:1:com.android.tools.r8.com.google.common.base.Equivalence access$000(com.android.tools.r8.shaking.StaticClassMerger):64:64 -> a
+    2:3:com.android.tools.r8.graph.GraphLens$NestedGraphLens run():225:226 -> a
+    4:13:com.android.tools.r8.graph.GraphLens$NestedGraphLens com.android.tools.r8.shaking.StaticClassMerger.buildGraphLens():231:240 -> a
+    4:13:com.android.tools.r8.graph.GraphLens$NestedGraphLens run():227 -> a
+    14:14:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup getMergeGroup(com.android.tools.r8.graph.DexProgramClass):250:250 -> a
+    15:15:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):247:247 -> a
+    15:15:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup getMergeGroup(com.android.tools.r8.graph.DexProgramClass):250 -> a
+    16:69:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup getMergeGroup(com.android.tools.r8.graph.DexProgramClass):254:307 -> a
+    70:70:boolean lambda$getMergeGroup$0(com.android.tools.r8.graph.DexEncodedField):266:266 -> a
+    71:71:boolean lambda$getMergeGroup$1(com.android.tools.r8.graph.DexEncodedMethod):272:272 -> a
+    72:80:com.android.tools.r8.shaking.StaticClassMerger$Representative getOrCreateRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeKey,com.android.tools.r8.graph.DexProgramClass):372:380 -> a
+    81:88:void setRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeKey,com.android.tools.r8.shaking.StaticClassMerger$Representative):384:391 -> a
+    89:100:void setRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeKey,com.android.tools.r8.shaking.StaticClassMerger$Representative):387:398 -> a
+    101:109:void setRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeKey,com.android.tools.r8.shaking.StaticClassMerger$Representative):393:401 -> a
+    110:115:com.android.tools.r8.utils.TraversalContinuation lambda$mayMergeAcrossPackageBoundaries$6(com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector,com.android.tools.r8.graph.ProgramMethod):431:436 -> a
+    116:121:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):443:448 -> a
+    122:132:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):444:454 -> a
+    133:133:com.android.tools.r8.features.ClassToFeatureSplitMap com.android.tools.r8.shaking.StaticClassMerger.getClassToFeatureSplitMap():246:246 -> a
+    133:133:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):455 -> a
+    134:134:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInSameFeatureOrBothInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):118:118 -> a
+    134:134:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):455 -> a
+    135:142:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):455:462 -> a
+    143:146:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):461:464 -> a
+    147:150:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):463:466 -> a
+    151:157:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):465:471 -> a
+    158:168:java.util.List mergeMethods(java.lang.Iterable,java.lang.Iterable,com.android.tools.r8.graph.DexProgramClass):479:489 -> a
+    169:182: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
+    169:182:java.util.List mergeMethods(java.lang.Iterable,java.lang.Iterable,com.android.tools.r8.graph.DexProgramClass):491 -> a
+    183:185:java.util.List mergeMethods(java.lang.Iterable,java.lang.Iterable,com.android.tools.r8.graph.DexProgramClass):492:494 -> a
+    186:186:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap.getRepresentativeKeyOrDefault(java.lang.Object,java.lang.Object):20:20 -> a
+    186:186:java.util.List mergeMethods(java.lang.Iterable,java.lang.Iterable,com.android.tools.r8.graph.DexProgramClass):495 -> a
+    187:190:java.util.List mergeMethods(java.lang.Iterable,java.lang.Iterable,com.android.tools.r8.graph.DexProgramClass):495:498 -> a
+    191:191:boolean lambda$mergeMethods$7(java.util.Set,com.android.tools.r8.utils.MethodSignatureEquivalence,com.android.tools.r8.graph.DexMethod):486:486 -> a
+    192:210:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):507:525 -> a
+    211:223: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
+    211:223:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):527 -> a
+    224:226:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):528:530 -> a
+    227:227:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap.getRepresentativeKeyOrDefault(java.lang.Object,java.lang.Object):20:20 -> a
+    227:227:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):531 -> a
+    228:234:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):531:537 -> a
+    235:235: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
+    236:236: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):64:64 -> b
+    2:2:boolean com.android.tools.r8.graph.DexEncodedField.isPrivate():207:207 -> b
+    2:2:boolean lambda$mayMergeAcrossPackageBoundaries$4(com.android.tools.r8.graph.DexEncodedField):416 -> b
+    3:3:boolean com.android.tools.r8.graph.DexEncodedField.isPublic():215:215 -> b
+    3:3:boolean lambda$mayMergeAcrossPackageBoundaries$4(com.android.tools.r8.graph.DexEncodedField):416 -> b
+    4:4:boolean isValidRepresentative(com.android.tools.r8.graph.DexProgramClass):321:321 -> b
+    5:5:boolean com.android.tools.r8.graph.DexEncodedMethod.isNative():506:506 -> b
+    5:5:boolean lambda$getMergeGroup$2(com.android.tools.r8.graph.DexEncodedMethod):282 -> b
+    6:11:boolean lambda$getMergeGroup$2(com.android.tools.r8.graph.DexEncodedMethod):282:287 -> b
+    1:1:boolean com.android.tools.r8.graph.DexEncodedMethod.isPrivate():510:510 -> c
+    1:1:boolean lambda$mayMergeAcrossPackageBoundaries$3(com.android.tools.r8.graph.DexEncodedMethod):413 -> c
+    2:2:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():514:514 -> c
+    2:2:boolean lambda$mayMergeAcrossPackageBoundaries$3(com.android.tools.r8.graph.DexEncodedMethod):413 -> c
+    3:3:boolean com.android.tools.r8.graph.DexClass.isPublic():612:612 -> c
+    3:3:boolean mayMergeAcrossPackageBoundaries(com.android.tools.r8.graph.DexProgramClass):407 -> c
+    4:30:boolean mayMergeAcrossPackageBoundaries(com.android.tools.r8.graph.DexProgramClass):412:438 -> c
+    1:2:void merge(com.android.tools.r8.graph.DexProgramClass):325:326 -> d
+    3:3:com.android.tools.r8.shaking.StaticClassMerger$MergeKey com.android.tools.r8.shaking.StaticClassMerger.getMergeKey(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):311:311 -> d
+    3:3:void com.android.tools.r8.shaking.StaticClassMerger.merge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):332 -> d
+    3:3:void merge(com.android.tools.r8.graph.DexProgramClass):327 -> d
+    4:4:com.android.tools.r8.features.ClassToFeatureSplitMap com.android.tools.r8.shaking.StaticClassMerger.getClassToFeatureSplitMap():246:246 -> d
+    4:4:com.android.tools.r8.shaking.StaticClassMerger$MergeKey com.android.tools.r8.shaking.StaticClassMerger.getMergeKey(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):312 -> d
+    4:4:void com.android.tools.r8.shaking.StaticClassMerger.merge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):332 -> d
+    4:4:void merge(com.android.tools.r8.graph.DexProgramClass):327 -> d
+    5:9:com.android.tools.r8.shaking.StaticClassMerger$MergeKey com.android.tools.r8.shaking.StaticClassMerger.getMergeKey(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):312:316 -> d
+    5:9:void com.android.tools.r8.shaking.StaticClassMerger.merge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):332 -> d
+    5:9:void merge(com.android.tools.r8.graph.DexProgramClass):327 -> d
+    10:44:void com.android.tools.r8.shaking.StaticClassMerger.merge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):333:367 -> d
+    10:44:void merge(com.android.tools.r8.graph.DexProgramClass):327 -> d
+    45:45:boolean com.android.tools.r8.graph.DexEncodedMethod.isPrivate():510:510 -> d
+    45:45:boolean lambda$mayMergeAcrossPackageBoundaries$5(com.android.tools.r8.graph.DexEncodedMethod):424 -> d
+com.android.tools.r8.shaking.StaticClassMerger$MergeGroup -> com.android.tools.r8.internal.EB:
+    com.android.tools.r8.shaking.StaticClassMerger$MergeGroup DONT_MERGE -> d
+    com.android.tools.r8.shaking.StaticClassMerger$MergeGroup[] $VALUES -> e
+    boolean $assertionsDisabled -> f
+    com.android.tools.r8.shaking.StaticClassMerger$MergeGroup NOT_MAIN_DEX -> c
+    com.android.tools.r8.shaking.StaticClassMerger$MergeGroup MAIN_DEX_DEPENDENCIES -> b
+    com.android.tools.r8.shaking.StaticClassMerger$MergeGroup MAIN_DEX_ROOTS -> a
+    1:6:void <clinit>():66:66 -> <clinit>
+    1:1:void <init>(java.lang.String,int):66:66 -> <init>
+    1:9:java.lang.String toString():74:82 -> toString
+com.android.tools.r8.shaking.StaticClassMerger$MergeKey -> com.android.tools.r8.internal.FB:
+    com.android.tools.r8.FeatureSplit featureSplit -> a
+    java.lang.String packageOrGlobal -> c
+    com.android.tools.r8.shaking.StaticClassMerger$MergeGroup mergeGroup -> b
+    1:4:void <init>(com.android.tools.r8.FeatureSplit,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup,java.lang.String):96:99 -> <init>
+    1:1:java.lang.String access$400(com.android.tools.r8.shaking.StaticClassMerger$MergeKey):88:88 -> a
+    2:2:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup getMergeGroup():103:103 -> a
+    1:1:java.lang.String getPackageOrGlobal():111:111 -> b
+    1:1:boolean isGlobal():115:115 -> c
+    1:1:com.android.tools.r8.shaking.StaticClassMerger$MergeKey toGlobal():107:107 -> d
+    1:7:boolean equals(java.lang.Object):128:134 -> equals
+    1:1:int hashCode():120:120 -> hashCode
+com.android.tools.r8.shaking.StaticClassMerger$Representative -> com.android.tools.r8.internal.GB:
+    com.android.tools.r8.graph.DexProgramClass clazz -> b
+    com.android.tools.r8.shaking.StaticClassMerger this$0 -> f
+    boolean hasSynchronizedMethods -> e
+    com.android.tools.r8.com.google.common.collect.HashMultiset methodBuckets -> d
+    boolean $assertionsDisabled -> a
+    com.android.tools.r8.com.google.common.collect.HashMultiset fieldBuckets -> c
+    1:1:void <clinit>():143:143 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.StaticClassMerger,com.android.tools.r8.graph.DexProgramClass):154:154 -> <init>
+    2:9:void <init>(com.android.tools.r8.shaking.StaticClassMerger,com.android.tools.r8.graph.DexProgramClass):149:156 -> <init>
+    1:1:boolean access$200(com.android.tools.r8.shaking.StaticClassMerger$Representative):143:143 -> a
+    2:4:void include(com.android.tools.r8.graph.DexProgramClass):161:163 -> a
+    5:5:boolean com.android.tools.r8.com.google.common.collect.AbstractMultiset.add(java.lang.Object):84:84 -> a
+    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):163 -> a
+    6:7:void include(com.android.tools.r8.graph.DexProgramClass):166:167 -> a
+    8:8:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():518:518 -> a
+    8:8:void include(com.android.tools.r8.graph.DexProgramClass):167 -> a
+    9:9:void include(com.android.tools.r8.graph.DexProgramClass):167:167 -> a
+    10:10:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():518:518 -> a
+    10:10:void include(com.android.tools.r8.graph.DexProgramClass):168 -> a
+    11:12:void include(com.android.tools.r8.graph.DexProgramClass):169:170 -> a
+    13:13:boolean com.android.tools.r8.com.google.common.collect.AbstractMultiset.add(java.lang.Object):84:84 -> a
+    13:13:boolean com.android.tools.r8.com.google.common.collect.HashMultiset.add(java.lang.Object):33 -> a
+    13:13:void include(com.android.tools.r8.graph.DexProgramClass):170 -> a
+    14:14:void include(com.android.tools.r8.graph.DexProgramClass):172:172 -> a
+    15:19:boolean isFull():181:185 -> a
+    1:1:com.android.tools.r8.graph.DexProgramClass access$300(com.android.tools.r8.shaking.StaticClassMerger$Representative):143:143 -> b
+com.android.tools.r8.shaking.TreePruner -> com.android.tools.r8.internal.YD:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.shaking.TreePrunerConfiguration configuration -> c
     java.util.Set prunedTypes -> e
@@ -77721,60 +78441,80 @@
     40:50:java.util.List com.android.tools.r8.shaking.TreePruner.getNewProgramClasses(java.util.List):107:117 -> a
     40:50:com.android.tools.r8.graph.DirectMappedDexApplication$Builder removeUnused(com.android.tools.r8.graph.DirectMappedDexApplication):76 -> a
     51:51:com.android.tools.r8.graph.DirectMappedDexApplication$Builder removeUnused(com.android.tools.r8.graph.DirectMappedDexApplication):76:76 -> a
-    52:63:void removeInterfacesImplementedDirectlyAndIndirectlyByClassFromSet(com.android.tools.r8.graph.DexType,java.util.Set):139:150 -> a
-    64:65:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):168:169 -> a
-    66:71:java.util.List com.android.tools.r8.utils.IterableUtils.ensureUnmodifiableList(java.lang.Iterable):34:39 -> a
-    66:71:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.shaking.TreePruner.reachableMethods(java.lang.Iterable,com.android.tools.r8.graph.DexClass):272 -> a
-    66:71:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):169 -> a
-    72:72:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.shaking.TreePruner.reachableMethods(java.lang.Iterable,com.android.tools.r8.graph.DexClass):272:272 -> a
-    72:72:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):169 -> a
-    73:76:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):171:174 -> a
-    77:82:java.util.List com.android.tools.r8.utils.IterableUtils.ensureUnmodifiableList(java.lang.Iterable):34:39 -> a
-    77:82:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.shaking.TreePruner.reachableMethods(java.lang.Iterable,com.android.tools.r8.graph.DexClass):272 -> a
-    77:82:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):174 -> a
-    83:83:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.shaking.TreePruner.reachableMethods(java.lang.Iterable,com.android.tools.r8.graph.DexClass):272:272 -> a
-    83:83:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):174 -> a
-    84:95:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):176:187 -> a
-    96:103:void com.android.tools.r8.shaking.TreePruner.rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):194:201 -> a
-    96:103:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):188 -> a
-    104:120:void com.android.tools.r8.shaking.TreePruner.claimNestOwnership(com.android.tools.r8.graph.DexClass):226:242 -> a
-    104:120:void com.android.tools.r8.shaking.TreePruner.rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):202 -> a
-    104:120:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):188 -> a
-    121:122:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):189:190 -> a
-    123:125:boolean com.android.tools.r8.shaking.TreePruner.verifyNoDeadFields(com.android.tools.r8.graph.DexProgramClass):378:380 -> a
-    123:125:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):190 -> a
-    126:126:boolean isTypeLive(com.android.tools.r8.graph.DexType):212:212 -> a
-    127:128:void clearDeadNestMembers(com.android.tools.r8.graph.DexClass):218:219 -> a
-    129:130:boolean lambda$clearDeadNestMembers$1(com.android.tools.r8.graph.NestMemberClassAttribute):221:222 -> a
-    131:133:boolean isAttributeReferencingPrunedItem(com.android.tools.r8.graph.EnclosingMethodAttribute):248:250 -> a
-    134:134:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):254:254 -> a
-    135:135:boolean com.android.tools.r8.shaking.TreePruner.isTypeMissing(com.android.tools.r8.graph.DexType):208:208 -> a
-    135:135:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):254 -> a
-    136:139:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):254:257 -> a
-    140:140:boolean com.android.tools.r8.shaking.TreePruner.isTypeMissing(com.android.tools.r8.graph.DexType):208:208 -> a
-    140:140:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):258 -> a
-    141:141:boolean com.android.tools.r8.shaking.TreePruner.isTypeLive(com.android.tools.r8.graph.DexType):212:212 -> a
-    141:141:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):258 -> a
-    142:143:int firstUnreachableIndex(java.util.List,java.util.function.Predicate):263:264 -> a
-    144:165:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):276:297 -> a
-    166:183:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):294:311 -> a
-    184:184:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():493:493 -> a
-    184:184:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):312 -> a
-    185:187:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):312:314 -> a
-    188:188:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():505:505 -> a
-    188:188:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):315 -> a
-    189:197:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):315:323 -> a
-    198:209:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):322:333 -> a
-    210:210:boolean lambda$reachableMethods$2(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedMethod):279:279 -> a
-    211:240:com.android.tools.r8.graph.DexEncodedField[] reachableFields(java.util.List):337:366 -> a
-    241:241:boolean lambda$reachableFields$3(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):339:339 -> a
-    242:242:java.util.Collection getMethodsToKeepForConfigurationDebugging():374:374 -> a
+    52:52:void removeInterfacesImplementedDirectlyAndIndirectlyByClassFromSet(com.android.tools.r8.graph.DexType,java.util.Set):139:139 -> a
+    53:53:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    53:53:void removeInterfacesImplementedDirectlyAndIndirectlyByClassFromSet(com.android.tools.r8.graph.DexType,java.util.Set):139 -> a
+    54:61:void removeInterfacesImplementedDirectlyAndIndirectlyByClassFromSet(com.android.tools.r8.graph.DexType,java.util.Set):143:150 -> a
+    62:63:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):168:169 -> a
+    64:69:java.util.List com.android.tools.r8.utils.IterableUtils.ensureUnmodifiableList(java.lang.Iterable):34:39 -> 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):272 -> a
+    64:69:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):169 -> 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):272:272 -> a
+    70:70:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):169 -> a
+    71:74:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):171:174 -> a
+    75:80:java.util.List com.android.tools.r8.utils.IterableUtils.ensureUnmodifiableList(java.lang.Iterable):34:39 -> 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):272 -> a
+    75:80:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):174 -> 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):272:272 -> a
+    81:81:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):174 -> a
+    82:93:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):176:187 -> a
+    94:101:void com.android.tools.r8.shaking.TreePruner.rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):194:201 -> a
+    94:101:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):188 -> a
+    102:102:void com.android.tools.r8.shaking.TreePruner.claimNestOwnership(com.android.tools.r8.graph.DexClass):226:226 -> a
+    102:102:void com.android.tools.r8.shaking.TreePruner.rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):202 -> a
+    102:102:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):188 -> a
+    103:103:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    103:103:void com.android.tools.r8.shaking.TreePruner.claimNestOwnership(com.android.tools.r8.graph.DexClass):226 -> a
+    103:103:void com.android.tools.r8.shaking.TreePruner.rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):202 -> a
+    103:103:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):188 -> a
+    104:107:void com.android.tools.r8.shaking.TreePruner.claimNestOwnership(com.android.tools.r8.graph.DexClass):231:234 -> a
+    104:107:void com.android.tools.r8.shaking.TreePruner.rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):202 -> a
+    104:107:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):188 -> a
+    108:108:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    108:108:void com.android.tools.r8.shaking.TreePruner.claimNestOwnership(com.android.tools.r8.graph.DexClass):234 -> a
+    108:108:void com.android.tools.r8.shaking.TreePruner.rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):202 -> a
+    108:108:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):188 -> a
+    109:115:void com.android.tools.r8.shaking.TreePruner.claimNestOwnership(com.android.tools.r8.graph.DexClass):236:242 -> a
+    109:115:void com.android.tools.r8.shaking.TreePruner.rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):202 -> a
+    109:115:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):188 -> a
+    116:117:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):189:190 -> a
+    118:120:boolean com.android.tools.r8.shaking.TreePruner.verifyNoDeadFields(com.android.tools.r8.graph.DexProgramClass):378:380 -> a
+    118:120:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):190 -> a
+    121:121:boolean isTypeLive(com.android.tools.r8.graph.DexType):212:212 -> a
+    122:123:void clearDeadNestMembers(com.android.tools.r8.graph.DexClass):218:219 -> a
+    124:124:boolean lambda$clearDeadNestMembers$1(com.android.tools.r8.graph.NestMemberClassAttribute):221:221 -> a
+    125:125:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    125:125:boolean lambda$clearDeadNestMembers$1(com.android.tools.r8.graph.NestMemberClassAttribute):221 -> a
+    126:126:boolean lambda$clearDeadNestMembers$1(com.android.tools.r8.graph.NestMemberClassAttribute):222:222 -> a
+    127:129:boolean isAttributeReferencingPrunedItem(com.android.tools.r8.graph.EnclosingMethodAttribute):248:250 -> a
+    130:130:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):254:254 -> a
+    131:131:boolean com.android.tools.r8.shaking.TreePruner.isTypeMissing(com.android.tools.r8.graph.DexType):208:208 -> a
+    131:131:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):254 -> a
+    132:135:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):254:257 -> a
+    136:136:boolean com.android.tools.r8.shaking.TreePruner.isTypeMissing(com.android.tools.r8.graph.DexType):208:208 -> a
+    136:136:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):258 -> a
+    137:137:boolean com.android.tools.r8.shaking.TreePruner.isTypeLive(com.android.tools.r8.graph.DexType):212:212 -> a
+    137:137:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):258 -> a
+    138:139:int firstUnreachableIndex(java.util.List,java.util.function.Predicate):263:264 -> a
+    140:161:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):276:297 -> a
+    162:179:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):294:311 -> a
+    180:180:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():502:502 -> a
+    180:180:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):312 -> a
+    181:183:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):312:314 -> a
+    184:184:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():518:518 -> a
+    184:184:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):315 -> a
+    185:193:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):315:323 -> a
+    194:205:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):322:333 -> a
+    206:206:boolean lambda$reachableMethods$2(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedMethod):279:279 -> a
+    207:236:com.android.tools.r8.graph.DexEncodedField[] reachableFields(java.util.List):337:366 -> a
+    237:237:boolean lambda$reachableFields$3(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):339:339 -> a
+    238:238:java.util.Collection getMethodsToKeepForConfigurationDebugging():374:374 -> a
     1:1:boolean com.android.tools.r8.shaking.TreePruner.isTypeLive(com.android.tools.r8.graph.DexType):212:212 -> b
     1:1:void retainReachableInterfacesFrom(com.android.tools.r8.graph.DexType,java.util.Set):155 -> b
     2:8:void retainReachableInterfacesFrom(com.android.tools.r8.graph.DexType,java.util.Set):156:162 -> b
     9:9:java.util.Set getRemovedClasses():370:370 -> b
     1:10:com.android.tools.r8.graph.DirectMappedDexApplication run():60:69 -> c
-com.android.tools.r8.shaking.TreePrunerConfiguration -> com.android.tools.r8.internal.gF:
+com.android.tools.r8.shaking.TreePrunerConfiguration -> com.android.tools.r8.internal.ZD:
     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.K1:
     int $r8$clinit -> q
@@ -77786,7 +78526,7 @@
     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.internal.lG:
+com.android.tools.r8.shaking.UnusedItemsPrinter -> com.android.tools.r8.internal.BF:
     com.android.tools.r8.shaking.UnusedItemsPrinter$Members currentMembers -> e
     java.util.List classes -> f
     java.util.function.Consumer consumer -> c
@@ -77856,18 +78596,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.internal.iG:
-com.android.tools.r8.shaking.UnusedItemsPrinter$Members -> com.android.tools.r8.internal.jG:
+com.android.tools.r8.shaking.UnusedItemsPrinter$1 -> com.android.tools.r8.internal.yF:
+com.android.tools.r8.shaking.UnusedItemsPrinter$Members -> com.android.tools.r8.internal.zF:
     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():164:164 -> a
+    4:5:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():158:158 -> 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.internal.kG:
+com.android.tools.r8.shaking.UnusedItemsPrinter$NopPrinter -> com.android.tools.r8.internal.AF:
     1:1:void <init>():139:139 -> <init>
     void finished() -> a
     void registerUnusedClass(com.android.tools.r8.graph.DexProgramClass) -> a
@@ -77875,7 +78615,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.internal.SG:
+com.android.tools.r8.shaking.VerticalClassMerger -> com.android.tools.r8.internal.kG:
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap mergedClasses -> l
     com.android.tools.r8.shaking.AppInfoWithLiveness appInfo -> c
     java.util.List synthesizedBridges -> o
@@ -77896,55 +78636,49 @@
     1:1: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):229:229 -> <init>
     2:40: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):204:242 -> <init>
     1:1:java.util.Set access$000(com.android.tools.r8.shaking.VerticalClassMerger):99:99 -> a
-    2:20:void initializeMergeCandidates(java.lang.Iterable):246:264 -> a
-    21:30:void markTypeAsPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):327:336 -> a
-    31:42:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):344:355 -> a
-    43:43:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    43:43:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):355 -> a
-    44:47:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):355:355 -> a
-    51:53:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):359:361 -> a
-    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():726:726 -> a
-    54:54:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition):124 -> a
-    54:54:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInSameFeatureOrBothInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):153 -> a
-    54:54:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):361 -> a
-    55:55:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition):124:124 -> a
-    55:55:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInSameFeatureOrBothInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):153 -> a
+    2:7:void initializeMergeCandidates(java.lang.Iterable):246:251 -> a
+    8:8:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    8:8:void initializeMergeCandidates(java.lang.Iterable):251 -> a
+    9:22:void initializeMergeCandidates(java.lang.Iterable):251:264 -> a
+    23:32:void markTypeAsPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):327:336 -> a
+    33:44:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):344:355 -> a
+    45:45:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
+    45:45:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):355 -> a
+    46:49:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):355:355 -> a
+    53:54:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):359:360 -> a
+    55:55:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInSameFeatureOrBothInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):118:118 -> a
     55:55:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):361 -> a
-    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():726:726 -> a
-    56:56:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition):124 -> a
-    56:56:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInSameFeatureOrBothInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):153 -> a
-    56:56:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):361 -> a
-    57:57:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition):124:124 -> a
-    57:57:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInSameFeatureOrBothInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):153 -> a
-    57:57:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):361 -> a
-    58:66:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):364:372 -> a
-    67:67:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isSerializable(com.android.tools.r8.graph.DexType):372:372 -> a
-    67:67:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):373 -> a
-    68:68:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):385:385 -> a
-    69:72:boolean com.android.tools.r8.com.google.common.collect.Iterables.isEmpty(java.lang.Iterable):1023:1026 -> a
-    69:72:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):385 -> a
-    73:102:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):386:415 -> a
-    103:104:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):406:407 -> a
-    105:151:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):426:472 -> a
-    152:169:boolean com.android.tools.r8.shaking.VerticalClassMerger.fieldResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):876:893 -> a
-    152:169:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):478 -> a
-    170:171:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):479:480 -> a
-    172:173:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):465:466 -> a
-    174:175:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):445:446 -> a
-    176:176:boolean lambda$isStillMergeCandidate$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):441:441 -> a
-    177:182:com.android.tools.r8.utils.TraversalContinuation lambda$mergeMayLeadToIllegalAccesses$2(com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector,com.android.tools.r8.graph.ProgramMethod):529:534 -> a
-    183:204:com.android.tools.r8.shaking.VerticalClassMergerGraphLens run():639:660 -> a
-    205:205:com.android.tools.r8.shaking.KeepInfoCollection com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection.mutate(java.util.function.Consumer):435:435 -> a
-    205:205:com.android.tools.r8.shaking.VerticalClassMergerGraphLens run():660 -> a
-    206:209:com.android.tools.r8.shaking.VerticalClassMergerGraphLens run():661:664 -> a
-    210:210:void lambda$run$3(com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):660:660 -> a
-    211:216:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):695:700 -> a
-    217:217:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):320:320 -> a
-    217:217:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):701 -> a
-    218:237:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):704:723 -> a
-    238:244:void lambda$methodResolutionMayChange$4(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexClassAndMethod):778:784 -> a
-    245:245:void lambda$methodResolutionMayChange$5(com.android.tools.r8.graph.LookupLambdaTarget):789:789 -> a
-    246:309:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):801:864 -> a
+    56:64:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):364:372 -> a
+    65:65:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isSerializable(com.android.tools.r8.graph.DexType):322:322 -> a
+    65:65:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):373 -> a
+    66:66:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):385:385 -> 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):385 -> a
+    71:100:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):386:415 -> a
+    101:102:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):406:407 -> a
+    103:149:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):426:472 -> a
+    150:167:boolean com.android.tools.r8.shaking.VerticalClassMerger.fieldResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):876:893 -> a
+    150:167:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):478 -> a
+    168:169:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):479:480 -> a
+    170:171:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):465:466 -> a
+    172:173:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):445:446 -> a
+    174:174:boolean lambda$isStillMergeCandidate$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):441:441 -> a
+    175:180:com.android.tools.r8.utils.TraversalContinuation lambda$mergeMayLeadToIllegalAccesses$2(com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector,com.android.tools.r8.graph.ProgramMethod):529:534 -> a
+    181:202:com.android.tools.r8.shaking.VerticalClassMergerGraphLens run():639:660 -> a
+    203:203:com.android.tools.r8.shaking.KeepInfoCollection com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection.mutate(java.util.function.Consumer):435:435 -> a
+    203:203:com.android.tools.r8.shaking.VerticalClassMergerGraphLens run():660 -> a
+    204:207:com.android.tools.r8.shaking.VerticalClassMergerGraphLens run():661:664 -> a
+    208:208:void lambda$run$3(com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):660:660 -> a
+    209:214:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):695:700 -> a
+    215:215:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):321:321 -> a
+    215:215:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):701 -> a
+    216:235:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):704:723 -> a
+    236:242:void lambda$methodResolutionMayChange$4(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexClassAndMethod):778:784 -> a
+    243:243:void lambda$methodResolutionMayChange$5(com.android.tools.r8.graph.LookupLambdaTarget):789:789 -> a
+    244:249:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):801:806 -> a
+    250:250:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> a
+    250:250:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):806 -> a
+    251:309:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):806:864 -> a
     310:320:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):860:870 -> a
     321:321:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):866:866 -> a
     322:322:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):851:851 -> a
@@ -77968,26 +78702,32 @@
     10:25:void initializePinnedTypes(java.lang.Iterable):278 -> b
     26:44:void initializePinnedTypes(java.lang.Iterable):280:298 -> b
     45:45:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):488:488 -> b
-    46:46:boolean com.android.tools.r8.graph.DexClass.isPrivate():626:626 -> b
+    46:46:boolean com.android.tools.r8.graph.DexClass.isPrivate():608:608 -> b
     46:46:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):492 -> b
-    47:47:boolean com.android.tools.r8.graph.DexClass.isPublic():630:630 -> b
+    47:47:boolean com.android.tools.r8.graph.DexClass.isPublic():612:612 -> b
     47:47:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):492 -> b
-    48:48:boolean com.android.tools.r8.graph.DexClass.isPrivate():626:626 -> b
+    48:48:boolean com.android.tools.r8.graph.DexClass.isPrivate():608:608 -> b
     48:48:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):493 -> b
-    49:49:boolean com.android.tools.r8.graph.DexClass.isPublic():630:630 -> b
+    49:49:boolean com.android.tools.r8.graph.DexClass.isPublic():612:612 -> b
     49:49:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):493 -> b
-    50:50:boolean com.android.tools.r8.graph.DexClass.isPublic():630:630 -> b
+    50:50:boolean com.android.tools.r8.graph.DexClass.isPublic():612:612 -> b
     50:50:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):502 -> b
-    51:56:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):505:510 -> b
-    57:57:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():501:501 -> b
-    57:57:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):511 -> b
-    58:58:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):511:511 -> b
-    59:59:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():501:501 -> b
-    59:59:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):515 -> b
-    60:60:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):516:516 -> b
-    61:61:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():501:501 -> b
-    61:61:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):517 -> b
-    62:73:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):525:536 -> b
+    51:51:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):505:505 -> b
+    52:52:boolean com.android.tools.r8.graph.DexEncodedField.isPublic():215:215 -> b
+    52:52:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):506 -> b
+    53:53:boolean com.android.tools.r8.graph.DexEncodedField.isPrivate():207:207 -> b
+    53:53:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):506 -> b
+    54:54:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):510:510 -> b
+    55:55:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():514:514 -> b
+    55:55:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):511 -> b
+    56:56:boolean com.android.tools.r8.graph.DexEncodedMethod.isPrivate():510:510 -> b
+    56:56:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):511 -> b
+    57:57:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():514:514 -> b
+    57:57:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):515 -> b
+    58:58:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):516:516 -> b
+    59:59:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():514:514 -> b
+    59:59:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):517 -> b
+    60:71:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):525:536 -> b
     1:1:com.android.tools.r8.ir.optimize.MethodPoolCollection access$1000(com.android.tools.r8.shaking.VerticalClassMerger):99:99 -> c
     2:63:boolean methodResolutionMayChange(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):730:791 -> c
     1:1:com.android.tools.r8.ir.optimize.info.OptimizationFeedback access$1200(com.android.tools.r8.shaking.VerticalClassMerger):99:99 -> d
@@ -78000,8 +78740,8 @@
     1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.shaking.VerticalClassMerger):99:99 -> j
     1:1:java.util.concurrent.ExecutorService access$800(com.android.tools.r8.shaking.VerticalClassMerger):99:99 -> k
     1:1:com.android.tools.r8.utils.Timing access$900(com.android.tools.r8.shaking.VerticalClassMerger):99:99 -> l
-com.android.tools.r8.shaking.VerticalClassMerger$1 -> com.android.tools.r8.internal.IG:
-com.android.tools.r8.shaking.VerticalClassMerger$AbortReason -> com.android.tools.r8.internal.JG:
+com.android.tools.r8.shaking.VerticalClassMerger$1 -> com.android.tools.r8.internal.aG:
+com.android.tools.r8.shaking.VerticalClassMerger$AbortReason -> com.android.tools.r8.internal.bG:
     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
@@ -78030,7 +78770,7 @@
     61:61:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):122:122 -> a
     62:62:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):183:183 -> a
     62:62:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):122 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger -> com.android.tools.r8.internal.KG:
+com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger -> com.android.tools.r8.internal.cG:
     com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder deferredRenamings -> d
     java.util.List synthesizedBridges -> e
     com.android.tools.r8.graph.DexProgramClass source -> b
@@ -78121,7 +78861,7 @@
     156:156:boolean merge():1036 -> 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):1238:1269 -> c
     157:188:boolean merge():1044 -> 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):296:296 -> 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):297:297 -> 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):1269 -> c
     189:189:boolean merge():1044 -> 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):1270:1274 -> c
@@ -78141,7 +78881,7 @@
     253:277:boolean merge():1094:1118 -> c
     278:278:boolean lambda$restoreDebuggingState$5(com.android.tools.r8.graph.DexEncodedMethod):1135:1135 -> c
     279:279:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$redirectSuperCallsInTarget$8(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):1204:1204 -> c
-com.android.tools.r8.shaking.VerticalClassMerger$CollisionDetector -> com.android.tools.r8.internal.LG:
+com.android.tools.r8.shaking.VerticalClassMerger$CollisionDetector -> com.android.tools.r8.internal.dG:
     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
@@ -78158,7 +78898,7 @@
     19:20:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap lambda$fillSeenPositions$0(com.android.tools.r8.graph.DexString):1601:1602 -> 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):1621:1652 -> a
     1:22:boolean mayCollide():1568:1589 -> b
-com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector -> com.android.tools.r8.internal.MG:
+com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector -> com.android.tools.r8.internal.eG:
     com.android.tools.r8.graph.ProgramMethod context -> e
     com.android.tools.r8.graph.AppView appView -> f
     com.android.tools.r8.graph.DexClass source -> g
@@ -78169,7 +78909,7 @@
     1:1:boolean foundIllegalAccess():1810:1810 -> a
     2:2:void setContext(com.android.tools.r8.graph.ProgramMethod):1814:1814 -> a
     3:17:void checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):1834:1848 -> a
-    18:18:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():501:501 -> a
+    18:18:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():514:514 -> a
     18:18:void checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):1848 -> a
     19:19:void checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):1849:1849 -> a
     20:23:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):1883:1886 -> a
@@ -78184,10 +78924,13 @@
     5:5:void registerNewInstance(com.android.tools.r8.graph.DexType):1925:1925 -> e
     6:6:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):1930:1930 -> e
     1:1:void registerTypeReference(com.android.tools.r8.graph.DexType):1940:1940 -> f
-    1:7:void checkTypeReference(com.android.tools.r8.graph.DexType):1856:1862 -> g
-    8:8:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):1935:1935 -> g
+    1:5:void checkTypeReference(com.android.tools.r8.graph.DexType):1856:1860 -> g
+    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> g
+    6:6:void checkTypeReference(com.android.tools.r8.graph.DexType):1860 -> g
+    7:8:void checkTypeReference(com.android.tools.r8.graph.DexType):1861:1862 -> g
+    9:9:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):1935:1935 -> g
     1:10:void checkFieldReference(com.android.tools.r8.graph.DexField):1818:1827 -> i
-com.android.tools.r8.shaking.VerticalClassMerger$OverloadedMethodSignaturesRetriever -> com.android.tools.r8.internal.NG:
+com.android.tools.r8.shaking.VerticalClassMerger$OverloadedMethodSignaturesRetriever -> com.android.tools.r8.internal.fG:
     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
@@ -78198,7 +78941,7 @@
     36:36:com.android.tools.r8.graph.DexProto lambda$get$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):580:580 -> a
     37:51:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):604:618 -> a
     52:59:boolean typeMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexType):624:631 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$Rename -> com.android.tools.r8.internal.OG:
+com.android.tools.r8.shaking.VerticalClassMerger$Rename -> com.android.tools.r8.internal.gG:
     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
@@ -78206,7 +78949,7 @@
     1:3:void <clinit>():190:192 -> <clinit>
     4:4:void <clinit>():189:189 -> <clinit>
     1:1:void <init>(java.lang.String,int):189:189 -> <init>
-com.android.tools.r8.shaking.VerticalClassMerger$SingleTypeMapperGraphLens -> com.android.tools.r8.internal.PG:
+com.android.tools.r8.shaking.VerticalClassMerger$SingleTypeMapperGraphLens -> com.android.tools.r8.internal.hG:
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> i
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexProgramClass target -> h
@@ -78227,7 +78970,7 @@
     boolean isContextFreeForMethods() -> e
     1:1:com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType):1728:1728 -> e
     1:1:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):1733:1733 -> f
-com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode -> com.android.tools.r8.internal.QG:
+com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode -> com.android.tools.r8.internal.iG:
     com.android.tools.r8.ir.code.Invoke$Type type -> f
     com.android.tools.r8.graph.DexMethod invocationTarget -> e
     boolean isInterface -> g
@@ -78243,7 +78986,7 @@
     2:3:void updateMethodSignatures(java.util.function.Function):1982:1983 -> a
     4:14:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2003:2013 -> a
     15:15:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2005:2005 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$VerticalClassMergerTreeFixer -> com.android.tools.r8.internal.RG:
+com.android.tools.r8.shaking.VerticalClassMerger$VerticalClassMergerTreeFixer -> com.android.tools.r8.internal.jG:
     com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder lensBuilder -> i
     boolean $assertionsDisabled -> g
     com.android.tools.r8.graph.AppView appView -> h
@@ -78252,21 +78995,29 @@
     1:1:void <clinit>():1468:1468 -> <clinit>
     1:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,java.util.List):1480:1485 -> <init>
     1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLens access$400(com.android.tools.r8.shaking.VerticalClassMerger$VerticalClassMergerTreeFixer):1468:1468 -> a
-    2:2:void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1516:1516 -> a
-    3:3:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1521:1521 -> a
-    4:4:boolean com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.hasOriginalSignatureMappingFor(com.android.tools.r8.graph.DexField):308:308 -> a
-    4:4:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1521 -> a
-    5:5:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1522:1522 -> a
-    6:6:void com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):321:321 -> a
-    6:6:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1522 -> a
-    7:8:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1528:1529 -> a
-    9:9: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):325:325 -> a
-    9:9:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1529 -> a
-    10:10:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1529:1529 -> a
-    11:16:com.android.tools.r8.graph.DexEncodedMethod recordMethodChange(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1536:1541 -> a
-    1:11:com.android.tools.r8.shaking.VerticalClassMergerGraphLens fixupTypeReferences():1490:1500 -> b
-    12:13:com.android.tools.r8.graph.DexType mapClassType(com.android.tools.r8.graph.DexType):1507:1508 -> b
-com.android.tools.r8.shaking.VerticalClassMergerGraphLens -> com.android.tools.r8.internal.WG:
+    2:12:com.android.tools.r8.shaking.VerticalClassMergerGraphLens fixupTypeReferences():1490:1500 -> a
+    13:13:void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1516:1516 -> a
+    14:14:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1521:1521 -> a
+    15:15:boolean com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.hasOriginalSignatureMappingFor(com.android.tools.r8.graph.DexField):308:308 -> a
+    15:15:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1521 -> a
+    16:16:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1522:1522 -> a
+    17:17:void com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):321:321 -> a
+    17:17:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1522 -> a
+    18:19:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1528:1529 -> a
+    20:20: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):325:325 -> a
+    20:20:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1529 -> a
+    21:21:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1529:1529 -> a
+    22:22:com.android.tools.r8.graph.DexEncodedMethod recordMethodChange(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1536:1536 -> a
+    23:24:void com.android.tools.r8.shaking.VerticalClassMerger$VerticalClassMergerTreeFixer.recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1528:1529 -> a
+    23:24:com.android.tools.r8.graph.DexEncodedMethod recordMethodChange(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1536 -> a
+    25:25: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):325:325 -> a
+    25:25:void com.android.tools.r8.shaking.VerticalClassMerger$VerticalClassMergerTreeFixer.recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1529 -> a
+    25:25:com.android.tools.r8.graph.DexEncodedMethod recordMethodChange(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1536 -> a
+    26:26:void com.android.tools.r8.shaking.VerticalClassMerger$VerticalClassMergerTreeFixer.recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1529:1529 -> a
+    26:26:com.android.tools.r8.graph.DexEncodedMethod recordMethodChange(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1536 -> a
+    27:31:com.android.tools.r8.graph.DexEncodedMethod recordMethodChange(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1537:1541 -> a
+    1:2:com.android.tools.r8.graph.DexType mapClassType(com.android.tools.r8.graph.DexType):1507:1508 -> b
+com.android.tools.r8.shaking.VerticalClassMergerGraphLens -> com.android.tools.r8.internal.oG:
     java.util.Map originalMethodSignaturesForBridges -> q
     java.util.Map contextualVirtualToDirectMethodMaps -> o
     boolean $assertionsDisabled -> l
@@ -78291,8 +79042,8 @@
     1:2:java.lang.Iterable internalGetOriginalTypes(com.android.tools.r8.graph.DexType):97:98 -> g
     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):102 -> g
-com.android.tools.r8.shaking.VerticalClassMergerGraphLens$1 -> com.android.tools.r8.internal.TG:
-com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder -> com.android.tools.r8.internal.UG:
+com.android.tools.r8.shaking.VerticalClassMergerGraphLens$1 -> com.android.tools.r8.internal.lG:
+com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder -> com.android.tools.r8.internal.mG:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     java.util.Map methodMap -> d
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap originalMethodSignatures -> g
@@ -78335,9 +79086,9 @@
     110:123:void merge(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder):345:358 -> a
     1:1:void markMethodAsMerged(com.android.tools.r8.graph.DexMethod):317:317 -> b
     2:2:void recordMove(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):330:330 -> b
-com.android.tools.r8.shaking.VerticalClassMergerGraphLens$GraphLensLookupResultProvider -> com.android.tools.r8.internal.VG:
+com.android.tools.r8.shaking.VerticalClassMergerGraphLens$GraphLensLookupResultProvider -> com.android.tools.r8.internal.nG:
     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.fH:
+com.android.tools.r8.shaking.WhyAreYouKeepingConsumer -> com.android.tools.r8.internal.xG:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():43:43 -> <clinit>
     1:1:void <init>(com.android.tools.r8.experimental.graphinfo.GraphConsumer):58:58 -> <init>
@@ -78374,7 +79125,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.fH$a:
+com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$Formatter -> com.android.tools.r8.internal.xG$a:
     java.io.PrintStream output -> a
     int indentation -> b
     1:1:void <init>(java.io.PrintStream):257:257 -> <init>
@@ -78384,7 +79135,7 @@
     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.fH$b:
+com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath -> com.android.tools.r8.internal.xG$b:
     com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath path -> c
     boolean $assertionsDisabled -> a
     com.android.tools.r8.experimental.graphinfo.GraphNode node -> b
@@ -78400,719 +79151,318 @@
     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.synthesis.a:
-    com.android.tools.r8.graph.DexApplication application -> a
-    int nextSyntheticId -> b
-    com.android.tools.r8.synthesis.CommittedSyntheticsCollection committed -> c
-    com.android.tools.r8.com.google.common.collect.ImmutableList committedProgramTypes -> d
-    1:6:void <init>(int,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,com.android.tools.r8.com.google.common.collect.ImmutableList):36:41 -> <init>
-    1:1:com.android.tools.r8.graph.DexApplication getApplication():50:50 -> a
-    2:2:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function):65:65 -> a
-    1:1:java.util.Collection getCommittedProgramTypes():54:54 -> b
-    1:1:java.util.Collection getLegacySyntheticTypes():59:59 -> c
-    1:1:com.android.tools.r8.synthesis.SyntheticItems toSyntheticItems():46:46 -> d
-com.android.tools.r8.synthesis.CommittedSyntheticsCollection -> com.android.tools.r8.synthesis.c:
-    com.android.tools.r8.com.google.common.collect.ImmutableMap nonLegacyMethods -> d
-    com.android.tools.r8.com.google.common.collect.ImmutableMap nonLegacyClasses -> e
-    com.android.tools.r8.synthesis.CommittedSyntheticsCollection EMPTY -> a
-    boolean $assertionsDisabled -> b
-    com.android.tools.r8.com.google.common.collect.ImmutableSet legacyTypes -> c
-    1:83:void <clinit>():25:107 -> <clinit>
-    1:7:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableSet,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableMap):125:131 -> <init>
-    8:8:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableSet,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableMap):129:129 -> <init>
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap access$000(com.android.tools.r8.synthesis.CommittedSyntheticsCollection):25:25 -> a
-    2:2:com.android.tools.r8.synthesis.CommittedSyntheticsCollection empty():135:135 -> a
-    3:3:boolean containsLegacyType(com.android.tools.r8.graph.DexType):151:151 -> a
-    4:5:void forEachNonLegacyItem(java.util.function.Consumer):179:180 -> a
-    6:6:void lambda$forEachNonLegacyItem$0(java.util.function.Consumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticMethodReference):179:179 -> a
-    7:7:void lambda$forEachNonLegacyItem$1(java.util.function.Consumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticProgramClassReference):180:180 -> a
-    8:9:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):184:185 -> a
-    10:10:com.android.tools.r8.synthesis.CommittedSyntheticsCollection empty():135:135 -> a
-    10:10:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):188 -> a
-    11:11:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):188:188 -> a
-    12:12:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder builder():139:139 -> a
-    12:12:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):188 -> a
-    13:20:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):190:197 -> a
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticMethodReference.getHolder():33:33 -> a
-    21:21:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):198 -> a
-    22:28:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):198:204 -> a
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticClassReference.getHolder():31:31 -> a
-    29:29:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):205 -> a
-    30:36:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):205:211 -> a
-    37:40:com.android.tools.r8.synthesis.CommittedSyntheticsCollection rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):215:218 -> a
-    41:48:com.android.tools.r8.com.google.common.collect.ImmutableMap rewriteItems(java.util.Map,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):223:230 -> a
-    49:51:boolean verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication):234:236 -> a
-    52:53:boolean verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication,java.util.Collection):241:242 -> a
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap access$100(com.android.tools.r8.synthesis.CommittedSyntheticsCollection):25:25 -> b
-    2:2:boolean containsNonLegacyType(com.android.tools.r8.graph.DexType):155:155 -> b
-    3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet getLegacyTypes():159:159 -> b
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet access$200(com.android.tools.r8.synthesis.CommittedSyntheticsCollection):25:25 -> c
-    2:2:boolean containsLegacyType(com.android.tools.r8.graph.DexType):151:151 -> c
-    2:2:boolean containsType(com.android.tools.r8.graph.DexType):147 -> c
-    3:3:boolean containsType(com.android.tools.r8.graph.DexType):147:147 -> c
-    4:4:com.android.tools.r8.com.google.common.collect.ImmutableMap getNonLegacyClasses():167:167 -> c
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap getNonLegacyMethods():163:163 -> d
-    2:6:com.android.tools.r8.synthesis.SyntheticReference getNonLegacyItem(com.android.tools.r8.graph.DexType):171:175 -> d
-    1:1:boolean isEmpty():143:143 -> e
-com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder -> com.android.tools.r8.synthesis.b:
-    com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder newNonLegacyMethods -> c
-    com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder newNonLegacyClasses -> b
-    com.android.tools.r8.synthesis.CommittedSyntheticsCollection parent -> a
-    com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder newLegacyClasses -> d
-    1:1:void <init>(com.android.tools.r8.synthesis.CommittedSyntheticsCollection):34:34 -> <init>
-    2:8:void <init>(com.android.tools.r8.synthesis.CommittedSyntheticsCollection):29:35 -> <init>
-    1:2:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addItem(com.android.tools.r8.synthesis.SyntheticDefinition):39:40 -> a
-    3:3:com.android.tools.r8.synthesis.SyntheticProgramClassReference com.android.tools.r8.synthesis.SyntheticProgramClassDefinition.toReference():46:46 -> a
-    3:3:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassDefinition):46 -> a
-    4:7:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassReference):50:53 -> a
-    4:7:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassDefinition):46 -> a
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticClassReference.getHolder():31:31 -> a
-    8:8:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassReference):53 -> a
-    8:8:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassDefinition):46 -> a
-    9:9:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassReference):53:53 -> a
-    9:9:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassDefinition):46 -> a
-    10:13:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassReference):50:53 -> a
-    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticClassReference.getHolder():31:31 -> a
-    14:14:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassReference):53 -> a
-    15:15:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassReference):53:53 -> a
-    16:16:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyMethod(com.android.tools.r8.synthesis.SyntheticMethodDefinition):58:58 -> a
-    17:20:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyMethod(com.android.tools.r8.synthesis.SyntheticMethodReference):62:65 -> a
-    17:20:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyMethod(com.android.tools.r8.synthesis.SyntheticMethodDefinition):58 -> a
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticMethodReference.getHolder():33:33 -> a
-    21:21:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyMethod(com.android.tools.r8.synthesis.SyntheticMethodReference):65 -> a
-    21:21:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyMethod(com.android.tools.r8.synthesis.SyntheticMethodDefinition):58 -> a
-    22:22:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyMethod(com.android.tools.r8.synthesis.SyntheticMethodReference):65:65 -> a
-    22:22:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyMethod(com.android.tools.r8.synthesis.SyntheticMethodDefinition):58 -> a
-    23:26:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyMethod(com.android.tools.r8.synthesis.SyntheticMethodReference):62:65 -> a
-    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticMethodReference.getHolder():33:33 -> a
-    27:27:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyMethod(com.android.tools.r8.synthesis.SyntheticMethodReference):65 -> a
-    28:28:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyMethod(com.android.tools.r8.synthesis.SyntheticMethodReference):65:65 -> a
-    29:32:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addLegacyClasses(java.util.Collection):70:73 -> a
-    33:33:void lambda$addLegacyClasses$0(com.android.tools.r8.graph.DexProgramClass):73:73 -> a
-    34:37:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addLegacyClass(com.android.tools.r8.graph.DexType):78:81 -> a
-    38:53:com.android.tools.r8.synthesis.CommittedSyntheticsCollection build():86:101 -> a
-com.android.tools.r8.synthesis.SynthesizingContext -> com.android.tools.r8.synthesis.d:
+com.android.tools.r8.synthesis.CommittedItems -> com.android.tools.r8.internal.u7:
+    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
+    boolean $assertionsDisabled -> a
+    int nextSyntheticId -> c
+    com.android.tools.r8.com.google.common.collect.ImmutableSet legacySyntheticTypes -> d
+    1:1:void <clinit>():26:26 -> <clinit>
+    1:8:void <init>(int,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.com.google.common.collect.ImmutableSet,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableList):40:47 -> <init>
+    1:1:com.android.tools.r8.graph.DexApplication getApplication():56:56 -> a
+    2:2:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function):71:71 -> a
+    3:4:boolean verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication,java.util.Collection):75:76 -> a
+    1:1:java.util.Collection getCommittedTypes():60:60 -> b
+    1:1:java.util.Collection getLegacySyntheticTypes():65:65 -> c
+    1:1:com.android.tools.r8.synthesis.SyntheticItems toSyntheticItems():52:52 -> d
+com.android.tools.r8.synthesis.SynthesizingContext -> com.android.tools.r8.internal.fD:
     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>():31:31 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin):80:83 -> <init>
-    1:2:com.android.tools.r8.synthesis.SynthesizingContext fromNonSyntheticInputContext(com.android.tools.r8.graph.DexClass):46:47 -> a
-    3:3:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():650:650 -> a
-    3:3:com.android.tools.r8.synthesis.SynthesizingContext fromNonSyntheticInputContext(com.android.tools.r8.graph.DexClass):47 -> a
-    4:4:com.android.tools.r8.synthesis.SynthesizingContext fromNonSyntheticInputContext(com.android.tools.r8.graph.DexClass):47:47 -> a
-    5:6:com.android.tools.r8.synthesis.SynthesizingContext fromNonSyntheticInputContext(com.android.tools.r8.graph.ProgramDefinition):53:54 -> a
-    7:10:com.android.tools.r8.synthesis.SynthesizingContext fromSyntheticInputClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):59:62 -> a
-    11:17:com.android.tools.r8.synthesis.SynthesizingContext fromSyntheticContextChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexItemFactory):67:73 -> a
-    18:18:com.android.tools.r8.graph.DexType getSynthesizingContextType():112:112 -> a
-    18:18:com.android.tools.r8.synthesis.SynthesizingContext fromSyntheticContextChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexItemFactory):74 -> a
-    19:19:com.android.tools.r8.synthesis.SynthesizingContext fromSyntheticContextChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexItemFactory):76:76 -> a
-    20:26:int compareTo(com.android.tools.r8.synthesis.SynthesizingContext):88:94 -> a
-    27:27:com.android.tools.r8.origin.Origin getInputContextOrigin():98:98 -> a
-    28:33:com.android.tools.r8.synthesis.SynthesizingContext rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):102:107 -> a
-    34:35:void registerPrefixRewriting(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):116:117 -> a
-    36:36:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():408:408 -> a
-    36:36:void registerPrefixRewriting(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):117 -> a
-    37:54:void registerPrefixRewriting(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):122:139 -> a
-    55:56:void addIfDerivedFromMainDexClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.MainDexClasses,java.util.Set):149:150 -> a
-    1:1:com.android.tools.r8.graph.DexType lambda$compareTo$0(com.android.tools.r8.synthesis.SynthesizingContext):93:93 -> b
-    2:2:com.android.tools.r8.graph.DexType getSynthesizingContextType():112:112 -> b
-    1:1:int compareTo(java.lang.Object):31:31 -> compareTo
-    1:1:java.lang.String toString():156:156 -> toString
-    2:2:com.android.tools.r8.graph.DexType getSynthesizingContextType():112:112 -> toString
-    2:2:java.lang.String toString():156 -> toString
-    3:3:java.lang.String toString():156:156 -> toString
-com.android.tools.r8.synthesis.SyntheticClassBuilder -> com.android.tools.r8.synthesis.e:
+    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():415:415 -> 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.kD:
+    com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.DexTypeList interfaces -> f
-    com.android.tools.r8.origin.Origin origin -> c
-    java.util.List virtualMethods -> j
-    java.util.List directMethods -> i
-    com.android.tools.r8.graph.DexType type -> b
-    java.util.List instanceFields -> h
-    java.util.List staticFields -> g
-    com.android.tools.r8.graph.DexItemFactory factory -> a
-    com.android.tools.r8.ProgramResource$Kind originKind -> d
-    com.android.tools.r8.graph.DexType superType -> e
-    java.util.List methods -> k
-    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexItemFactory):46:46 -> <init>
-    2:13:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexItemFactory):39:50 -> <init>
-    long lambda$build$0(long,com.android.tools.r8.graph.DexProgramClass) -> a
-    1:2:com.android.tools.r8.synthesis.SyntheticClassBuilder setOriginKind(com.android.tools.r8.ProgramResource$Kind):74:75 -> a
-    3:5:com.android.tools.r8.synthesis.SyntheticClassBuilder setInstanceFields(java.util.List):85:87 -> a
-    6:8:com.android.tools.r8.synthesis.SyntheticClassBuilder setDirectMethods(java.lang.Iterable):91:93 -> a
-    9:12:com.android.tools.r8.synthesis.SyntheticClassBuilder addMethod(java.util.function.Consumer):103:106 -> a
-    13:52:com.android.tools.r8.graph.DexClass build():111:150 -> a
-    53:53:com.android.tools.r8.graph.DexClass build():132:132 -> a
-    com.android.tools.r8.graph.ClassKind getClassKind() -> b
-    1:4:com.android.tools.r8.synthesis.SyntheticClassBuilder setInterfaces(java.util.List):67:70 -> b
-    5:7:com.android.tools.r8.synthesis.SyntheticClassBuilder setVirtualMethods(java.lang.Iterable):97:99 -> b
-    1:1:com.android.tools.r8.graph.DexItemFactory getFactory():58:58 -> c
-    2:4:com.android.tools.r8.synthesis.SyntheticClassBuilder setStaticFields(java.util.List):79:81 -> c
-    1:1:com.android.tools.r8.graph.DexType getType():62:62 -> d
-com.android.tools.r8.synthesis.SyntheticClassDefinition -> com.android.tools.r8.synthesis.f:
-    com.android.tools.r8.graph.DexClass clazz -> d
-    1:2:void <init>(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexClass):23:24 -> <init>
-    com.android.tools.r8.synthesis.SyntheticClasspathDefinition asClasspathDefinition() -> b
-    com.android.tools.r8.synthesis.SyntheticProgramDefinition asProgramDefinition() -> c
-    1:1:com.android.tools.r8.graph.DexClass getHolder():29:29 -> e
-    boolean isClasspathDefinition() -> g
-    1:1:boolean com.android.tools.r8.synthesis.SyntheticDefinition.isProgramDefinition():0:0 -> h
-    1:1:boolean isProgramDefinition():14 -> h
-com.android.tools.r8.synthesis.SyntheticClassReference -> com.android.tools.r8.synthesis.g:
-    com.android.tools.r8.graph.DexType type -> d
-    1:2:void <init>(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType):25:26 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getHolder():31:31 -> b
-com.android.tools.r8.synthesis.SyntheticClasspathClassBuilder -> com.android.tools.r8.synthesis.h:
-    1:2:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexItemFactory):17:18 -> <init>
-    1:1:com.android.tools.r8.graph.ClassKind getClassKind():23:23 -> b
-com.android.tools.r8.synthesis.SyntheticClasspathClassDefinition -> com.android.tools.r8.synthesis.i:
-    1:1:void <init>(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexClasspathClass):23:23 -> <init>
-    1:1:int internalCompareTo(com.android.tools.r8.synthesis.SyntheticDefinition,com.android.tools.r8.utils.structural.RepresentativeMap):16:16 -> a
-    2:2:int internalCompareTo(com.android.tools.r8.synthesis.SyntheticClasspathClassDefinition,com.android.tools.r8.utils.structural.RepresentativeMap):53:53 -> a
-    2:2:int internalCompareTo(com.android.tools.r8.synthesis.SyntheticDefinition,com.android.tools.r8.utils.structural.RepresentativeMap):16 -> a
-    3:3:void internalComputeHash(com.android.tools.r8.com.google.common.hash.Hasher,com.android.tools.r8.utils.structural.RepresentativeMap):48:48 -> a
-    com.android.tools.r8.synthesis.SyntheticClasspathDefinition asClasspathDefinition() -> b
-    boolean isClasspathDefinition() -> g
-    1:1:boolean isValid():43:43 -> i
-    2:2:boolean com.android.tools.r8.graph.DexClass.isPublic():630:630 -> i
-    2:2:boolean isValid():43 -> i
-    3:3:boolean isValid():43:43 -> i
-    4:4:boolean com.android.tools.r8.graph.DexClass.isFinal():575:575 -> i
-    4:4:boolean isValid():43 -> i
-    5:5:boolean isValid():43:43 -> i
-    1:1:com.android.tools.r8.synthesis.SyntheticClasspathClassReference toReference():38:38 -> j
-    1:1:com.android.tools.r8.synthesis.SyntheticReference toReference():16 -> j
-    1:6:java.lang.String toString():58:63 -> toString
-com.android.tools.r8.synthesis.SyntheticClasspathClassReference -> com.android.tools.r8.synthesis.j:
-    boolean $assertionsDisabled -> e
-    1:1:void <clinit>():18:18 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType):23:23 -> <init>
-    1:5:com.android.tools.r8.synthesis.SyntheticClasspathClassDefinition lookupDefinition(java.util.function.Function):28:32 -> a
-    1:5:com.android.tools.r8.synthesis.SyntheticDefinition lookupDefinition(java.util.function.Function):18 -> a
-    6:6:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
-    6:6:com.android.tools.r8.synthesis.SyntheticClasspathClassDefinition lookupDefinition(java.util.function.Function):32 -> a
-    6:6:com.android.tools.r8.synthesis.SyntheticDefinition lookupDefinition(java.util.function.Function):18 -> a
-    7:8:com.android.tools.r8.synthesis.SyntheticClasspathClassDefinition lookupDefinition(java.util.function.Function):32:33 -> a
-    7:8:com.android.tools.r8.synthesis.SyntheticDefinition lookupDefinition(java.util.function.Function):18 -> a
-    9:10:com.android.tools.r8.synthesis.SyntheticClasspathClassReference rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):38:39 -> a
-    9:10:com.android.tools.r8.synthesis.SyntheticReference rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):18 -> a
-com.android.tools.r8.synthesis.SyntheticClasspathDefinition -> com.android.tools.r8.internal.wE:
-com.android.tools.r8.synthesis.SyntheticDefinition -> com.android.tools.r8.synthesis.k:
-    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind kind -> b
+    com.android.tools.r8.origin.Origin origin -> d
+    com.android.tools.r8.graph.DexType type -> c
+    int nextMethodId -> g
+    java.util.List methods -> h
     boolean $assertionsDisabled -> a
-    com.android.tools.r8.synthesis.SynthesizingContext context -> c
-    1:1:void <clinit>():21:21 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext):29:33 -> <init>
-    int internalCompareTo(com.android.tools.r8.synthesis.SyntheticDefinition,com.android.tools.r8.utils.structural.RepresentativeMap) -> a
-    void internalComputeHash(com.android.tools.r8.com.google.common.hash.Hasher,com.android.tools.r8.utils.structural.RepresentativeMap) -> a
-    com.android.tools.r8.graph.DexType lambda$compareTo$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType) -> a
-    com.android.tools.r8.graph.DexType lambda$compareTo$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType) -> a
-    1:2:com.android.tools.r8.synthesis.SynthesizingContext getContext():59:59 -> a
-    1:2:int compareTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):99 -> a
-    3:8:int compareTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):99:104 -> a
-    9:9:com.android.tools.r8.synthesis.SynthesizingContext getContext():59:59 -> a
-    9:9:int compareTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):105 -> a
-    10:10:int compareTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):105:105 -> a
-    11:11:com.android.tools.r8.synthesis.SynthesizingContext getContext():59:59 -> a
-    11:11:int compareTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):106 -> a
-    12:42:int compareTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):106:136 -> a
-    43:43:com.android.tools.r8.com.google.common.hash.HashCode computeHash(com.android.tools.r8.utils.structural.RepresentativeMap,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap):66:66 -> a
-    44:44:com.android.tools.r8.synthesis.SynthesizingContext getContext():59:59 -> a
-    44:44:com.android.tools.r8.com.google.common.hash.HashCode computeHash(com.android.tools.r8.utils.structural.RepresentativeMap,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap):70 -> a
-    45:47:com.android.tools.r8.com.google.common.hash.HashCode computeHash(com.android.tools.r8.utils.structural.RepresentativeMap,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap):70:72 -> a
-    48:48:com.android.tools.r8.synthesis.SynthesizingContext getContext():59:59 -> a
-    48:48:com.android.tools.r8.com.google.common.hash.HashCode computeHash(com.android.tools.r8.utils.structural.RepresentativeMap,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap):75 -> a
-    49:50:com.android.tools.r8.com.google.common.hash.HashCode computeHash(com.android.tools.r8.utils.structural.RepresentativeMap,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap):75:76 -> a
-    51:58:com.android.tools.r8.com.google.common.hash.HashCode computeHash(com.android.tools.r8.utils.structural.RepresentativeMap,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap):73:80 -> a
-    com.android.tools.r8.synthesis.SyntheticClasspathDefinition asClasspathDefinition() -> b
-    com.android.tools.r8.synthesis.SyntheticProgramDefinition asProgramDefinition() -> c
-    1:1:com.android.tools.r8.synthesis.SynthesizingContext getContext():59:59 -> d
-    com.android.tools.r8.graph.DexClass getHolder() -> e
-    1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind getKind():55:55 -> f
-    boolean isClasspathDefinition() -> g
-    boolean isProgramDefinition() -> h
-    boolean isValid() -> i
-    com.android.tools.r8.synthesis.SyntheticReference toReference() -> j
-com.android.tools.r8.synthesis.SyntheticDefinitionsProvider -> com.android.tools.r8.internal.xE:
+    com.android.tools.r8.graph.DexType superType -> e
+    1:1:void <clinit>():28:28 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexItemFactory):40:40 -> <init>
+    2:11:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexItemFactory):35:44 -> <init>
+    long lambda$build$0(long,com.android.tools.r8.graph.DexProgramClass) -> a
+    1:1:com.android.tools.r8.synthesis.SyntheticClassBuilder addMethod(java.util.function.Consumer):60:60 -> a
+    2:2:java.lang.String com.android.tools.r8.synthesis.SyntheticClassBuilder.getNextMethodName():56:56 -> a
+    2:2:com.android.tools.r8.synthesis.SyntheticClassBuilder addMethod(java.util.function.Consumer):60 -> a
+    3:5:com.android.tools.r8.synthesis.SyntheticClassBuilder addMethod(java.util.function.Consumer):60:62 -> a
+    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.lD:
     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.synthesis.p:
+com.android.tools.r8.synthesis.SyntheticFinalization -> com.android.tools.r8.internal.nD:
+    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.synthesis.CommittedSyntheticsCollection synthetics -> c
-    1:1:void <clinit>():55:55 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.synthesis.CommittedSyntheticsCollection):219:221 -> <init>
-    1:16:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):253:268 -> a
-    17:36:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):265:284 -> a
-    37:37:boolean shouldAnnotateSynthetics(com.android.tools.r8.utils.InternalOptions):660:660 -> a
-    37:37:void handleSynthesizedClassMapping(java.util.List,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.shaking.MainDexClasses,java.util.Map):357 -> a
-    37:37:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):284 -> a
-    38:40:void handleSynthesizedClassMapping(java.util.List,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.shaking.MainDexClasses,java.util.Map):359:361 -> a
-    38:40:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):284 -> a
-    41:43:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication):436:438 -> a
-    41:43:void handleSynthesizedClassMapping(java.util.List,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.shaking.MainDexClasses,java.util.Map):364 -> a
-    41:43:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):284 -> a
-    44:44:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication):437:437 -> a
-    44:44:void handleSynthesizedClassMapping(java.util.List,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.shaking.MainDexClasses,java.util.Map):364 -> a
-    44:44:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):284 -> a
-    45:63:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):291:309 -> a
-    64:64:com.android.tools.r8.synthesis.SyntheticFinalization$SyntheticFinalizationGraphLens com.android.tools.r8.synthesis.SyntheticFinalization$Builder.build(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory):158:158 -> a
-    64:64:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):309 -> a
-    65:66:boolean com.android.tools.r8.synthesis.SyntheticFinalization$Builder.verifySubMap(java.util.Map,java.util.Map):174:175 -> a
-    65:66:com.android.tools.r8.synthesis.SyntheticFinalization$SyntheticFinalizationGraphLens com.android.tools.r8.synthesis.SyntheticFinalization$Builder.build(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory):158 -> a
-    65:66:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):309 -> a
-    67:70:com.android.tools.r8.synthesis.SyntheticFinalization$SyntheticFinalizationGraphLens com.android.tools.r8.synthesis.SyntheticFinalization$Builder.build(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory):159:162 -> a
-    67:70:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):309 -> a
-    71:71:com.android.tools.r8.graph.PrunedItems$Builder com.android.tools.r8.graph.PrunedItems.builder():30:30 -> a
-    71:71:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):310 -> a
-    72:74:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):311:313 -> a
-    75:76:void lambda$computeFinalSynthetics$0(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticProgramClassReference):272:273 -> a
-    77:78:void lambda$computeFinalSynthetics$1(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticMethodReference):276:277 -> a
-    79:81:void lambda$computeFinalSynthetics$2(com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.Set,com.android.tools.r8.synthesis.SyntheticReference):296:298 -> a
-    82:93:java.util.Map computeEquivalences(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableCollection,java.util.Map):321:332 -> a
-    94:100:java.util.Map computeEquivalences(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableCollection,java.util.Map):328:334 -> a
-    101:101:boolean verifyNoNestedSynthetics():344:344 -> a
-    102:102:void lambda$verifyNoNestedSynthetics$3(com.android.tools.r8.synthesis.SyntheticReference):346:346 -> a
-    103:103:boolean isNotSyntheticType(com.android.tools.r8.graph.DexType):339:339 -> a
-    103:103:void lambda$verifyNoNestedSynthetics$3(com.android.tools.r8.synthesis.SyntheticReference):346 -> a
-    104:104:void lambda$verifyNoNestedSynthetics$3(com.android.tools.r8.synthesis.SyntheticReference):346:346 -> a
-    105:130:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication,java.util.List):371:396 -> a
-    131:138:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication,java.util.List):395:402 -> a
-    139:139:com.android.tools.r8.graph.DexType lambda$updateSynthesizedClassMapping$4(com.android.tools.r8.graph.DexProgramClass):393:393 -> a
-    140:144:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexClasses,java.util.Map):410:414 -> a
-    145:146:void com.android.tools.r8.shaking.MainDexClasses.addAll(java.lang.Iterable):48:49 -> a
-    145:146:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexClasses,java.util.Map):432 -> a
-    147:157:void lambda$updateMainDexListWithSynthesizedClassMap$5(com.android.tools.r8.graph.DexApplication,java.util.Map,java.util.List,com.android.tools.r8.graph.DexType):417:427 -> a
-    158:310:com.android.tools.r8.graph.DexApplication buildLensAndProgram(com.android.tools.r8.graph.AppView,java.util.Map,java.util.Map,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,java.util.function.BiConsumer,java.util.function.BiConsumer):450:602 -> a
-    311:314:void lambda$buildLensAndProgram$6(java.util.Set,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):458:461 -> a
-    315:319:void lambda$buildLensAndProgram$6(java.util.Set,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):460:464 -> a
-    320:320:void lambda$buildLensAndProgram$6(java.util.Set,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):463:463 -> a
-    321:334:void lambda$buildLensAndProgram$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory,java.util.List,java.util.Set,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):471:484 -> a
-    335:338:void com.android.tools.r8.synthesis.SyntheticFinalization$Builder.moveSyntheticMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):138:141 -> a
-    335:338:void lambda$buildLensAndProgram$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory,java.util.List,java.util.Set,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):485 -> a
-    339:341:void lambda$buildLensAndProgram$8(com.android.tools.r8.graph.AppView,java.util.List,java.util.Set,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):493:495 -> a
-    342:342:com.android.tools.r8.graph.DexClass com.android.tools.r8.synthesis.SyntheticClassDefinition.getHolder():29:29 -> a
-    342:342:void lambda$buildLensAndProgram$8(com.android.tools.r8.graph.AppView,java.util.List,java.util.Set,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):496 -> a
-    343:346:void lambda$buildLensAndProgram$8(com.android.tools.r8.graph.AppView,java.util.List,java.util.Set,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):496:499 -> a
-    347:347:com.android.tools.r8.graph.DexClass com.android.tools.r8.synthesis.SyntheticClassDefinition.getHolder():29:29 -> a
-    347:347:void lambda$buildLensAndProgram$8(com.android.tools.r8.graph.AppView,java.util.List,java.util.Set,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):500 -> a
-    348:350:void lambda$buildLensAndProgram$8(com.android.tools.r8.graph.AppView,java.util.List,java.util.Set,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):500:502 -> a
-    351:353:void com.android.tools.r8.synthesis.SyntheticFinalization$Builder.moveSyntheticClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):132:134 -> a
-    351:353:void lambda$buildLensAndProgram$8(com.android.tools.r8.graph.AppView,java.util.List,java.util.Set,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):504 -> a
-    354:354:void lambda$buildLensAndProgram$8(com.android.tools.r8.graph.AppView,java.util.List,java.util.Set,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):508:508 -> a
-    355:361:void lambda$buildLensAndProgram$9(com.android.tools.r8.graph.DexApplication,java.util.function.BiConsumer,com.android.tools.r8.shaking.MainDexClasses,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):557:563 -> a
-    362:369:void lambda$buildLensAndProgram$9(com.android.tools.r8.graph.DexApplication,java.util.function.BiConsumer,com.android.tools.r8.shaking.MainDexClasses,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):559:566 -> a
-    370:375:void addMainDexAndSynthesizedFromForMember(com.android.tools.r8.synthesis.SyntheticDefinition,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.MainDexClasses,java.util.Set,java.util.function.Function):645:650 -> a
-    370:375:void lambda$buildLensAndProgram$9(com.android.tools.r8.graph.DexApplication,java.util.function.BiConsumer,com.android.tools.r8.shaking.MainDexClasses,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):566 -> a
-    376:386:void lambda$buildLensAndProgram$10(com.android.tools.r8.graph.DexApplication,java.util.function.BiConsumer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.MainDexClasses,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):576:586 -> a
-    387:387:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):283:283 -> a
-    387:387:void lambda$buildLensAndProgram$10(com.android.tools.r8.graph.DexApplication,java.util.function.BiConsumer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.MainDexClasses,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):586 -> a
-    388:388:void lambda$buildLensAndProgram$10(com.android.tools.r8.graph.DexApplication,java.util.function.BiConsumer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.MainDexClasses,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):586:586 -> a
-    389:399:void lambda$buildLensAndProgram$10(com.android.tools.r8.graph.DexApplication,java.util.function.BiConsumer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.MainDexClasses,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):578:588 -> a
-    400:405:void addMainDexAndSynthesizedFromForMember(com.android.tools.r8.synthesis.SyntheticDefinition,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.MainDexClasses,java.util.Set,java.util.function.Function):645:650 -> a
-    400:405:void lambda$buildLensAndProgram$10(com.android.tools.r8.graph.DexApplication,java.util.function.BiConsumer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.MainDexClasses,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):588 -> a
-    406:406:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):613:613 -> a
-    407:407:boolean shouldAnnotateSynthetics(com.android.tools.r8.utils.InternalOptions):660:660 -> a
-    407:407:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):613 -> a
-    408:408:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):615:615 -> a
-    409:409:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):614:614 -> a
-    410:413:void com.android.tools.r8.synthesis.SyntheticMarker.addMarkerToClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexItemFactory):25:28 -> a
-    410:413:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):614 -> a
-    414:414:void com.android.tools.r8.synthesis.SyntheticMarker.addMarkerToClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexItemFactory):27:27 -> a
-    414:414:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):614 -> a
-    415:421:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.createAnnotationSynthesizedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):405:411 -> a
-    415:421:void com.android.tools.r8.synthesis.SyntheticMarker.addMarkerToClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexItemFactory):27 -> a
-    415:421:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):614 -> a
-    422:422:void com.android.tools.r8.synthesis.SyntheticMarker.addMarkerToClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexItemFactory):26:26 -> a
-    422:422:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):614 -> a
-    423:423:void com.android.tools.r8.synthesis.SyntheticMarker.addMarkerToClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexItemFactory):23:23 -> a
-    423:423:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):614 -> a
-    424:438:com.android.tools.r8.graph.DexProgramClass createExternalMethodClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticMethodDefinition,com.android.tools.r8.graph.DexItemFactory):621:635 -> a
-    439:442:void lambda$createExternalMethodClass$12(com.android.tools.r8.synthesis.SyntheticMethodDefinition,com.android.tools.r8.synthesis.SyntheticMethodBuilder):626:629 -> a
-    443:443:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.getProto():388:388 -> a
-    443:443:void lambda$createExternalMethodClass$12(com.android.tools.r8.synthesis.SyntheticMethodDefinition,com.android.tools.r8.synthesis.SyntheticMethodBuilder):630 -> a
-    444:444:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexMethod.getProto():62:62 -> a
-    444:444:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.getProto():388 -> a
-    444:444:void lambda$createExternalMethodClass$12(com.android.tools.r8.synthesis.SyntheticMethodDefinition,com.android.tools.r8.synthesis.SyntheticMethodBuilder):630 -> a
-    445:447:void lambda$createExternalMethodClass$12(com.android.tools.r8.synthesis.SyntheticMethodDefinition,com.android.tools.r8.synthesis.SyntheticMethodBuilder):630:632 -> a
-    448:450:void lambda$createExternalMethodClass$12(com.android.tools.r8.synthesis.SyntheticMethodDefinition,com.android.tools.r8.synthesis.SyntheticMethodBuilder):631:633 -> a
-    451:451:com.android.tools.r8.graph.Code lambda$createExternalMethodClass$11(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):633:633 -> a
-    452:472:java.util.Map computeActualEquivalences(java.util.Collection,java.util.Map,com.android.tools.r8.graph.AppView,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap):670:690 -> a
-    473:473:void lambda$computeActualEquivalences$14(boolean,com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.List):674:674 -> a
-    474:480:java.util.List groupEquivalent(java.util.List,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):718:724 -> a
-    474:480:void lambda$computeActualEquivalences$14(boolean,com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.List):674 -> a
-    481:481:boolean com.android.tools.r8.synthesis.SyntheticDefinition.isEquivalentTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):90:90 -> a
-    481:481:java.util.List groupEquivalent(java.util.List,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):723 -> a
-    481:481:void lambda$computeActualEquivalences$14(boolean,com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.List):674 -> a
-    482:489:java.util.List groupEquivalent(java.util.List,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):726:733 -> a
-    482:489:void lambda$computeActualEquivalences$14(boolean,com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.List):674 -> a
-    490:492:void lambda$computeActualEquivalences$14(boolean,com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.List):675:677 -> a
-    493:496:com.android.tools.r8.synthesis.SyntheticDefinition findDeterministicRepresentative(java.util.List,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):753:756 -> a
-    493:496:void lambda$computeActualEquivalences$14(boolean,com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.List):677 -> a
-    497:501:void lambda$computeActualEquivalences$14(boolean,com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.List):679:683 -> a
-    502:505:void lambda$computeActualEquivalences$14(boolean,com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.List):682:685 -> a
-    506:506:java.util.List lambda$computeActualEquivalences$13(com.android.tools.r8.graph.DexType):684:684 -> a
-    507:517:void lambda$computeActualEquivalences$16(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):694:704 -> a
-    518:519:int com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup.compareToIncludingContext(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):202:203 -> a
-    518:519:boolean checkGroupsAreDistinct(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):744 -> a
-    518:519:void lambda$computeActualEquivalences$16(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):703 -> a
-    520:520:boolean checkGroupsAreDistinct(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):745:745 -> a
-    520:520:void lambda$computeActualEquivalences$16(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):703 -> a
-    521:522:int com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup.compareToIncludingContext(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):202:203 -> a
-    521:522:boolean checkGroupsAreDistinct(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):746 -> a
-    521:522:void lambda$computeActualEquivalences$16(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):703 -> a
-    523:523:boolean checkGroupsAreDistinct(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):746:746 -> a
-    523:523:void lambda$computeActualEquivalences$16(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):703 -> a
-    524:526:void lambda$computeActualEquivalences$16(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):705:707 -> a
-    527:527:int lambda$computeActualEquivalences$15(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):696:696 -> a
-    528:529:int com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup.compareToIncludingContext(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):202:203 -> a
-    528:529:int lambda$computeActualEquivalences$15(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):696 -> a
-    530:539:com.android.tools.r8.graph.DexType createExternalType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.AppView):768:777 -> a
-    540:546:com.android.tools.r8.graph.DexType createExternalType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.AppView):773:779 -> a
-    547:547:boolean isNotSyntheticType(com.android.tools.r8.graph.DexType):339:339 -> a
-    547:547:com.android.tools.r8.graph.DexType createExternalType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.AppView):779 -> a
-    548:548:com.android.tools.r8.graph.DexType createExternalType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.AppView):780:780 -> a
-    549:574:java.util.Collection computePotentialEquivalences(java.util.Map,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):795:820 -> a
-    575:576:void lambda$computePotentialEquivalences$18(java.util.Set,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexType):810:811 -> a
-    577:577:com.android.tools.r8.graph.DexType lambda$computePotentialEquivalences$19(java.util.Set,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):814:814 -> a
-    578:578:java.util.List lambda$computePotentialEquivalences$20(com.android.tools.r8.com.google.common.hash.HashCode):818:818 -> a
-    579:592:java.util.Map lookupDefinitions(com.android.tools.r8.graph.AppView,java.util.Collection):825:838 -> a
-    1:7:void finalize(com.android.tools.r8.graph.AppView):225:231 -> b
-    8:8:com.android.tools.r8.ir.code.NumberGenerator lambda$createExternalType$17(com.android.tools.r8.graph.DexType):769:769 -> b
-    1:6:void finalizeWithClassHierarchy(com.android.tools.r8.graph.AppView):236:241 -> c
-    1:4:void finalizeWithLiveness(com.android.tools.r8.graph.AppView):246:249 -> d
-com.android.tools.r8.synthesis.SyntheticFinalization$1 -> com.android.tools.r8.synthesis.l:
-    com.android.tools.r8.synthesis.SyntheticFinalization$Builder val$lensBuilder -> g
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticFinalization$Builder):528:528 -> <init>
-    1:1:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):536:536 -> a
-    2:2:void com.android.tools.r8.synthesis.SyntheticFinalization$Builder.move(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):149:149 -> a
-    2:2:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):536 -> a
-    3:3:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):541:541 -> a
-    4:5:void com.android.tools.r8.synthesis.SyntheticFinalization$Builder.move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):153:154 -> a
-    4:5:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):541 -> a
-    6:6:void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):546:546 -> a
-    7:7:void com.android.tools.r8.synthesis.SyntheticFinalization$Builder.move(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):145:145 -> a
-    7:7:void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):546 -> a
-    1:1:com.android.tools.r8.graph.DexType mapClassType(com.android.tools.r8.graph.DexType):531:531 -> b
-com.android.tools.r8.synthesis.SyntheticFinalization$Builder -> com.android.tools.r8.synthesis.m:
-    java.util.Map syntheticClassesMap -> b
-    java.util.Map syntheticMethodsMap -> c
-    com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap originalMethodSignatures -> g
-    java.util.Map typeMap -> d
-    com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeHashMap fieldMap -> e
-    boolean $assertionsDisabled -> a
-    java.util.Map methodMap -> f
-    1:1:void <clinit>():117:117 -> <clinit>
-    1:12:void <init>():117:128 -> <init>
-    13:13:void <init>(com.android.tools.r8.synthesis.SyntheticFinalization$1):117:117 -> <init>
-com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup -> com.android.tools.r8.synthesis.n:
+    com.android.tools.r8.com.google.common.collect.ImmutableSet legacySyntheticTypes -> c
+    1:1:void <clinit>():39:39 -> <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):86:89 -> <init>
+    1:1:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):93:93 -> a
+    2:3:boolean com.android.tools.r8.synthesis.SyntheticFinalization.verifyNoNestedSynthetics():153:154 -> a
+    2:3:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):93 -> a
+    4:33:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):94:123 -> a
+    34:34:boolean com.android.tools.r8.synthesis.SyntheticFinalization.shouldAnnotateSynthetics(com.android.tools.r8.utils.InternalOptions):345:345 -> 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):165 -> a
+    34:34:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):123 -> 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):167:169 -> a
+    35:37:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):123 -> a
+    38:40:void com.android.tools.r8.synthesis.SyntheticFinalization.clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication):245:247 -> 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):172 -> a
+    38:40:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):123 -> a
+    41:41:void com.android.tools.r8.synthesis.SyntheticFinalization.clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication):246:246 -> 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):172 -> a
+    41:41:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):123 -> a
+    42:63:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):126:147 -> a
+    64:64:com.android.tools.r8.graph.PrunedItems$Builder com.android.tools.r8.graph.PrunedItems.builder():30:30 -> a
+    64:64:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):148 -> a
+    65:65:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):148:148 -> a
+    66:66:void lambda$computeFinalSynthetics$0(java.util.Set,com.android.tools.r8.graph.DexProgramClass):132:132 -> a
+    67:92:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication,java.util.List):179:204 -> a
+    93:100:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication,java.util.List):203:210 -> a
+    101:101:com.android.tools.r8.graph.DexType lambda$updateSynthesizedClassMapping$1(com.android.tools.r8.graph.DexProgramClass):201:201 -> a
+    102:106:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexClasses,java.util.Set):218:222 -> a
+    107:108:void com.android.tools.r8.shaking.MainDexClasses.addAll(java.lang.Iterable):48:49 -> a
+    107:108:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexClasses,java.util.Set):241 -> a
+    109:119:void lambda$updateMainDexListWithSynthesizedClassMap$2(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.List,com.android.tools.r8.graph.DexType):225:235 -> a
+    120:143: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):260:283 -> a
+    144:147:void lambda$buildLensAndProgram$3(java.util.Set,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):273:276 -> a
+    148:152:void lambda$buildLensAndProgram$3(java.util.Set,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):275:279 -> a
+    153:153:void lambda$buildLensAndProgram$3(java.util.Set,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):278:278 -> a
+    154:171:void lambda$buildLensAndProgram$6(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):285:302 -> a
+    172:172:boolean com.android.tools.r8.synthesis.SyntheticFinalization.shouldAnnotateSynthetics(com.android.tools.r8.utils.InternalOptions):345:345 -> a
+    172:172:void lambda$buildLensAndProgram$6(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):302 -> a
+    173:176:void lambda$buildLensAndProgram$6(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):305:308 -> a
+    177:179: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):403:405 -> a
+    177:179:void lambda$buildLensAndProgram$6(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):307 -> a
+    180:180:void lambda$buildLensAndProgram$6(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):306:306 -> a
+    181:209:void lambda$buildLensAndProgram$6(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):303:331 -> a
+    210:210:void lambda$buildLensAndProgram$6(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):330:330 -> a
+    211:217:void lambda$buildLensAndProgram$6(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):327:333 -> a
+    218:220:void lambda$buildLensAndProgram$5(com.android.tools.r8.synthesis.SyntheticMethodDefinition,com.android.tools.r8.synthesis.SyntheticMethodBuilder):293:295 -> a
+    221:221:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.getProto():397:397 -> a
+    221:221:void lambda$buildLensAndProgram$5(com.android.tools.r8.synthesis.SyntheticMethodDefinition,com.android.tools.r8.synthesis.SyntheticMethodBuilder):296 -> a
+    222:224:void lambda$buildLensAndProgram$5(com.android.tools.r8.synthesis.SyntheticMethodDefinition,com.android.tools.r8.synthesis.SyntheticMethodBuilder):296:298 -> a
+    225:227:void lambda$buildLensAndProgram$5(com.android.tools.r8.synthesis.SyntheticMethodDefinition,com.android.tools.r8.synthesis.SyntheticMethodBuilder):297:299 -> a
+    228:228:com.android.tools.r8.graph.Code lambda$buildLensAndProgram$4(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):299:299 -> a
+    229:247:java.util.Map computeActualEquivalences(java.util.Collection,boolean,com.android.tools.r8.graph.DexItemFactory):351:369 -> a
+    248:248:java.util.List lambda$computeActualEquivalences$7(com.android.tools.r8.graph.DexType):363:363 -> a
+    249:254:void lambda$computeActualEquivalences$9(com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):371:376 -> a
+    255:255:int com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup.compareTo(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):75:75 -> a
+    255:255:boolean com.android.tools.r8.synthesis.SyntheticFinalization.checkGroupsAreDistinct(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):408 -> a
+    255:255:void lambda$computeActualEquivalences$9(com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):376 -> a
+    256:256:boolean com.android.tools.r8.synthesis.SyntheticFinalization.checkGroupsAreDistinct(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):408:408 -> a
+    256:256:void lambda$computeActualEquivalences$9(com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):376 -> a
+    257:259: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):427:429 -> a
+    257:259:void lambda$computeActualEquivalences$9(com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):377 -> a
+    260:260: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):428:428 -> a
+    260:260:void lambda$computeActualEquivalences$9(com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):377 -> a
+    261:261: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):427:427 -> a
+    261:261:void lambda$computeActualEquivalences$9(com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):377 -> a
+    262:262:void lambda$computeActualEquivalences$9(com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):378:378 -> a
+    263:277:java.util.List com.android.tools.r8.synthesis.SyntheticFinalization.groupEquivalent(java.util.List,boolean):386:400 -> a
+    263:277:void lambda$computeActualEquivalences$8(boolean,java.util.Map,java.util.List):354 -> a
+    278:278:void lambda$computeActualEquivalences$8(boolean,java.util.Map,java.util.List):355:355 -> a
+    279:282:com.android.tools.r8.synthesis.SyntheticDefinition com.android.tools.r8.synthesis.SyntheticFinalization.findDeterministicRepresentative(java.util.List):415:418 -> a
+    279:282:void lambda$computeActualEquivalences$8(boolean,java.util.Map,java.util.List):356 -> a
+    283:287:void lambda$computeActualEquivalences$8(boolean,java.util.Map,java.util.List):358:362 -> a
+    288:291:void lambda$computeActualEquivalences$8(boolean,java.util.Map,java.util.List):361:364 -> a
+    292:303:java.util.Collection computePotentialEquivalences(java.util.Map,boolean):436:447 -> a
+    304:304:com.android.tools.r8.graph.DexType lambda$computePotentialEquivalences$10(java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):441:441 -> a
+    305:305:java.util.List lambda$computePotentialEquivalences$11(com.android.tools.r8.com.google.common.hash.HashCode):445:445 -> a
+    306:308:java.util.Map lookupSyntheticMethodDefinitions(com.android.tools.r8.graph.DexApplication):452:454 -> a
+    309:315:com.android.tools.r8.synthesis.SyntheticDefinition com.android.tools.r8.synthesis.SyntheticMethodReference.lookupDefinition(java.util.function.Function):39:45 -> a
+    309:315:java.util.Map lookupSyntheticMethodDefinitions(com.android.tools.r8.graph.DexApplication):454 -> a
+    316:321:java.util.Map lookupSyntheticMethodDefinitions(com.android.tools.r8.graph.DexApplication):461:466 -> a
+    322:322:java.util.Map lookupSyntheticMethodDefinitions(com.android.tools.r8.graph.DexApplication):457:457 -> a
+com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup -> com.android.tools.r8.internal.mD:
     java.util.List members -> b
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():181:181 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.synthesis.SyntheticDefinition,java.util.List):184:187 -> <init>
-    1:1:java.util.List access$200(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):181:181 -> a
-    2:2:java.util.List getMembers():195:195 -> a
-    1:1:com.android.tools.r8.synthesis.SyntheticDefinition getRepresentative():191:191 -> b
-    1:4:java.lang.String toString():208:211 -> toString
-com.android.tools.r8.synthesis.SyntheticFinalization$Result -> com.android.tools.r8.internal.yE:
+    1:1:void <clinit>():51:51 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.synthesis.SyntheticDefinition,java.util.List):59:62 -> <init>
+    1:1:java.util.List getMembers():70:70 -> a
+    2:2:int compareTo(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):75:75 -> a
+    1:1:com.android.tools.r8.synthesis.SyntheticDefinition getRepresentative():66:66 -> b
+    1:1:int compareTo(java.lang.Object):51:51 -> compareTo
+    2:2:int com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup.compareTo(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):75:75 -> compareTo
+    2:2:int compareTo(java.lang.Object):51 -> compareTo
+    3:3:int com.android.tools.r8.synthesis.SyntheticMethodDefinition.compareTo(java.lang.Object):20:20 -> compareTo
+    3:3:int com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup.compareTo(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):75 -> compareTo
+    3:3:int compareTo(java.lang.Object):51 -> compareTo
+com.android.tools.r8.synthesis.SyntheticFinalization$Result -> com.android.tools.r8.internal.nD$a:
     com.android.tools.r8.synthesis.CommittedItems commit -> a
-    com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens lens -> b
-    com.android.tools.r8.graph.PrunedItems prunedItems -> c
-    1:4:void <init>(com.android.tools.r8.synthesis.CommittedItems,com.android.tools.r8.synthesis.SyntheticFinalization$SyntheticFinalizationGraphLens,com.android.tools.r8.graph.PrunedItems):63:66 -> <init>
-com.android.tools.r8.synthesis.SyntheticFinalization$SyntheticFinalizationGraphLens -> com.android.tools.r8.synthesis.o:
-    java.util.Map syntheticMethodsMap -> m
-    java.util.Map syntheticTypeMap -> l
-    1:1:void <init>(com.android.tools.r8.graph.GraphLens,java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.synthesis.SyntheticFinalization$1):70:70 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.GraphLens,java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap,com.android.tools.r8.graph.DexItemFactory):84:86 -> <init>
-    1:8:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):106:113 -> a
-    1:7:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):95:101 -> b
-com.android.tools.r8.synthesis.SyntheticItems -> com.android.tools.r8.synthesis.s:
-    com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics pending -> d
+    com.android.tools.r8.graph.PrunedItems prunedItems -> b
+    1:3:void <init>(com.android.tools.r8.synthesis.CommittedItems,com.android.tools.r8.graph.PrunedItems):45:47 -> <init>
+com.android.tools.r8.synthesis.SyntheticItems -> com.android.tools.r8.internal.oD:
+    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.synthesis.CommittedSyntheticsCollection committed -> c
-    1:1:void <clinit>():36:36 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.synthesis.CommittedItems):95:95 -> <init>
-    2:2:void <init>(int,com.android.tools.r8.synthesis.CommittedSyntheticsCollection):98:98 -> <init>
-    3:18:void <init>(int,com.android.tools.r8.synthesis.CommittedSyntheticsCollection):85:100 -> <init>
+    com.android.tools.r8.com.google.common.collect.ImmutableSet legacySyntheticTypes -> d
+    1:1:void <clinit>():40:40 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.synthesis.CommittedItems):97:97 -> <init>
+    2:2:void <init>(int,com.android.tools.r8.com.google.common.collect.ImmutableSet,com.android.tools.r8.com.google.common.collect.ImmutableMap):103:103 -> <init>
+    3:37:void <init>(int,com.android.tools.r8.com.google.common.collect.ImmutableSet,com.android.tools.r8.com.google.common.collect.ImmutableMap):73:107 -> <init>
     1:1:com.android.tools.r8.graph.PrunedItems com.android.tools.r8.graph.PrunedItems.empty(com.android.tools.r8.graph.DexApplication):34:34 -> a
-    1:1:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.DexApplication):365 -> a
-    2:2:com.android.tools.r8.synthesis.CommittedItems commitPrunedItems(com.android.tools.r8.graph.PrunedItems):369:369 -> a
-    2:2:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.DexApplication):365 -> a
-    3:11:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):105:113 -> a
-    12:12:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder com.android.tools.r8.synthesis.CommittedSyntheticsCollection.builder():139:139 -> a
-    12:12:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):113 -> a
-    13:25:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):115:127 -> a
-    26:37:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):126:137 -> a
-    38:40:void lambda$collectSyntheticInputs$0(com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder,com.android.tools.r8.synthesis.SyntheticMarker,com.android.tools.r8.graph.ProgramMethod):122:122 -> a
-    41:47:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function):154:160 -> a
-    48:48:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
-    48:48:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function):160 -> a
-    49:57:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function):160:168 -> a
-    58:58:boolean isLegacyCommittedSynthetic(com.android.tools.r8.graph.DexType):193:193 -> a
-    58:58:boolean isLegacySyntheticClass(com.android.tools.r8.graph.DexType):205 -> a
-    59:59:boolean isLegacyPendingSynthetic(com.android.tools.r8.graph.DexType):201:201 -> a
-    59:59:boolean isLegacySyntheticClass(com.android.tools.r8.graph.DexType):205 -> a
-    60:70:boolean verifySyntheticLambdaProperty(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate,java.util.function.Predicate):234:244 -> a
-    71:71:java.util.Collection getLegacyPendingClasses():250:250 -> a
-    72:82:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition):254:264 -> a
-    83:83:void addLegacySyntheticClass(com.android.tools.r8.graph.DexProgramClass):271:271 -> a
-    84:84:boolean isCommittedSynthetic(com.android.tools.r8.graph.DexType):189:189 -> a
-    84:84:void addLegacySyntheticClass(com.android.tools.r8.graph.DexProgramClass):271 -> a
-    85:88:void addLegacySyntheticClass(com.android.tools.r8.graph.DexProgramClass):271:274 -> a
-    89:96:com.android.tools.r8.graph.DexProgramClass createClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory,java.util.function.Supplier,java.util.function.Consumer):285:292 -> a
-    97:97:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):359:359 -> a
-    97:97:com.android.tools.r8.graph.DexProgramClass createClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory,java.util.function.Supplier,java.util.function.Consumer):292 -> a
-    98:102:com.android.tools.r8.graph.DexClasspathClass createClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory):300:304 -> a
-    103:103:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):359:359 -> a
-    103:103:com.android.tools.r8.graph.DexClasspathClass createClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory):304 -> a
-    104:104:com.android.tools.r8.graph.DexClass com.android.tools.r8.synthesis.SyntheticClassDefinition.getHolder():29:29 -> a
-    104:104:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):359 -> a
-    104:104:com.android.tools.r8.graph.DexClasspathClass createClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory):304 -> a
-    105:105:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):359:359 -> a
-    105:105:com.android.tools.r8.graph.DexClasspathClass createClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory):304 -> a
-    106:106:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):314:314 -> a
-    107:108:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,com.android.tools.r8.ir.conversion.MethodProcessingId):330:331 -> a
-    109:109:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,com.android.tools.r8.ir.conversion.MethodProcessingId):324:324 -> a
-    110:123:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,java.util.function.Supplier):341:354 -> a
-    124:124:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):359:359 -> a
-    124:124:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,java.util.function.Supplier):354 -> a
-    125:125:void lambda$createMethod$1(com.android.tools.r8.synthesis.SyntheticMethodBuilder):351:351 -> a
-    126:126:com.android.tools.r8.synthesis.CommittedItems commitPrunedItems(com.android.tools.r8.graph.PrunedItems):369:369 -> a
-    127:127:com.android.tools.r8.synthesis.CommittedItems commitRewrittenWithLens(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):374:374 -> a
-    128:128:com.android.tools.r8.graph.PrunedItems com.android.tools.r8.graph.PrunedItems.empty(com.android.tools.r8.graph.DexApplication):34:34 -> a
-    128:128:com.android.tools.r8.synthesis.CommittedItems commitRewrittenWithLens(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):376 -> a
-    129:129:com.android.tools.r8.synthesis.CommittedItems commitRewrittenWithLens(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):376:376 -> a
-    130:130:com.android.tools.r8.synthesis.CommittedItems commitRewrittenWithLens(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):375:375 -> a
-    131:133:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):384:386 -> a
-    134:134:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder com.android.tools.r8.synthesis.CommittedSyntheticsCollection.builder():139:139 -> a
-    134:134:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):386 -> a
-    135:135:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):388:388 -> a
-    136:137:boolean verifyClassesAreInApp(com.android.tools.r8.graph.DexApplication,java.util.Collection):423:424 -> a
-    136:137:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):388 -> a
-    138:153:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):389:404 -> a
-    154:154:boolean com.android.tools.r8.graph.DexApplication$Builder.isDirect():0:0 -> a
-    154:154:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):404 -> a
-    155:156:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):405:406 -> a
-    157:157:com.android.tools.r8.graph.DexClass com.android.tools.r8.synthesis.SyntheticClassDefinition.getHolder():29:29 -> a
-    157:157:com.android.tools.r8.graph.DexClasspathClass com.android.tools.r8.synthesis.SyntheticClasspathClassDefinition.getHolder():16 -> a
-    157:157:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):406 -> a
-    158:158:com.android.tools.r8.graph.DexClasspathClass com.android.tools.r8.synthesis.SyntheticClasspathClassDefinition.getHolder():16:16 -> a
-    158:158:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):406 -> a
-    159:170:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):406:417 -> a
-    1:2:com.android.tools.r8.synthesis.CommittedItems createInitialSyntheticItems(com.android.tools.r8.graph.DexApplication):89:90 -> b
-    3:7:java.lang.String getNextSyntheticId():143:147 -> b
-    8:8:java.lang.String getNextSyntheticId():144:144 -> b
-    9:9:boolean isCommittedSynthetic(com.android.tools.r8.graph.DexType):189:189 -> b
-    9:9:boolean isNonLegacySynthetic(com.android.tools.r8.graph.DexType):217 -> b
-    10:10:boolean isPendingSynthetic(com.android.tools.r8.graph.DexType):197:197 -> b
-    10:10:boolean isNonLegacySynthetic(com.android.tools.r8.graph.DexType):217 -> b
-    11:11:boolean isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):225:225 -> b
-    12:12:boolean isSyntheticClass(com.android.tools.r8.graph.DexType):221:221 -> b
-    12:12:boolean isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):225 -> b
-    13:14:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):432:433 -> b
-    1:1:java.util.Collection getPendingSyntheticClasses():185:185 -> c
-    2:2:boolean isPendingSynthetic(com.android.tools.r8.graph.DexType):197:197 -> c
-    1:1:boolean hasPendingSyntheticClasses():181:181 -> d
-    1:5:boolean verifyNonLegacySyntheticsAreCommitted():172:176 -> e
-com.android.tools.r8.synthesis.SyntheticItems$1 -> com.android.tools.r8.synthesis.q:
-com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics -> com.android.tools.r8.synthesis.r:
-    java.util.Map legacyClasses -> b
-    java.util.concurrent.ConcurrentHashMap nonLegacyDefinitions -> c
-    boolean $assertionsDisabled -> a
-    1:1:void <clinit>():44:44 -> <clinit>
-    1:10:void <init>():44:53 -> <init>
-    11:11:void <init>(com.android.tools.r8.synthesis.SyntheticItems$1):44:44 -> <init>
-    1:1:java.util.Map access$100(com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics):44:44 -> a
-    2:2:boolean containsType(com.android.tools.r8.graph.DexType):61:61 -> a
-    3:4:boolean verifyNotRewritten(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):65:66 -> a
-    5:13:java.util.Collection getAllProgramClasses():71:79 -> a
-    1:1:java.util.concurrent.ConcurrentHashMap access$200(com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics):44:44 -> b
-    2:2:boolean isEmpty():57:57 -> b
-com.android.tools.r8.synthesis.SyntheticMarker -> com.android.tools.r8.synthesis.t:
-    com.android.tools.r8.synthesis.SyntheticMarker NO_MARKER -> a
-    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind kind -> c
-    boolean $assertionsDisabled -> b
-    com.android.tools.r8.synthesis.SynthesizingContext context -> d
-    1:56:void <clinit>():16:71 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext):76:78 -> <init>
-    1:27:com.android.tools.r8.synthesis.SyntheticMarker internalStripMarkerFromClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):42:68 -> a
-    1:27:com.android.tools.r8.synthesis.SyntheticMarker stripMarkerFromClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):33 -> a
-    28:28:com.android.tools.r8.synthesis.SyntheticMarker internalStripMarkerFromClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):47:47 -> a
-    28:28:com.android.tools.r8.synthesis.SyntheticMarker stripMarkerFromClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):33 -> a
-    29:31:com.android.tools.r8.synthesis.SyntheticMarker stripMarkerFromClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):34:34 -> a
-    32:32:com.android.tools.r8.synthesis.SynthesizingContext getContext():94:94 -> a
-    1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind getKind():90:90 -> b
-    1:1:boolean isSyntheticClass():86:86 -> c
-    1:1:boolean isSyntheticMethods():82:82 -> d
-com.android.tools.r8.synthesis.SyntheticMethodBuilder -> com.android.tools.r8.synthesis.u:
+    1:1:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.DexApplication):321 -> a
+    2:2:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.DexApplication):321:321 -> a
+    3:14:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):112:123 -> a
+    15:34: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):154:173 -> a
+    15:34:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):123 -> a
+    35:45:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):127:137 -> a
+    46:46: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
+    46:46:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):137 -> a
+    47:58:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):138:149 -> a
+    59:60: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):133:134 -> a
+    61:73:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function):194:206 -> a
+    74:74:boolean isCommittedSynthetic(com.android.tools.r8.graph.DexType):224:224 -> a
+    75:75:java.util.Collection getLegacyPendingClasses():259:259 -> a
+    76:79:void addLegacySyntheticClass(com.android.tools.r8.graph.DexProgramClass):277:280 -> 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):286:286 -> a
+    81:81: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):294:294 -> a
+    82:82: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):302:302 -> a
+    83:90:com.android.tools.r8.synthesis.SynthesizingContext com.android.tools.r8.synthesis.SyntheticItems.getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition):263:270 -> a
+    83:90: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):305 -> a
+    91:95: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):306:310 -> a
+    96:96:void com.android.tools.r8.synthesis.SyntheticItems.addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):315:315 -> a
+    96:96: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):310 -> a
+    97:98:com.android.tools.r8.synthesis.CommittedItems commitPrunedItems(com.android.tools.r8.graph.PrunedItems):326:327 -> a
+    99:99:com.android.tools.r8.synthesis.CommittedItems commitPrunedItems(com.android.tools.r8.graph.PrunedItems):325:325 -> a
+    100:103:com.android.tools.r8.synthesis.CommittedItems commitRewrittenWithLens(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):338:341 -> a
+    104:117:com.android.tools.r8.synthesis.SyntheticReference com.android.tools.r8.synthesis.SyntheticMethodReference.rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):50:63 -> a
+    104:117:com.android.tools.r8.synthesis.CommittedItems commitRewrittenWithLens(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):341 -> a
+    118:118:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticMethodReference.getHolder():34:34 -> a
+    118:118:com.android.tools.r8.synthesis.CommittedItems commitRewrittenWithLens(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):343 -> a
+    119:131:com.android.tools.r8.synthesis.CommittedItems commitRewrittenWithLens(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):343:355 -> a
+    132:132:com.android.tools.r8.synthesis.CommittedItems commitRewrittenWithLens(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):349:349 -> a
+    133: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):368:368 -> a
+    134:135:boolean com.android.tools.r8.synthesis.SyntheticItems.verifyClassesAreInApp(com.android.tools.r8.graph.DexApplication,java.util.Collection):448:449 -> a
+    134:135: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):368 -> a
+    136:146: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):371:381 -> a
+    147:152: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):422:427 -> a
+    147:152: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):382 -> a
+    153:164: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):383:394 -> a
+    165:165:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticMethodReference.getHolder():34:34 -> a
+    165: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):394 -> a
+    166:175: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):394:403 -> a
+    176:181:void filteredAdd(java.util.Set,java.util.Set,com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder):409:414 -> a
+    182:185:void filteredAdd(com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.Set,com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder):434:437 -> a
+    186:187: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):439:440 -> a
+    1:2:com.android.tools.r8.synthesis.CommittedItems createInitialSyntheticItems(com.android.tools.r8.graph.DexApplication):91:92 -> b
+    3:7:java.lang.String getNextSyntheticId():183:187 -> b
+    8:8:java.lang.String getNextSyntheticId():184:184 -> b
+    9:9:boolean isPendingSynthetic(com.android.tools.r8.graph.DexType):232:232 -> b
+    10:10:boolean isLegacySyntheticClass(com.android.tools.r8.graph.DexProgramClass):255:255 -> b
+    11:11:boolean com.android.tools.r8.synthesis.SyntheticItems.isLegacyCommittedSynthetic(com.android.tools.r8.graph.DexType):228:228 -> b
+    11:11:boolean com.android.tools.r8.synthesis.SyntheticItems.isLegacySyntheticClass(com.android.tools.r8.graph.DexType):251 -> b
+    11:11:boolean isLegacySyntheticClass(com.android.tools.r8.graph.DexProgramClass):255 -> b
+    12:12:boolean com.android.tools.r8.synthesis.SyntheticItems.isLegacyPendingSynthetic(com.android.tools.r8.graph.DexType):236:236 -> b
+    12:12:boolean com.android.tools.r8.synthesis.SyntheticItems.isLegacySyntheticClass(com.android.tools.r8.graph.DexType):251 -> b
+    12:12:boolean isLegacySyntheticClass(com.android.tools.r8.graph.DexProgramClass):255 -> b
+    13:16:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):457:460 -> b
+    1:7:java.util.Collection getPendingSyntheticClasses():214:220 -> c
+    8:11:boolean isSyntheticClass(com.android.tools.r8.graph.DexType):240:243 -> c
+    1:1:boolean verifyNotInternalSynthetic(com.android.tools.r8.graph.DexType):61:61 -> d
+    2:2:boolean hasPendingSyntheticClasses():210:210 -> d
+com.android.tools.r8.synthesis.SyntheticMethodBuilder -> com.android.tools.r8.internal.pD:
     com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator codeGenerator -> f
-    com.android.tools.r8.graph.DexString name -> c
     com.android.tools.r8.synthesis.SyntheticClassBuilder parent -> b
     com.android.tools.r8.graph.DexProto proto -> d
     com.android.tools.r8.cf.CfVersion classFileVersion -> e
     boolean $assertionsDisabled -> a
+    java.lang.String name -> c
     com.android.tools.r8.graph.MethodAccessFlags accessFlags -> g
-    1:1:void <clinit>():17:17 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.synthesis.SyntheticClassBuilder):30:30 -> <init>
-    2:9:void <init>(com.android.tools.r8.synthesis.SyntheticClassBuilder):24:31 -> <init>
-    1:1:com.android.tools.r8.synthesis.SyntheticMethodBuilder setName(java.lang.String):35:35 -> a
-    2:4:com.android.tools.r8.synthesis.SyntheticMethodBuilder setName(com.android.tools.r8.graph.DexString):39:41 -> a
-    2:4:com.android.tools.r8.synthesis.SyntheticMethodBuilder setName(java.lang.String):35 -> a
-    5:5:com.android.tools.r8.synthesis.SyntheticMethodBuilder setProto(com.android.tools.r8.graph.DexProto):46:46 -> a
-    6:6:com.android.tools.r8.synthesis.SyntheticMethodBuilder setClassFileVersion(com.android.tools.r8.cf.CfVersion):51:51 -> a
-    7:7:com.android.tools.r8.synthesis.SyntheticMethodBuilder setCode(com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator):56:56 -> a
-    8:8:com.android.tools.r8.synthesis.SyntheticMethodBuilder setAccessFlags(com.android.tools.r8.graph.MethodAccessFlags):61:61 -> a
-    9:9:com.android.tools.r8.graph.DexEncodedMethod build():66:66 -> a
-    10:10:com.android.tools.r8.graph.DexMethod getMethodSignature():98:98 -> a
-    10:10:com.android.tools.r8.graph.DexEncodedMethod build():68 -> a
-    11:11:com.android.tools.r8.graph.DexEncodedMethod build():69:69 -> a
-    12:12:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():102:102 -> a
-    12:12:com.android.tools.r8.graph.DexEncodedMethod build():72 -> a
-    13:15:com.android.tools.r8.graph.DexEncodedMethod build():73:75 -> a
-    16:16:com.android.tools.r8.graph.Code getCodeObject(com.android.tools.r8.graph.DexMethod):106:106 -> a
-    16:16:com.android.tools.r8.graph.DexEncodedMethod build():76 -> a
-    17:17:com.android.tools.r8.graph.DexEncodedMethod build():76:76 -> a
-    18:18: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):296:296 -> a
-    18:18:com.android.tools.r8.graph.DexEncodedMethod build():76 -> a
-    19:19:com.android.tools.r8.graph.DexEncodedMethod build():79:79 -> a
-    20:21:boolean isValidSyntheticMethod(com.android.tools.r8.graph.DexEncodedMethod):90:91 -> a
-    22:22:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():501:501 -> a
-    22:22:boolean isValidSyntheticMethod(com.android.tools.r8.graph.DexEncodedMethod):92 -> a
-    23:23:boolean isValidSyntheticMethod(com.android.tools.r8.graph.DexEncodedMethod):93:93 -> a
-    24:24:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.DexEncodedMethod.getParameterAnnotations():898:898 -> a
-    24:24:boolean isValidSyntheticMethod(com.android.tools.r8.graph.DexEncodedMethod):94 -> a
-    25:25:boolean isValidSyntheticMethod(com.android.tools.r8.graph.DexEncodedMethod):94:94 -> a
-com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator -> com.android.tools.r8.synthesis.u$a:
+    1:1:void <clinit>():16:16 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.synthesis.SyntheticClassBuilder,java.lang.String):29:29 -> <init>
+    2:9:void <init>(com.android.tools.r8.synthesis.SyntheticClassBuilder,java.lang.String):24:31 -> <init>
+    1:1:com.android.tools.r8.synthesis.SyntheticMethodBuilder setProto(com.android.tools.r8.graph.DexProto):35:35 -> a
+    2:2:com.android.tools.r8.synthesis.SyntheticMethodBuilder setClassFileVersion(com.android.tools.r8.cf.CfVersion):40:40 -> a
+    3:3:com.android.tools.r8.synthesis.SyntheticMethodBuilder setCode(com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator):45:45 -> a
+    4:4:com.android.tools.r8.synthesis.SyntheticMethodBuilder setAccessFlags(com.android.tools.r8.graph.MethodAccessFlags):50:50 -> a
+    5:6:boolean isValidSyntheticMethod(com.android.tools.r8.graph.DexEncodedMethod):78:79 -> a
+    7:7:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():514:514 -> a
+    7:7:boolean isValidSyntheticMethod(com.android.tools.r8.graph.DexEncodedMethod):80 -> a
+    8:8:boolean isValidSyntheticMethod(com.android.tools.r8.graph.DexEncodedMethod):81:81 -> a
+    9:9:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.DexEncodedMethod.getParameterAnnotations():911:911 -> a
+    9:9:boolean isValidSyntheticMethod(com.android.tools.r8.graph.DexEncodedMethod):82 -> a
+    10:10:boolean isValidSyntheticMethod(com.android.tools.r8.graph.DexEncodedMethod):82:82 -> a
+    11:11:com.android.tools.r8.graph.DexMethod com.android.tools.r8.synthesis.SyntheticMethodBuilder.getMethodSignature():86:86 -> a
+    11:11:com.android.tools.r8.graph.DexEncodedMethod build():56 -> a
+    12:12:com.android.tools.r8.graph.DexEncodedMethod build():57:57 -> a
+    13:13:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.synthesis.SyntheticMethodBuilder.getAccessFlags():90:90 -> a
+    13:13:com.android.tools.r8.graph.DexEncodedMethod build():60 -> a
+    14:16:com.android.tools.r8.graph.DexEncodedMethod build():61:63 -> a
+    17:17:com.android.tools.r8.graph.Code com.android.tools.r8.synthesis.SyntheticMethodBuilder.getCodeObject(com.android.tools.r8.graph.DexMethod):94:94 -> a
+    17:17:com.android.tools.r8.graph.DexEncodedMethod build():64 -> a
+    18:18:com.android.tools.r8.graph.DexEncodedMethod build():64:64 -> a
+    19:19: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):297:297 -> a
+    19:19:com.android.tools.r8.graph.DexEncodedMethod build():64 -> a
+    20:20:com.android.tools.r8.graph.DexEncodedMethod build():67:67 -> a
+com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator -> com.android.tools.r8.internal.pD$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.synthesis.v:
-    com.android.tools.r8.graph.ProgramMethod method -> d
-    1:2:void <init>(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.ProgramMethod):26:27 -> <init>
-    1:1:int internalCompareTo(com.android.tools.r8.synthesis.SyntheticDefinition,com.android.tools.r8.utils.structural.RepresentativeMap):18:18 -> a
-    2:2:int internalCompareTo(com.android.tools.r8.synthesis.SyntheticMethodDefinition,com.android.tools.r8.utils.structural.RepresentativeMap):68:68 -> a
-    2:2:int internalCompareTo(com.android.tools.r8.synthesis.SyntheticDefinition,com.android.tools.r8.utils.structural.RepresentativeMap):18 -> a
-    3:3:void apply(java.util.function.Consumer,java.util.function.Consumer):34:34 -> a
-    4:4:com.android.tools.r8.graph.DexProgramClass getHolder():58:58 -> a
-    5:5:void internalComputeHash(com.android.tools.r8.com.google.common.hash.Hasher,com.android.tools.r8.utils.structural.RepresentativeMap):63:63 -> a
-    com.android.tools.r8.synthesis.SyntheticProgramDefinition asProgramDefinition() -> c
-    1:1:com.android.tools.r8.graph.DexProgramClass getHolder():58:58 -> e
-    1:1:com.android.tools.r8.graph.DexClass getHolder():18 -> e
-    1:1:boolean isValid():73:73 -> i
-    1:1:com.android.tools.r8.synthesis.SyntheticMethodReference toReference():53:53 -> j
-    1:1:com.android.tools.r8.synthesis.SyntheticReference toReference():18 -> j
-    1:1:com.android.tools.r8.graph.ProgramMethod getMethod():38:38 -> k
-    1:1:com.android.tools.r8.synthesis.SyntheticMethodReference toReference():53:53 -> l
-    1:1:java.lang.String toString():78:78 -> toString
-com.android.tools.r8.synthesis.SyntheticMethodReference -> com.android.tools.r8.synthesis.w:
-    com.android.tools.r8.graph.DexMethod method -> e
-    boolean $assertionsDisabled -> d
-    1:1:void <clinit>():21:21 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexMethod):27:28 -> <init>
-    1:8:com.android.tools.r8.synthesis.SyntheticMethodDefinition lookupDefinition(java.util.function.Function):38:45 -> a
-    1:8:com.android.tools.r8.synthesis.SyntheticDefinition lookupDefinition(java.util.function.Function):21 -> a
-    9:27:com.android.tools.r8.synthesis.SyntheticMethodReference rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):51:69 -> a
-    9:27:com.android.tools.r8.synthesis.SyntheticReference rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):21 -> a
-    28:34:com.android.tools.r8.synthesis.SyntheticMethodReference rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):68:74 -> a
-    28:34:com.android.tools.r8.synthesis.SyntheticReference rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):21 -> a
-    1:1:com.android.tools.r8.graph.DexType getHolder():33:33 -> b
-com.android.tools.r8.synthesis.SyntheticNaming -> com.android.tools.r8.synthesis.x:
-    boolean $assertionsDisabled -> a
-    int $r8$clinit -> b
-    1:1:void <clinit>():12:12 -> <clinit>
-    1:1:com.android.tools.r8.graph.DexType createInternalType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,java.lang.String,com.android.tools.r8.graph.DexItemFactory):81:81 -> a
-    2:2:com.android.tools.r8.graph.DexType createInternalType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,java.lang.String,com.android.tools.r8.graph.DexItemFactory):78:78 -> a
-    3:3:com.android.tools.r8.graph.DexType createExternalType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexItemFactory):88:88 -> a
-    4:4:com.android.tools.r8.graph.DexType createType(java.lang.String,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexItemFactory):93:93 -> a
-    5:5:java.lang.String createDescriptor(java.lang.String,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,java.lang.String):98:98 -> a
-    5:5:com.android.tools.r8.graph.DexType createType(java.lang.String,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexItemFactory):93 -> a
-    6:6:com.android.tools.r8.graph.DexType createType(java.lang.String,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexItemFactory):93:93 -> a
-    7:7:boolean verifyNotInternalSynthetic(com.android.tools.r8.graph.DexType):103:103 -> a
-    8:8:boolean verifyNotInternalSynthetic(com.android.tools.r8.references.ClassReference):107:107 -> a
-    9:9:boolean verifyNotInternalSynthetic(java.lang.String):111:111 -> a
-    10:11:java.lang.String getPhaseSeparator(com.android.tools.r8.synthesis.SyntheticNaming$Phase):123:124 -> a
-    12:12:com.android.tools.r8.references.ClassReference makeSyntheticReferenceForTest(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String):132:132 -> a
-    13:13:java.lang.String createDescriptor(java.lang.String,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,java.lang.String):98:98 -> a
-    13:13:com.android.tools.r8.references.ClassReference makeSyntheticReferenceForTest(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String):132 -> a
-    14:14:com.android.tools.r8.references.ClassReference makeSyntheticReferenceForTest(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String):131:131 -> a
-    15:18:boolean isSynthetic(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$Phase,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):136:139 -> a
-    19:25:boolean checkMatchFrom(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,int,java.lang.String,boolean):148:154 -> a
-    19:25:boolean isSynthetic(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$Phase,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):139 -> a
-    26:33:boolean isInt(java.lang.String):158:165 -> a
-    26:33:boolean checkMatchFrom(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,int,java.lang.String,boolean):154 -> a
-    26:33:boolean isSynthetic(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$Phase,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):139 -> a
-com.android.tools.r8.synthesis.SyntheticNaming$Phase -> com.android.tools.r8.synthesis.x$a:
-    com.android.tools.r8.synthesis.SyntheticNaming$Phase INTERNAL -> a
-    com.android.tools.r8.synthesis.SyntheticNaming$Phase EXTERNAL -> b
-    1:2:void <clinit>():118:119 -> <clinit>
-    1:1:void <init>(java.lang.String,int):117:117 -> <init>
-com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind -> com.android.tools.r8.synthesis.x$b:
-    boolean isSingleSyntheticMethod -> n
-    java.lang.String descriptor -> m
-    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind OUTLINE -> k
-    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind SERVICE_LOADER -> j
-    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind TWR_CLOSE_RESOURCE -> i
-    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind THROW_NSME -> h
-    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind BACKPORT -> c
-    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind LAMBDA -> b
-    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind COMPANION_CLASS -> a
-    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind THROW_ICCE -> g
-    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind THROW_CCE_IF_NOT_NULL -> f
-    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind[] $VALUES -> l
-    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind TO_STRING_IF_NOT_NULL -> e
-    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind STATIC_INTERFACE_CALL -> d
-    1:12:void <clinit>():25:36 -> <clinit>
-    13:13:void <clinit>():23:23 -> <clinit>
-    1:3:void <init>(java.lang.String,int,java.lang.String,boolean):41:43 -> <init>
-    1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind[] values():23:23 -> a
-    1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind fromDescriptor(java.lang.String):47 -> a
-    2:3:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind fromDescriptor(java.lang.String):47:48 -> a
-com.android.tools.r8.synthesis.SyntheticProgramClassBuilder -> com.android.tools.r8.synthesis.y:
-    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexItemFactory):15:15 -> <init>
-    1:1:com.android.tools.r8.graph.ClassKind getClassKind():20:20 -> b
-com.android.tools.r8.synthesis.SyntheticProgramClassDefinition -> com.android.tools.r8.synthesis.z:
-    1:1:void <init>(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexProgramClass):24:24 -> <init>
-    1:1:int internalCompareTo(com.android.tools.r8.synthesis.SyntheticDefinition,com.android.tools.r8.utils.structural.RepresentativeMap):17:17 -> a
-    2:2:int internalCompareTo(com.android.tools.r8.synthesis.SyntheticProgramClassDefinition,com.android.tools.r8.utils.structural.RepresentativeMap):61:61 -> a
-    2:2:int internalCompareTo(com.android.tools.r8.synthesis.SyntheticDefinition,com.android.tools.r8.utils.structural.RepresentativeMap):17 -> a
-    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.synthesis.SyntheticClassDefinition.getHolder():29:29 -> a
-    3:3:com.android.tools.r8.graph.DexProgramClass getHolder():17 -> a
-    4:4:com.android.tools.r8.graph.DexProgramClass getHolder():17:17 -> a
-    5:5:void apply(java.util.function.Consumer,java.util.function.Consumer):31:31 -> a
-    6:6:void internalComputeHash(com.android.tools.r8.com.google.common.hash.Hasher,com.android.tools.r8.utils.structural.RepresentativeMap):56:56 -> a
-    com.android.tools.r8.synthesis.SyntheticProgramDefinition asProgramDefinition() -> c
-    boolean isProgramDefinition() -> h
-    1:1:boolean isValid():51:51 -> i
-    2:2:boolean com.android.tools.r8.graph.DexClass.isPublic():630:630 -> i
-    2:2:boolean isValid():51 -> i
-    3:3:boolean isValid():51:51 -> i
-    4:4:boolean com.android.tools.r8.graph.DexClass.isFinal():575:575 -> i
-    4:4:boolean isValid():51 -> i
-    5:5:boolean isValid():51:51 -> i
-    1:1:com.android.tools.r8.synthesis.SyntheticProgramClassReference toReference():46:46 -> j
-    1:1:com.android.tools.r8.synthesis.SyntheticReference toReference():17 -> j
-    1:6:java.lang.String toString():66:71 -> toString
-com.android.tools.r8.synthesis.SyntheticProgramClassReference -> com.android.tools.r8.synthesis.A:
-    boolean $assertionsDisabled -> e
+com.android.tools.r8.synthesis.SyntheticMethodDefinition -> com.android.tools.r8.internal.qD:
+    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):18:19 -> <init>
+    1:2:void <init>(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.ProgramMethod):26 -> <init>
+    3:3:void <init>(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.ProgramMethod):27:27 -> <init>
+    1:1:com.android.tools.r8.synthesis.SynthesizingContext com.android.tools.r8.synthesis.SyntheticDefinition.getContext():25:25 -> 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(com.android.tools.r8.utils.structural.RepresentativeMap,boolean):46:46 -> a
+    3:3:com.android.tools.r8.synthesis.SynthesizingContext com.android.tools.r8.synthesis.SyntheticDefinition.getContext():25:25 -> 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(com.android.tools.r8.utils.structural.RepresentativeMap,boolean):50 -> a
+    4:7:com.android.tools.r8.com.google.common.hash.HashCode computeHash(com.android.tools.r8.utils.structural.RepresentativeMap,boolean):50:53 -> a
+    8:8:boolean isEquivalentTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean):58:58 -> a
+    9:9:com.android.tools.r8.synthesis.SynthesizingContext com.android.tools.r8.synthesis.SyntheticDefinition.getContext():25:25 -> 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):62 -> a
+    10:10:boolean isEquivalentTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean):62:62 -> a
+    11:11:com.android.tools.r8.synthesis.SynthesizingContext com.android.tools.r8.synthesis.SyntheticDefinition.getContext():25:25 -> 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):63 -> a
+    12:18:boolean isEquivalentTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean):63:69 -> a
+    19:19:boolean com.android.tools.r8.graph.DexEncodedMethod.isSyntheticContentEqual(com.android.tools.r8.graph.DexEncodedMethod):364:364 -> a
+    19:19:boolean isEquivalentTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean):69 -> a
+    20:22:int compareTo(com.android.tools.r8.synthesis.SyntheticMethodDefinition):75:77 -> a
+    1:1:com.android.tools.r8.graph.DexProgramClass getHolder():41:41 -> b
+    2:2:com.android.tools.r8.graph.DexEncodedMethod lambda$compareTo$0(com.android.tools.r8.synthesis.SyntheticMethodDefinition):76:76 -> b
+    1:1:com.android.tools.r8.graph.ProgramMethod getMethod():31:31 -> c
+    1:1:int compareTo(java.lang.Object):20:20 -> compareTo
+    1:1:com.android.tools.r8.synthesis.SyntheticReference toReference():36:36 -> d
+    2:2:com.android.tools.r8.synthesis.SynthesizingContext com.android.tools.r8.synthesis.SyntheticDefinition.getContext():25:25 -> 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():36 -> d
+    3:3:com.android.tools.r8.synthesis.SyntheticReference toReference():36:36 -> d
+    1:1:java.lang.String toString():82:82 -> toString
+com.android.tools.r8.synthesis.SyntheticMethodReference -> com.android.tools.r8.internal.rD:
+    com.android.tools.r8.graph.DexMethod method -> c
+    boolean $assertionsDisabled -> b
     1:1:void <clinit>():19:19 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType):25:25 -> <init>
-    1:6:com.android.tools.r8.synthesis.SyntheticProgramClassDefinition lookupDefinition(java.util.function.Function):30:35 -> a
-    1:6:com.android.tools.r8.synthesis.SyntheticDefinition lookupDefinition(java.util.function.Function):19 -> a
-    7:28:com.android.tools.r8.synthesis.SyntheticProgramClassReference rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):40:61 -> a
-    7:28:com.android.tools.r8.synthesis.SyntheticReference rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):19 -> a
-com.android.tools.r8.synthesis.SyntheticProgramDefinition -> com.android.tools.r8.internal.zE:
-    void apply(java.util.function.Consumer,java.util.function.Consumer) -> a
-    com.android.tools.r8.graph.DexProgramClass getHolder() -> a
-com.android.tools.r8.synthesis.SyntheticReference -> com.android.tools.r8.synthesis.B:
-    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind kind -> b
-    boolean $assertionsDisabled -> a
-    com.android.tools.r8.synthesis.SynthesizingContext context -> c
-    1:1:void <clinit>():17:17 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext):25:29 -> <init>
-    com.android.tools.r8.synthesis.SyntheticDefinition lookupDefinition(java.util.function.Function) -> a
-    com.android.tools.r8.synthesis.SyntheticReference rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens) -> a
-    1:1:com.android.tools.r8.synthesis.SynthesizingContext getContext():39:39 -> a
-    com.android.tools.r8.graph.DexType getHolder() -> b
-    1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind getKind():35:35 -> c
+    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.sD:
+    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
 com.android.tools.r8.tracereferences.KeepRuleFormatter -> com.android.tools.r8.tracereferences.a:
     java.lang.StringBuilder com.android.tools.r8.tracereferences.Formatter.output -> b
     boolean com.android.tools.r8.tracereferences.Formatter.$assertionsDisabled -> a
@@ -79417,6 +79767,7 @@
     4:4:java.util.Collection getProgramResources():231:231 -> getProgramResources
     5:5:java.util.Collection getProgramResources():230:230 -> getProgramResources
 com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder$3 -> com.android.tools.r8.tracereferences.c:
+    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):278:279 -> <init>
     1:1:java.util.Collection getProgramResources():283:283 -> getProgramResources
@@ -79693,9 +80044,9 @@
     1:1:com.android.tools.r8.position.Position getPosition():43:43 -> b
     1:2:java.lang.Throwable getCause():28:29 -> getCause
     1:1:java.lang.String getMessage():35:35 -> getMessage
-com.android.tools.r8.utils.Action -> com.android.tools.r8.internal.S0:
+com.android.tools.r8.utils.Action -> com.android.tools.r8.internal.R0:
     void execute() -> a
-com.android.tools.r8.utils.AndroidApiLevel -> com.android.tools.r8.internal.b1:
+com.android.tools.r8.utils.AndroidApiLevel -> com.android.tools.r8.internal.a1:
     com.android.tools.r8.utils.AndroidApiLevel M -> w
     com.android.tools.r8.utils.AndroidApiLevel L -> u
     com.android.tools.r8.utils.AndroidApiLevel N_MR1 -> y
@@ -79772,8 +80123,8 @@
     30:30:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):97:97 -> d
     31:31:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):95:95 -> d
     32:32:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):93:93 -> d
-    1:1:com.android.tools.r8.utils.AndroidApiLevel[] values():12:12 -> e
-com.android.tools.r8.utils.AndroidApiLevel$1 -> com.android.tools.r8.internal.b1$a:
+    1:1:com.android.tools.r8.utils.AndroidApiLevel[] values():12:12 -> f
+com.android.tools.r8.utils.AndroidApiLevel$1 -> com.android.tools.r8.internal.a1$a:
     int[] $SwitchMap$com$android$tools$r8$utils$DexVersion -> a
     1:1:void <clinit>():75:75 -> <clinit>
 com.android.tools.r8.utils.AndroidApp -> com.android.tools.r8.utils.b:
@@ -80128,7 +80479,7 @@
     java.util.Set descriptors -> a
     1:1:void <init>(java.util.Set,byte[],com.android.tools.r8.utils.AndroidAppConsumers$1):328:328 -> <init>
     2:4:void <init>(java.util.Set,byte[]):333:335 -> <init>
-com.android.tools.r8.utils.ArchiveBuilder -> com.android.tools.r8.internal.l1:
+com.android.tools.r8.utils.ArchiveBuilder -> com.android.tools.r8.internal.k1:
     java.nio.file.Path archive -> b
     com.android.tools.r8.origin.Origin origin -> c
     java.util.zip.ZipOutputStream stream -> d
@@ -80171,8 +80522,8 @@
     1:7:java.util.zip.ZipOutputStream getStreamRaw():81:87 -> c
     1:1:com.android.tools.r8.origin.Origin getOrigin():185:185 -> getOrigin
     1:2:void open():46:47 -> open
-com.android.tools.r8.utils.ArchiveBuilder$1 -> com.android.tools.r8.internal.j1:
-com.android.tools.r8.utils.ArchiveBuilder$DelayedData -> com.android.tools.r8.internal.k1:
+com.android.tools.r8.utils.ArchiveBuilder$1 -> com.android.tools.r8.internal.i1:
+com.android.tools.r8.utils.ArchiveBuilder$DelayedData -> com.android.tools.r8.internal.j1:
     com.android.tools.r8.ByteDataView content -> b
     java.lang.String name -> a
     boolean isDirectory -> c
@@ -80220,51 +80571,60 @@
     3:3:com.android.tools.r8.utils.ArchiveResourceProvider fromArchive(java.nio.file.Path,boolean):44 -> fromArchive
     4:4:com.android.tools.r8.utils.ArchiveResourceProvider fromArchive(java.nio.file.Path,boolean):44:44 -> fromArchive
     1:3:java.util.Collection getProgramResources():101:103 -> getProgramResources
-com.android.tools.r8.utils.ArrayUtils -> com.android.tools.r8.internal.A1:
+com.android.tools.r8.utils.ArrayUtils -> com.android.tools.r8.internal.z1:
     1:10:java.lang.Object[] copyWithSparseChanges(java.lang.Class,java.lang.Object[],java.util.Map):27:36 -> a
     11:30:java.lang.Object[] filter(java.lang.Class,java.lang.Object[],java.util.function.Predicate):52:71 -> a
     31:31:java.lang.Object[] filter(java.lang.Class,java.lang.Object[],java.util.function.Predicate):70:70 -> a
     32:55:java.lang.Object[] map(java.lang.Class,java.lang.Object[],java.util.function.Function):85:108 -> a
     56:56:java.lang.Object[] map(java.lang.Class,java.lang.Object[],java.util.function.Function):107:107 -> a
     57:58:boolean contains(java.lang.Object[],java.lang.Object):120:121 -> a
-com.android.tools.r8.utils.AsmUtils -> com.android.tools.r8.internal.G1:
-    boolean isDeprecated(int) -> a
-com.android.tools.r8.utils.AssertionConfigurationWithDefault -> com.android.tools.r8.internal.I1:
+com.android.tools.r8.utils.AssertionConfigurationWithDefault -> com.android.tools.r8.internal.G1:
     com.android.tools.r8.AssertionsConfiguration$AssertionTransformation defautlTransformation -> b
     java.util.List assertionsConfigurations -> c
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:4:void <init>(com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,java.util.List):19:22 -> <init>
-com.android.tools.r8.utils.BiForEachable -> com.android.tools.r8.internal.l2:
-com.android.tools.r8.utils.BiMapContainer -> com.android.tools.r8.internal.n2:
+com.android.tools.r8.utils.BiForEachable -> com.android.tools.r8.internal.g2:
+com.android.tools.r8.utils.BiMapContainer -> com.android.tools.r8.internal.i2:
     java.util.Map original -> a
     java.util.Map inverse -> b
     1:3:void <init>(java.util.Map,java.util.Map):21:23 -> <init>
-com.android.tools.r8.utils.BiPredicateUtils -> com.android.tools.r8.internal.o2:
+com.android.tools.r8.utils.BiPredicateUtils -> com.android.tools.r8.internal.j2:
     boolean lambda$alwaysFalse$0(java.lang.Object,java.lang.Object) -> a
+    void com.android.tools.r8.utils.ForEachableUtils.lambda$empty$0(java.util.function.Consumer) -> a
     1:1:java.util.function.BiPredicate alwaysFalse():12:12 -> a
-com.android.tools.r8.utils.BitUtils -> com.android.tools.r8.internal.G2:
+    2:3:java.lang.Object com.android.tools.r8.utils.PredicateUtils.findFirst(java.lang.Object[],java.util.function.Predicate):13:14 -> a
+    4:4:boolean com.android.tools.r8.utils.IdentifierUtils.isDexIdentifierPart(int):14:14 -> a
+    5:5:boolean com.android.tools.r8.utils.PredicateUtils.lambda$not$0(java.util.function.Predicate,java.lang.Object):22:22 -> a
+    6:6:java.util.function.Predicate com.android.tools.r8.utils.PredicateUtils.not(java.util.function.Predicate):22:22 -> a
+    7:7:java.util.function.Predicate com.android.tools.r8.utils.PredicateUtils.isNull(java.util.function.Function):26:26 -> a
+    8:8:boolean com.android.tools.r8.utils.PredicateUtils.lambda$isNull$1(java.util.function.Function,java.lang.Object):26:26 -> a
+    9:10:java.util.Map com.android.tools.r8.utils.MapUtils.map(java.util.Map,java.util.function.IntFunction,java.util.function.Function,java.util.function.Function,java.util.function.BiFunction):29:30 -> a
+    11:15:void com.android.tools.r8.utils.MapUtils.lambda$map$0(java.util.function.Function,java.util.function.Function,java.util.Map,java.util.function.BiFunction,java.lang.Object,java.lang.Object):32:36 -> a
+    16:30:java.lang.String[] com.android.tools.r8.utils.FlagFile.expandFlagFiles(java.lang.String[],java.util.function.Consumer):34:48 -> a
+    31:31:boolean com.android.tools.r8.utils.MapUtils.lambda$removeIdentityMappings$1(java.util.Map$Entry):43:43 -> a
+    32:32:void com.android.tools.r8.utils.MapUtils.removeIdentityMappings(java.util.Map):43:43 -> a
+    1:1:com.android.tools.r8.utils.ForEachable com.android.tools.r8.utils.ForEachableUtils.empty():10:10 -> b
+    2:2:boolean com.android.tools.r8.utils.IdentifierUtils.isDexIdentifierPart(int):14:14 -> b
+    2:2:boolean com.android.tools.r8.utils.IdentifierUtils.isDexIdentifierStart(int):10 -> b
+    3:3:java.lang.String com.android.tools.r8.utils.MapUtils.lambda$toString$2(java.util.Map$Entry):48:48 -> b
+    4:4:java.lang.String com.android.tools.r8.utils.MapUtils.toString(java.util.Map):48:48 -> b
+    5:5:java.lang.String com.android.tools.r8.utils.MapUtils.toString(java.util.Map):47:47 -> b
+    1:2:boolean com.android.tools.r8.utils.IdentifierUtils.isRelaxedDexIdentifierPart(int):18:19 -> c
+    boolean com.android.tools.r8.utils.IdentifierUtils.isSimpleNameChar(int) -> d
+    boolean com.android.tools.r8.utils.IdentifierUtils.isUnicodeSpace(int) -> e
+com.android.tools.r8.utils.BitUtils -> com.android.tools.r8.internal.B2:
     boolean isBitInMaskSet(int,int) -> a
     boolean isBitSet(int,int) -> b
-com.android.tools.r8.utils.BooleanBox -> com.android.tools.r8.internal.K2:
+com.android.tools.r8.utils.BooleanBox -> com.android.tools.r8.internal.F2:
     boolean value -> a
-    1:1:void <init>():13:13 -> <init>
-    2:3:void <init>(boolean):15:16 -> <init>
-    1:1:boolean com.android.tools.r8.utils.BooleanBox.get():26:26 -> a
-    1:1:boolean com.android.tools.r8.utils.BooleanBox.isFalse():30 -> a
-    1:1:void computeIfNotSet(java.util.function.BooleanSupplier):20 -> a
-    2:2:void computeIfNotSet(java.util.function.BooleanSupplier):21:21 -> a
-    3:3:void com.android.tools.r8.utils.BooleanBox.set(boolean):42:42 -> a
-    3:3:void computeIfNotSet(java.util.function.BooleanSupplier):21 -> a
-    4:4:boolean get():26:26 -> a
-    5:5:void set(boolean):42:42 -> a
-    1:1:boolean com.android.tools.r8.utils.BooleanBox.get():26:26 -> b
-    1:1:boolean isFalse():30 -> b
-    1:1:void com.android.tools.r8.utils.BooleanBox.set(boolean):42:42 -> c
-    1:1:void set():38 -> c
-    1:1:void com.android.tools.r8.utils.BooleanBox.set(boolean):42:42 -> d
-    1:1:void unset():46 -> d
-com.android.tools.r8.utils.BooleanLatticeElement -> com.android.tools.r8.internal.V2:
+    1:1:void <init>():11:11 -> <init>
+    1:1:boolean get():18:18 -> a
+    1:1:void com.android.tools.r8.utils.BooleanBox.set(boolean):26:26 -> b
+    1:1:void set():22 -> b
+    1:1:void com.android.tools.r8.utils.BooleanBox.set(boolean):26:26 -> c
+    1:1:void unset():30 -> c
+com.android.tools.r8.utils.BooleanLatticeElement -> com.android.tools.r8.internal.M2:
     com.android.tools.r8.utils.BooleanLatticeElement BOTTOM -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():6:8 -> <clinit>
@@ -80273,21 +80633,28 @@
     1:1:com.android.tools.r8.utils.BooleanLatticeElement join(com.android.tools.r8.utils.BooleanLatticeElement):56:56 -> a
     2:2:boolean com.android.tools.r8.utils.BooleanLatticeElement.isBottom():0:0 -> a
     2:2:com.android.tools.r8.utils.BooleanLatticeElement join(com.android.tools.r8.utils.BooleanLatticeElement):56 -> a
-    3:3:com.android.tools.r8.utils.BooleanLatticeElement join(com.android.tools.r8.utils.BooleanLatticeElement):56:56 -> a
+    3:3:boolean com.android.tools.r8.utils.BooleanLatticeElement.isUnknown():0:0 -> a
+    3:3:com.android.tools.r8.utils.BooleanLatticeElement join(com.android.tools.r8.utils.BooleanLatticeElement):56 -> a
     4:4:boolean com.android.tools.r8.utils.BooleanLatticeElement.isBottom():0:0 -> a
     4:4:com.android.tools.r8.utils.BooleanLatticeElement join(com.android.tools.r8.utils.BooleanLatticeElement):59 -> a
-    5:10:com.android.tools.r8.utils.BooleanLatticeElement join(com.android.tools.r8.utils.BooleanLatticeElement):59:64 -> a
+    5:5:boolean com.android.tools.r8.utils.BooleanLatticeElement.isUnknown():0:0 -> a
+    5:5:com.android.tools.r8.utils.BooleanLatticeElement join(com.android.tools.r8.utils.BooleanLatticeElement):59 -> a
+    6:8:com.android.tools.r8.utils.BooleanLatticeElement join(com.android.tools.r8.utils.BooleanLatticeElement):62:64 -> a
     boolean isBottom() -> b
     boolean isFalse() -> c
     1:1:boolean isPossiblyFalse():52:52 -> d
+    2:2:boolean com.android.tools.r8.utils.BooleanLatticeElement.isUnknown():0:0 -> d
+    2:2:boolean isPossiblyFalse():52 -> d
     1:1:boolean isPossiblyTrue():48:48 -> e
+    2:2:boolean com.android.tools.r8.utils.BooleanLatticeElement.isUnknown():0:0 -> e
+    2:2:boolean isPossiblyTrue():48 -> e
     boolean isTrue() -> f
     boolean isUnknown() -> g
     1:1:int hashCode():74:74 -> hashCode
-com.android.tools.r8.utils.BooleanLatticeElement$1 -> com.android.tools.r8.internal.V2$a:
+com.android.tools.r8.utils.BooleanLatticeElement$1 -> com.android.tools.r8.internal.M2$a:
     1:1:void <init>():9:9 -> <init>
     1:1:com.android.tools.r8.utils.OptionalBool asOptionalBool():13:13 -> a
-com.android.tools.r8.utils.BooleanUtils -> com.android.tools.r8.internal.e3:
+com.android.tools.r8.utils.BooleanUtils -> com.android.tools.r8.internal.R2:
     java.lang.Boolean[] TRUE_VALUES -> b
     java.lang.Boolean[] VALUES -> a
     int $r8$clinit -> c
@@ -80295,7 +80662,7 @@
     int intValue(boolean) -> a
     1:1:java.lang.Boolean[] trueValues():25:25 -> a
     1:1:java.lang.Boolean[] values():21:21 -> b
-com.android.tools.r8.utils.Box -> com.android.tools.r8.internal.k3:
+com.android.tools.r8.utils.Box -> com.android.tools.r8.internal.X2:
     java.lang.Object value -> a
     1:1:void <init>():13:13 -> <init>
     2:3:void <init>(java.lang.Object):15:16 -> <init>
@@ -80304,7 +80671,7 @@
     6:7:java.lang.Object getAndSet(java.lang.Object):39:40 -> a
     1:1:void set(java.lang.Object):31:31 -> b
     2:2:boolean isSet():35:35 -> b
-com.android.tools.r8.utils.CfLineToMethodMapper -> com.android.tools.r8.internal.B4:
+com.android.tools.r8.utils.CfLineToMethodMapper -> com.android.tools.r8.internal.o4:
     java.util.Map sourceMethodMapping -> b
     com.android.tools.r8.utils.AndroidApp inputApp -> c
     boolean $assertionsDisabled -> a
@@ -80319,8 +80686,8 @@
     31:35:void lambda$readLineNumbersFromClassFiles$0(com.android.tools.r8.utils.CfLineToMethodMapper$ClassVisitor,com.android.tools.r8.ProgramResource):46:50 -> a
     36:36:void com.android.tools.r8.org.objectweb.asm.ClassReader.accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):394:394 -> a
     36:36:void lambda$readLineNumbersFromClassFiles$0(com.android.tools.r8.utils.CfLineToMethodMapper$ClassVisitor,com.android.tools.r8.ProgramResource):51 -> a
-com.android.tools.r8.utils.CfLineToMethodMapper$1 -> com.android.tools.r8.internal.y4:
-com.android.tools.r8.utils.CfLineToMethodMapper$ClassVisitor -> com.android.tools.r8.internal.z4:
+com.android.tools.r8.utils.CfLineToMethodMapper$1 -> com.android.tools.r8.internal.l4:
+com.android.tools.r8.utils.CfLineToMethodMapper$ClassVisitor -> com.android.tools.r8.internal.m4:
     com.android.tools.r8.utils.CfLineToMethodMapper this$0 -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap currentLineNumberMapping -> c
     1:1:void <init>(com.android.tools.r8.utils.CfLineToMethodMapper,com.android.tools.r8.utils.CfLineToMethodMapper$1):85:85 -> <init>
@@ -80329,13 +80696,13 @@
     1:3:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):101:103 -> a
     4:4:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):109:109 -> a
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap lambda$visit$0(java.lang.String):103:103 -> d
-com.android.tools.r8.utils.CfLineToMethodMapper$MethodLineVisitor -> com.android.tools.r8.internal.A4:
+com.android.tools.r8.utils.CfLineToMethodMapper$MethodLineVisitor -> com.android.tools.r8.internal.n4:
     java.lang.String nameAndDescriptor -> j
     java.util.Map lineMethodMapping -> k
     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.q5:
+com.android.tools.r8.utils.CfgPrinter -> com.android.tools.r8.internal.c5:
     java.util.Stack opened -> c
     java.lang.StringBuilder builder -> b
     int nextUnusedValue -> d
@@ -80361,14 +80728,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.s5:
+com.android.tools.r8.utils.ChainableStringConsumer -> com.android.tools.r8.internal.e5:
     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.r5:
+com.android.tools.r8.utils.ChainableStringConsumer$1 -> com.android.tools.r8.internal.d5:
     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.q6:
+com.android.tools.r8.utils.ClassMap -> com.android.tools.r8.internal.b6:
     java.util.Map classes -> b
     java.util.concurrent.atomic.AtomicReference classProvider -> c
     boolean $assertionsDisabled -> a
@@ -80390,8 +80757,8 @@
     com.android.tools.r8.graph.ClassKind getClassKind() -> c
     1:1:boolean isFullyLoaded():226:226 -> d
     1:1:java.lang.String toString():79:79 -> toString
-com.android.tools.r8.utils.ClassMap$1 -> com.android.tools.r8.internal.o6:
-com.android.tools.r8.utils.ClassMap$ConcurrentClassLoader -> com.android.tools.r8.internal.p6:
+com.android.tools.r8.utils.ClassMap$1 -> com.android.tools.r8.internal.Z5:
+com.android.tools.r8.utils.ClassMap$ConcurrentClassLoader -> com.android.tools.r8.internal.a6:
     com.android.tools.r8.graph.DexType type -> d
     boolean ready -> f
     boolean $assertionsDisabled -> a
@@ -80410,7 +80777,7 @@
     66:66:void lambda$get$0(com.android.tools.r8.graph.DexClass):264 -> a
     67:67:void lambda$get$0(com.android.tools.r8.graph.DexClass):264:264 -> a
     1:1:java.lang.Object get():232:232 -> get
-com.android.tools.r8.utils.ClassProvider -> com.android.tools.r8.internal.M6:
+com.android.tools.r8.utils.ClassProvider -> com.android.tools.r8.internal.x6:
     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
@@ -80421,8 +80788,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.I6:
-com.android.tools.r8.utils.ClassProvider$ClassFileResourceReader -> com.android.tools.r8.internal.J6:
+com.android.tools.r8.utils.ClassProvider$1 -> com.android.tools.r8.internal.t6:
+com.android.tools.r8.utils.ClassProvider$ClassFileResourceReader -> com.android.tools.r8.internal.u6:
     com.android.tools.r8.graph.JarApplicationReader reader -> d
     com.android.tools.r8.graph.ClassKind classKind -> b
     com.android.tools.r8.ClassFileResourceProvider provider -> c
@@ -80434,51 +80801,46 @@
     7:7:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):102:102 -> a
     8:10: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.K6:
+com.android.tools.r8.utils.ClassProvider$CombinedClassProvider -> com.android.tools.r8.internal.v6:
     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.L6:
+com.android.tools.r8.utils.ClassProvider$PreloadedClassProvider -> com.android.tools.r8.internal.w6:
     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.k7:
-    1:1:void <init>(com.android.tools.r8.utils.ClassProvider):19:19 -> <init>
+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
-    3:3:com.android.tools.r8.graph.DexClasspathClass com.android.tools.r8.utils.ClasspathClassCollection.resolveClassConflict(com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.graph.DexClasspathClass):28:28 -> a
+    3:3:com.android.tools.r8.graph.DexClasspathClass com.android.tools.r8.utils.ClasspathClassCollection.resolveClassConflict(com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.graph.DexClasspathClass):19:19 -> a
     3:3:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):12 -> a
     4:4:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    4:4:com.android.tools.r8.graph.DexClasspathClass com.android.tools.r8.utils.ClasspathClassCollection.resolveClassConflict(com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.graph.DexClasspathClass):28 -> a
+    4:4:com.android.tools.r8.graph.DexClasspathClass com.android.tools.r8.utils.ClasspathClassCollection.resolveClassConflict(com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.graph.DexClasspathClass):19 -> a
     4:4:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):12 -> a
     5:5:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
     5:5:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    5:5:com.android.tools.r8.graph.DexClasspathClass com.android.tools.r8.utils.ClasspathClassCollection.resolveClassConflict(com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.graph.DexClasspathClass):28 -> a
+    5:5:com.android.tools.r8.graph.DexClasspathClass com.android.tools.r8.utils.ClasspathClassCollection.resolveClassConflict(com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.graph.DexClasspathClass):19 -> a
     5:5:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):12 -> a
-    6:6:com.android.tools.r8.graph.DexClasspathClass com.android.tools.r8.utils.ClasspathClassCollection.resolveClassConflict(com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.graph.DexClasspathClass):28:28 -> a
+    6:6:com.android.tools.r8.graph.DexClasspathClass com.android.tools.r8.utils.ClasspathClassCollection.resolveClassConflict(com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.graph.DexClasspathClass):19:19 -> a
     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():38:38 -> c
-    1:1:com.android.tools.r8.utils.ClasspathClassCollection empty():23:23 -> e
-    2:2:void com.android.tools.r8.utils.ClasspathClassCollection.<init>():15:15 -> e
-    2:2:com.android.tools.r8.utils.ClasspathClassCollection empty():23 -> e
-    1:1:java.lang.String toString():43:43 -> toString
-com.android.tools.r8.utils.CollectionUtils -> com.android.tools.r8.internal.L7:
-    1:4:java.util.Set mergeSets(java.util.Collection,java.util.Collection):13:16 -> a
-com.android.tools.r8.utils.ComparatorUtils -> com.android.tools.r8.internal.V7:
+    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.x7:
     1:1:void <clinit>():10:10 -> <clinit>
     1:1:java.util.Comparator listComparator(java.util.Comparator):17:17 -> a
     2:4:int lambda$listComparator$0(java.util.Comparator,java.util.List,java.util.List):18:20 -> a
     5:5:java.util.Comparator unreachableComparator():67:67 -> a
     6:6:int lambda$unreachableComparator$2(java.lang.Object,java.lang.Object):68:68 -> a
-com.android.tools.r8.utils.Consumer3 -> com.android.tools.r8.internal.A8:
+com.android.tools.r8.utils.Consumer3 -> com.android.tools.r8.internal.b8:
     void accept(java.lang.Object,java.lang.Object,java.lang.Object) -> a
-com.android.tools.r8.utils.ConsumerUtils -> com.android.tools.r8.internal.B8:
+com.android.tools.r8.utils.ConsumerUtils -> com.android.tools.r8.internal.c8:
     void lambda$emptyBiConsumer$4(java.lang.Object,java.lang.Object) -> a
     void lambda$emptyConsumer$3(java.lang.Object) -> a
     1:1:java.util.function.Function curry(java.util.function.BiConsumer):15:15 -> a
@@ -80490,9 +80852,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.DequeUtils -> com.android.tools.r8.internal.r9:
-    1:2:java.util.Deque newArrayDeque(java.lang.Object):13:14 -> a
-com.android.tools.r8.utils.DescriptorUtils -> com.android.tools.r8.internal.s9:
+com.android.tools.r8.utils.DescriptorUtils -> com.android.tools.r8.internal.P8:
     java.util.Map typeNameToLetterMap -> a
     boolean $assertionsDisabled -> b
     int $r8$clinit -> c
@@ -80564,13 +80924,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.s9$a:
+com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor -> com.android.tools.r8.internal.P8$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.ma:
+com.android.tools.r8.utils.DexVersion -> com.android.tools.r8.internal.J9:
     com.android.tools.r8.utils.DexVersion[] $VALUES -> e
     int dexVersion -> f
     com.android.tools.r8.utils.DexVersion V35 -> a
@@ -80597,10 +80957,10 @@
     3:3:java.util.Optional getDexVersion(int):87:87 -> d
     4:4:java.util.Optional getDexVersion(int):85:85 -> d
     5:5:java.util.Optional getDexVersion(int):83:83 -> d
-com.android.tools.r8.utils.DexVersion$1 -> com.android.tools.r8.internal.ma$a:
+com.android.tools.r8.utils.DexVersion$1 -> com.android.tools.r8.internal.J9$a:
     int[] $SwitchMap$com$android$tools$r8$utils$AndroidApiLevel -> a
     1:1:void <clinit>():40:40 -> <clinit>
-com.android.tools.r8.utils.DirectoryBuilder -> com.android.tools.r8.internal.pa:
+com.android.tools.r8.utils.DirectoryBuilder -> com.android.tools.r8.internal.M9:
     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>
@@ -80614,7 +80974,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.ra:
+com.android.tools.r8.utils.DisjointSets -> com.android.tools.r8.internal.O9:
     java.util.Map parent -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():16:16 -> <clinit>
@@ -80630,7 +80990,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.Sa:
+com.android.tools.r8.utils.EncodedValueUtils -> com.android.tools.r8.internal.na:
     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
@@ -80659,60 +81019,55 @@
     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.Hb:
-    1:1:com.android.tools.r8.origin.Origin access$000(java.lang.Throwable):28:28 -> a
-    2:7:java.lang.String getMainStackTrace():31:36 -> a
-    8:8:boolean lambda$getMainStackTrace$0(java.util.Map$Entry):32:32 -> a
-    9:9:java.util.stream.Stream lambda$getMainStackTrace$2(java.lang.StackTraceElement[]):34:34 -> a
-    10:10:java.lang.String lambda$getMainStackTrace$3(java.lang.StackTraceElement):35:35 -> a
-    11:11:void lambda$withConsumeResourceHandler$4(com.android.tools.r8.StringConsumer,java.lang.String,com.android.tools.r8.DiagnosticsHandler):41:41 -> a
-    12:12:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer,java.lang.String):41:41 -> a
-    13:17:void com.android.tools.r8.utils.ExceptionUtils.withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):51:55 -> a
-    13:17:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer,java.lang.String):41 -> a
-    18:18:void withFinishedResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer):45:45 -> a
-    19:23:void com.android.tools.r8.utils.ExceptionUtils.withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):51:55 -> a
-    19:23:void withFinishedResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer):45 -> a
-    24:27:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):80:83 -> a
-    28:28:com.android.tools.r8.CompilationFailedException failCompilation(com.android.tools.r8.utils.Reporter,java.lang.Throwable):89:89 -> a
-    29:73:java.lang.Exception failWithFakeEntry(com.android.tools.r8.DiagnosticsHandler,java.lang.Throwable,java.util.function.BiFunction,java.lang.Class):100:144 -> a
-    74:74:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object,java.lang.Object[]):88:88 -> a
-    74:74:java.lang.Exception failWithFakeEntry(com.android.tools.r8.DiagnosticsHandler,java.lang.Throwable,java.util.function.BiFunction,java.lang.Class):144 -> a
-    75:80:java.lang.Object[] com.android.tools.r8.com.google.common.collect.Platform.newArray(java.lang.Object[],int):37:42 -> a
-    75:80:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.newArray(java.lang.Object[],int):60 -> a
-    75:80:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object,java.lang.Object[]):88 -> a
-    75:80:java.lang.Exception failWithFakeEntry(com.android.tools.r8.DiagnosticsHandler,java.lang.Throwable,java.util.function.BiFunction,java.lang.Class):144 -> a
-    81:82:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object,java.lang.Object[]):89:90 -> a
-    81:82:java.lang.Exception failWithFakeEntry(com.android.tools.r8.DiagnosticsHandler,java.lang.Throwable,java.util.function.BiFunction,java.lang.Class):144 -> a
-    83:83:java.lang.Exception failWithFakeEntry(com.android.tools.r8.DiagnosticsHandler,java.lang.Throwable,java.util.function.BiFunction,java.lang.Class):144:144 -> a
-    84:90:void withMainProgramHandler(com.android.tools.r8.utils.ExceptionUtils$MainAction):186:192 -> a
-    91:92:void withMainProgramHandler(com.android.tools.r8.utils.ExceptionUtils$MainAction):188:189 -> a
-    93:93:java.lang.RuntimeException unwrapExecutionException(java.util.concurrent.ExecutionException):221:221 -> a
-    94:94:void withOriginAndPositionAttachmentHandler(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.Runnable):234:234 -> a
-    95:97:java.lang.Object com.android.tools.r8.utils.ExceptionUtils.withOriginAndPositionAttachmentHandler(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.util.function.Supplier):246:248 -> a
-    95:97:void withOriginAndPositionAttachmentHandler(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.Runnable):234 -> a
-    98:98:java.lang.Object lambda$withOriginAndPositionAttachmentHandler$5(java.lang.Runnable):238:238 -> a
-    99:101:java.lang.Object withOriginAndPositionAttachmentHandler(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.util.function.Supplier):246:248 -> a
-    1:1:com.android.tools.r8.position.Position access$100(java.lang.Throwable):28:28 -> b
-    2:2:java.lang.StackTraceElement[] lambda$getMainStackTrace$1(java.util.Map$Entry):33:33 -> b
-    3:3:void withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):64:64 -> b
-    1:2:com.android.tools.r8.origin.Origin getOrigin(java.lang.Throwable):149:150 -> c
-    3:9:com.android.tools.r8.origin.Origin com.android.tools.r8.utils.ExceptionUtils.extractIOExceptionOrigin(java.io.IOException):211:217 -> c
-    3:9:com.android.tools.r8.origin.Origin getOrigin(java.lang.Throwable):150 -> c
-    10:22:com.android.tools.r8.origin.Origin getOrigin(java.lang.Throwable):152:164 -> c
-    1:10:com.android.tools.r8.position.Position getPosition(java.lang.Throwable):168:177 -> d
-    1:1:void printExitMessage(java.lang.Throwable):197:197 -> e
-    2:2:boolean com.android.tools.r8.utils.ExceptionUtils.isExpectedException(java.lang.Throwable):204:204 -> e
-    2:2:void printExitMessage(java.lang.Throwable):198 -> e
-    3:3:void printExitMessage(java.lang.Throwable):197:197 -> e
-com.android.tools.r8.utils.ExceptionUtils$CompileAction -> com.android.tools.r8.internal.Hb$a:
-com.android.tools.r8.utils.ExceptionUtils$MainAction -> com.android.tools.r8.internal.Hb$b:
-com.android.tools.r8.utils.ExceptionUtils$OriginAttachmentException -> com.android.tools.r8.internal.Hb$c:
+com.android.tools.r8.utils.ExceptionUtils -> com.android.tools.r8.internal.bb:
+    1:1:com.android.tools.r8.origin.Origin access$000(java.lang.Throwable):26:26 -> a
+    2:2:void lambda$withConsumeResourceHandler$0(com.android.tools.r8.StringConsumer,java.lang.String,com.android.tools.r8.DiagnosticsHandler):30:30 -> a
+    3:3:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer,java.lang.String):30:30 -> a
+    4:8:void com.android.tools.r8.utils.ExceptionUtils.withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):40:44 -> a
+    4:8:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer,java.lang.String):30 -> a
+    9:9:void withFinishedResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer):34:34 -> a
+    10:14:void com.android.tools.r8.utils.ExceptionUtils.withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):40:44 -> a
+    10:14:void withFinishedResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer):34 -> a
+    15:18:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):69:72 -> a
+    19:19:com.android.tools.r8.CompilationFailedException failCompilation(com.android.tools.r8.utils.Reporter,java.lang.Throwable):78:78 -> a
+    20:64:java.lang.Exception failWithFakeEntry(com.android.tools.r8.DiagnosticsHandler,java.lang.Throwable,java.util.function.BiFunction,java.lang.Class):89:133 -> a
+    65:65:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object,java.lang.Object[]):88:88 -> a
+    65:65:java.lang.Exception failWithFakeEntry(com.android.tools.r8.DiagnosticsHandler,java.lang.Throwable,java.util.function.BiFunction,java.lang.Class):133 -> a
+    66:71:java.lang.Object[] com.android.tools.r8.com.google.common.collect.Platform.newArray(java.lang.Object[],int):37:42 -> a
+    66:71:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.newArray(java.lang.Object[],int):60 -> a
+    66:71:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object,java.lang.Object[]):88 -> a
+    66:71:java.lang.Exception failWithFakeEntry(com.android.tools.r8.DiagnosticsHandler,java.lang.Throwable,java.util.function.BiFunction,java.lang.Class):133 -> a
+    72:73:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object,java.lang.Object[]):89:90 -> a
+    72:73:java.lang.Exception failWithFakeEntry(com.android.tools.r8.DiagnosticsHandler,java.lang.Throwable,java.util.function.BiFunction,java.lang.Class):133 -> a
+    74:74:java.lang.Exception failWithFakeEntry(com.android.tools.r8.DiagnosticsHandler,java.lang.Throwable,java.util.function.BiFunction,java.lang.Class):133:133 -> a
+    75:81:void withMainProgramHandler(com.android.tools.r8.utils.ExceptionUtils$MainAction):175:181 -> a
+    82:83:void withMainProgramHandler(com.android.tools.r8.utils.ExceptionUtils$MainAction):177:178 -> a
+    84:84:java.lang.RuntimeException unwrapExecutionException(java.util.concurrent.ExecutionException):210:210 -> a
+    85:85:void withOriginAndPositionAttachmentHandler(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.Runnable):223:223 -> a
+    86:88:java.lang.Object com.android.tools.r8.utils.ExceptionUtils.withOriginAndPositionAttachmentHandler(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.util.function.Supplier):235:237 -> a
+    86:88:void withOriginAndPositionAttachmentHandler(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.Runnable):223 -> a
+    89:89:java.lang.Object lambda$withOriginAndPositionAttachmentHandler$1(java.lang.Runnable):227:227 -> a
+    90:92:java.lang.Object withOriginAndPositionAttachmentHandler(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.util.function.Supplier):235:237 -> a
+    1:1:com.android.tools.r8.position.Position access$100(java.lang.Throwable):26:26 -> b
+    2:2:void withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):53:53 -> b
+    1:2:com.android.tools.r8.origin.Origin getOrigin(java.lang.Throwable):138:139 -> c
+    3:9:com.android.tools.r8.origin.Origin com.android.tools.r8.utils.ExceptionUtils.extractIOExceptionOrigin(java.io.IOException):200:206 -> c
+    3:9:com.android.tools.r8.origin.Origin getOrigin(java.lang.Throwable):139 -> c
+    10:22:com.android.tools.r8.origin.Origin getOrigin(java.lang.Throwable):141:153 -> c
+    1:10:com.android.tools.r8.position.Position getPosition(java.lang.Throwable):157:166 -> d
+    1:1:void printExitMessage(java.lang.Throwable):186:186 -> e
+    2:2:boolean com.android.tools.r8.utils.ExceptionUtils.isExpectedException(java.lang.Throwable):193:193 -> e
+    2:2:void printExitMessage(java.lang.Throwable):187 -> e
+    3:3:void printExitMessage(java.lang.Throwable):186:186 -> e
+com.android.tools.r8.utils.ExceptionUtils$CompileAction -> com.android.tools.r8.internal.bb$a:
+com.android.tools.r8.utils.ExceptionUtils$MainAction -> com.android.tools.r8.internal.bb$b:
+com.android.tools.r8.utils.ExceptionUtils$OriginAttachmentException -> com.android.tools.r8.internal.bb$c:
     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):263:265 -> <init>
-    1:5:boolean com.android.tools.r8.utils.ExceptionUtils$OriginAttachmentException.needsAttachment(java.lang.RuntimeException,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):269:273 -> a
-    1:5:java.lang.RuntimeException wrap(java.lang.RuntimeException,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):257 -> a
-    6:6:java.lang.RuntimeException wrap(java.lang.RuntimeException,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):258:258 -> a
+    1:3:void <init>(java.lang.RuntimeException,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):252:254 -> <init>
+    1:5:boolean com.android.tools.r8.utils.ExceptionUtils$OriginAttachmentException.needsAttachment(java.lang.RuntimeException,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):258:262 -> a
+    1:5:java.lang.RuntimeException wrap(java.lang.RuntimeException,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):246 -> a
+    6:6:java.lang.RuntimeException wrap(java.lang.RuntimeException,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):247:247 -> a
 com.android.tools.r8.utils.FeatureClassMapping -> com.android.tools.r8.utils.FeatureClassMapping:
     java.util.Map parsedRules -> a
     java.util.Map parseNonClassRules -> b
@@ -80772,18 +81127,21 @@
 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.pc:
+com.android.tools.r8.utils.FieldSignatureEquivalence -> com.android.tools.r8.internal.Ib:
+    com.android.tools.r8.utils.FieldSignatureEquivalence INSTANCE_IGNORE_NAME -> b
+    boolean ignoreName -> c
     com.android.tools.r8.utils.FieldSignatureEquivalence INSTANCE -> a
-    1:1:void <clinit>():16:16 -> <clinit>
-    1:1:void <init>(boolean):23:23 -> <init>
+    1:3:void <clinit>():16:18 -> <clinit>
+    1:2:void <init>(boolean):23:24 -> <init>
     1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):14:14 -> a
-    2:2:boolean com.android.tools.r8.utils.FieldSignatureEquivalence.doEquivalent(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):40:40 -> a
-    2:2:boolean doEquivalent(java.lang.Object,java.lang.Object):14 -> a
-    3:3:int doHash(java.lang.Object):14:14 -> a
-    4:4:int com.android.tools.r8.utils.FieldSignatureEquivalence.doHash(com.android.tools.r8.graph.DexField):48:48 -> a
-    4:4:int doHash(java.lang.Object):14 -> a
-    5:5:com.android.tools.r8.utils.FieldSignatureEquivalence get():28:28 -> a
-com.android.tools.r8.utils.FileUtils -> com.android.tools.r8.internal.vc:
+    2:5:boolean com.android.tools.r8.utils.FieldSignatureEquivalence.doEquivalent(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):37:40 -> a
+    2:5:boolean doEquivalent(java.lang.Object,java.lang.Object):14 -> a
+    6:6:int doHash(java.lang.Object):14:14 -> a
+    7:10:int com.android.tools.r8.utils.FieldSignatureEquivalence.doHash(com.android.tools.r8.graph.DexField):45:48 -> a
+    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.Ob:
     boolean isAndroid -> a
     boolean $assertionsDisabled -> b
     1:16:void <clinit>():21:36 -> <clinit>
@@ -80806,19 +81164,13 @@
     1:1:java.util.List readAllLines(java.nio.file.Path):90:90 -> f
 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>
-com.android.tools.r8.utils.FlagFile -> com.android.tools.r8.internal.Dc:
-    1:15:java.lang.String[] expandFlagFiles(java.lang.String[],java.util.function.Consumer):34:48 -> a
-com.android.tools.r8.utils.FlagFile$FlagFileOrigin -> com.android.tools.r8.internal.Cc:
+    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.Vb:
     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.Qc:
-com.android.tools.r8.utils.ForEachableUtils -> com.android.tools.r8.internal.Rc:
-    void lambda$empty$0(java.util.function.Consumer) -> a
-    1:1:com.android.tools.r8.utils.ForEachable empty():10:10 -> a
-com.android.tools.r8.utils.FunctionUtils -> com.android.tools.r8.internal.ed:
-    1:2:void forEachApply(java.lang.Iterable,java.util.function.Function,java.lang.Object):27:28 -> a
-com.android.tools.r8.utils.HeapUtils -> com.android.tools.r8.internal.Wd:
+com.android.tools.r8.utils.ForEachable -> com.android.tools.r8.internal.gc:
+com.android.tools.r8.utils.HeapUtils -> com.android.tools.r8.internal.jd:
     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
@@ -80828,36 +81180,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.ke:
+com.android.tools.r8.utils.IROrdering -> com.android.tools.r8.internal.xd:
     java.lang.Iterable order(java.lang.Iterable) -> a
-com.android.tools.r8.utils.IROrdering$IdentityIROrdering -> com.android.tools.r8.internal.ke$a:
+com.android.tools.r8.utils.IROrdering$IdentityIROrdering -> com.android.tools.r8.internal.xd$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.ke$b:
+com.android.tools.r8.utils.IROrdering$NondeterministicIROrdering -> com.android.tools.r8.internal.xd$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.IdentifierUtils -> com.android.tools.r8.internal.se:
-    1:1:boolean isDexIdentifierPart(int):14:14 -> a
-    1:1:boolean com.android.tools.r8.utils.IdentifierUtils.isDexIdentifierPart(int):14:14 -> b
-    1:1:boolean isDexIdentifierStart(int):10 -> b
-    1:2:boolean isRelaxedDexIdentifierPart(int):18:19 -> c
-    boolean isSimpleNameChar(int) -> d
-    boolean isUnicodeSpace(int) -> e
-com.android.tools.r8.utils.IntBox -> com.android.tools.r8.internal.lh:
+com.android.tools.r8.utils.IntBox -> com.android.tools.r8.internal.xg:
     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.Eh:
+com.android.tools.r8.utils.IntObjConsumer -> com.android.tools.r8.internal.Qg:
     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
@@ -80882,452 +81227,484 @@
     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.di:
+com.android.tools.r8.utils.InternalOptions -> com.android.tools.r8.internal.ph:
+    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> t1
     boolean enableEnumSwitchMapRemoval -> f0
-    boolean enableTreeShakingOfLibraryMethodOverrides -> P
-    boolean enableSwitchRewriting -> b0
-    java.util.Set reportedMissingForDesugaring -> v1
+    boolean enableStringConcatenationOptimization -> P
+    java.util.Set invalidLibraryClasses -> z1
     com.android.tools.r8.utils.Reporter reporter -> g
     boolean enableNeverMergePrefixes -> q
-    int applyInliningToInlineeMaxDepth -> C
-    boolean enableDevirtualization -> y
-    com.android.tools.r8.StringConsumer usageInformationConsumer -> l1
-    boolean enableSimpleInliningConstraints -> G
-    boolean enableTreeShaking -> N0
+    java.util.function.Consumer syntheticProguardRulesConsumer -> x1
+    boolean configurationDebugging -> V0
+    boolean enableUnusedInterfaceRemoval -> y
+    com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration desugaredLibraryConfiguration -> r1
+    boolean enableMinification -> R0
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> u1
+    boolean relocatorCompilation -> s1
+    java.util.List logArgumentsFilter -> F0
+    boolean disableInliningOfLibraryMethodOverrides -> G
+    boolean processCovariantReturnTypeAnnotations -> N0
     com.android.tools.r8.DataResourceConsumer dataResourceConsumer -> i
+    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> p1
+    java.util.List methodsFilter -> B0
+    boolean enableNestBasedAccessDesugaring -> J0
     int minimumStringSwitchSize -> d0
-    boolean enableLoadStoreOptimization -> E0
-    boolean enableClassStaticizer -> I
-    java.util.Set extensiveInterfaceMethodMinifierLoggingFilter -> y0
-    boolean encodeChecksums -> Q
-    com.android.tools.r8.DumpOptions dumpOptions -> u0
-    boolean hasMarker -> v0
-    boolean enableInlining -> z
-    boolean invalidDebugInfoStrict -> r0
-    boolean enableClassInlining -> H
-    int callGraphLikelySpuriousCallEdgeThreshold -> U
+    boolean readCompileTimeAnnotations -> E0
+    boolean minimalMainDex -> f1
+    com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions -> b1
+    boolean enableClassInlining -> I
+    int applyInliningToInlineeMaxDepth -> D
+    boolean enableTreeShakingOfLibraryMethodOverrides -> Q
+    int threadCount -> p0
+    boolean enableCfByteCodePassThrough -> v0
+    boolean enableDevirtualization -> z
+    boolean verbose -> r0
+    com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> w1
+    com.android.tools.r8.utils.InternalOptions$LineNumberOptimization lineNumberOptimization -> h1
+    java.util.Map missingEnclosingMembers -> i1
+    boolean enableSimpleInliningConstraints -> H
     boolean enablePcDebugInfoOutput -> n0
     boolean enableValuePropagation -> j0
-    boolean enableNameReflectionOptimization -> N
-    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> q1
+    int minApiLevel -> C0
+    boolean enableServiceLoaderRewriting -> N
+    com.android.tools.r8.StringConsumer configurationConsumer -> q1
     boolean enableStringSwitchConversion -> c0
-    boolean enableArgumentRemoval -> w
-    boolean configurationDebugging -> S0
-    boolean enableInliningOfInvokesWithNullableReceivers -> E
-    int classInliningInstructionLimit -> V
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> r1
-    boolean relocatorCompilation -> p1
-    boolean enableMinification -> O0
-    boolean processCovariantReturnTypeAnnotations -> K0
-    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> m1
-    boolean enableStringConcatenationOptimization -> O
-    boolean enableLambdaMerging -> F0
+    java.util.Set reportedMissingForDesugaring -> y1
+    com.android.tools.r8.utils.Box reportedExperimentClassFileVersion -> A1
+    boolean enableVerticalClassMerging -> w
+    boolean skipIR -> W0
+    com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> d1
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> v1
+    boolean ignoreMissingClasses -> S0
+    boolean enableInliningOfInvokesWithClassInitializationSideEffects -> E
+    int callGraphLikelySpuriousCallEdgeThreshold -> V
+    boolean lookupLibraryBeforeProgram -> O0
+    boolean skipReadingDexCode -> l1
+    boolean enableNestReduction -> K0
+    com.android.tools.r8.StringConsumer mainDexListConsumer -> m1
+    boolean enableNameReflectionOptimization -> O
+    boolean enableInheritanceClassInDexDistributor -> g1
     boolean passthroughDexCode -> p
-    com.android.tools.r8.utils.AssertionConfigurationWithDefault assertionsConfiguration -> R0
-    com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions callSiteOptimizationOptions -> V0
-    boolean intermediate -> B0
-    boolean minimalMainDex -> c1
-    java.util.Set extensiveLoggingFilter -> x0
-    boolean enableUnusedInterfaceRemoval -> x
+    boolean enableArgumentRemoval -> x
     com.android.tools.r8.shaking.ProguardConfiguration proguardConfiguration -> f
-    int threadCount -> o0
-    boolean ignoreMainDexMissingClasses -> s0
-    com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> J0
-    boolean disableInliningOfLibraryMethodOverrides -> F
-    int classInliningInstructionAllowance -> W
+    boolean invalidDebugInfoFatal -> s0
+    com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions horizontalClassMergerOptions -> Z0
+    boolean enableInliningOfInvokesWithNullableReceivers -> F
+    int classInliningInstructionLimit -> W
     boolean enableUninstantiatedTypeOptimization -> k0
-    com.android.tools.r8.utils.InternalOptions$DesugarState desugarState -> G0
-    java.util.Map warningInvalidDebugInfo -> h1
+    com.android.tools.r8.dex.Marker marker -> y0
+    com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions desugarSpecificOptions -> c1
     boolean printMemory -> m
-    boolean enableDeterminismAnalysis -> L
-    com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions desugarSpecificOptions -> Z0
+    boolean enableSideEffectAnalysis -> L
     boolean enableFieldBitAccessAnalysis -> u
     java.lang.String dumpInputToFile -> n
+    boolean debug -> X0
     com.android.tools.r8.features.FeatureSplitConfiguration featureSplitConfiguration -> j
-    boolean enablePackagePrivateAwarePublicization -> T
-    boolean skipIR -> T0
-    boolean ignoreMissingClasses -> P0
-    int inliningInstructionLimit -> X
-    boolean lookupLibraryBeforeProgram -> L0
-    com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> a1
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> s1
-    com.android.tools.r8.StringConsumer mainDexListConsumer -> j1
-    boolean enableNestReduction -> H0
-    boolean skipReadingDexCode -> i1
-    com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking -> X0
-    com.android.tools.r8.StringConsumer configurationConsumer -> n1
+    boolean cfToCfDesugar -> T
+    boolean forceProguardCompatibility -> T0
+    boolean enableMainDexListCheck -> P0
+    int classInliningInstructionAllowance -> X
+    boolean enableLambdaMerging -> H0
+    boolean applyInliningToInlinee -> C
+    com.android.tools.r8.StringConsumer proguardMapConsumer -> n1
     boolean $assertionsDisabled -> d
-    java.util.List logArgumentsFilter -> D0
-    boolean enableServiceLoaderRewriting -> M
-    boolean readCompileTimeAnnotations -> C0
-    boolean enableInheritanceClassInDexDistributor -> d1
-    boolean enableVerticalClassMerging -> v
-    boolean enableCfByteCodePassThrough -> t0
-    boolean useSmaliSyntax -> p0
+    java.util.List mainDexKeepRules -> e1
+    boolean enableDeterminismAnalysis -> M
+    com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions callSiteOptimizationOptions -> Y0
+    com.android.tools.r8.utils.AssertionConfigurationWithDefault assertionsConfiguration -> U0
+    int inliningControlFlowResolutionBlocksThreshold -> b0
+    com.android.tools.r8.DumpOptions dumpOptions -> w0
+    boolean enableLoadStoreOptimization -> G0
+    boolean enablePackagePrivateAwarePublicization -> U
+    boolean enableStaticClassMerging -> v
+    boolean hasMarker -> x0
+    boolean invalidDebugInfoStrict -> t0
+    com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> M0
     com.android.tools.r8.cf.CfVersion SUPPORTED_CF_VERSION -> a
-    int inliningInstructionAllowance -> Y
+    int inliningInstructionLimit -> Y
     boolean enableUninstantiatedTypeOptimizationForInterfaces -> l0
-    com.android.tools.r8.utils.OffOrAuto interfaceMethodDesugaring -> I0
-    com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions horizontalClassMergerOptions -> W0
+    java.util.Map warningInvalidDebugInfo -> k1
     boolean enableInitializedClassesInInstanceMethodsAnalysis -> h0
     java.util.List outputInspections -> k
-    boolean enableInliningOfInvokesWithClassInitializationSideEffects -> D
-    java.util.Map warningInvalidParameterAnnotations -> g1
     boolean enableEnumValueOptimization -> e0
-    int minApiLevel -> A0
-    java.util.List mainDexKeepRules -> b1
-    java.util.function.BiPredicate dexClassChecksumFilter -> R
-    boolean enableInitializedClassesAnalysis -> J
-    java.util.Set invalidLibraryClasses -> w1
-    java.util.List methodsFilter -> z0
-    com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions -> Y0
-    java.util.function.Consumer syntheticProguardRulesConsumer -> u1
+    boolean enableClassStaticizer -> J
+    boolean encodeChecksums -> R
     boolean libraryInterfacesMayHaveStaticInitialization -> s
-    boolean debug -> U0
-    com.android.tools.r8.utils.Box reportedExperimentClassFileVersion -> x1
     com.android.tools.r8.cf.CfVersion EXPERIMENTAL_CF_VERSION -> b
-    int inliningMonitorEnterValuesAllowance -> Z
-    boolean forceProguardCompatibility -> Q0
-    com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration desugaredLibraryConfiguration -> o1
+    int inliningInstructionAllowance -> Z
+    boolean enableTreeShaking -> Q0
     com.android.tools.r8.ProgramConsumer programConsumer -> h
-    boolean enableMainDexListCheck -> M0
-    com.android.tools.r8.StringConsumer proguardMapConsumer -> k1
-    boolean enableEnumUnboxing -> A
+    java.lang.String synthesizedClassPrefix -> o0
+    boolean enableInlining -> A
+    com.android.tools.r8.StringConsumer usageInformationConsumer -> o1
+    boolean intermediate -> D0
+    java.util.Set extensiveLoggingFilter -> z0
     com.android.tools.r8.graph.DexItemFactory itemFactory -> e
-    int inliningControlFlowResolutionBlocksThreshold -> a0
-    boolean enableSideEffectAnalysis -> K
+    int inliningMonitorEnterValuesAllowance -> a0
+    com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking -> a1
+    boolean enableInitializedClassesAnalysis -> K
     boolean printTimes -> l
     java.lang.String dumpInputToDirectory -> o
+    java.util.function.BiPredicate dexClassChecksumFilter -> S
     int SUPPORTED_DEX_VERSION -> c
-    boolean cfToCfDesugar -> S
     boolean enableFieldAssignmentTracker -> t
-    boolean invalidDebugInfoFatal -> q0
-    com.android.tools.r8.utils.InternalOptions$LineNumberOptimization lineNumberOptimization -> e1
+    boolean ignoreMainDexMissingClasses -> u0
+    boolean useSmaliSyntax -> q0
     com.android.tools.r8.utils.InternalOptions$OutlineOptions outline -> g0
     boolean enableRedundantConstNumberOptimization -> m0
+    java.util.Map warningInvalidParameterAnnotations -> j1
+    com.android.tools.r8.utils.OffOrAuto interfaceMethodDesugaring -> L0
     java.util.Set neverMergePrefixes -> r
-    java.util.Map missingEnclosingMembers -> f1
-    boolean applyInliningToInlinee -> B
+    com.android.tools.r8.utils.InternalOptions$DesugarState desugarState -> I0
+    boolean enableEnumUnboxing -> B
     boolean enableRedundantFieldLoadElimination -> i0
-    com.android.tools.r8.dex.Marker marker -> w0
-    com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> t1
-    1:21:void <clinit>():93:113 -> <clinit>
-    1:1:void <init>():143:143 -> <init>
-    2:790:void <init>():135:923 -> <init>
-    791:795:void <init>():144:148 -> <init>
-    796:796:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):152:152 -> <init>
-    797:1585:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):135:923 -> <init>
-    1586:1593:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):153:160 -> <init>
-    1594:1594:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):164:164 -> <init>
-    1595:2383:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):135:923 -> <init>
-    2384:2398:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):165:179 -> <init>
-    1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():120:120 -> A
-    1:3:void disableAllOptimizations():193:195 -> B
-    1:7:void disableGlobalOptimizations():199:205 -> C
-    8:8:void com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.disable():1148:1148 -> C
-    8:8:void disableGlobalOptimizations():205 -> C
-    9:17:void disableGlobalOptimizations():206:214 -> C
-    1:1:void disableNameReflectionOptimization():1397:1397 -> D
-    1:6:void enableProtoShrinking():184:189 -> E
-    1:1:boolean enableTryWithResourcesDesugaring():1467:1467 -> F
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseSuppressedExceptions():1517:1517 -> F
-    2:2:boolean enableTryWithResourcesDesugaring():1471 -> F
-    3:3:boolean enableTryWithResourcesDesugaring():1473:1473 -> F
-    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():675:683 -> G
-    1:9:java.util.Set getExtensiveLoggingFilter():662:670 -> H
-    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():396:396 -> I
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():435:435 -> I
-    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():397 -> I
-    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():398:398 -> I
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():439:439 -> I
-    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():399 -> I
-    5:9:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():400:404 -> I
-    1:1:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():128:128 -> J
-    1:1:boolean hasConsumer():392:392 -> K
-    1:1:boolean hasMethodsFilter():1018:1018 -> L
-    1:1:boolean hasProguardConfiguration():124:124 -> M
-    1:1:boolean hasUsageInformationConsumer():736:736 -> N
-    1:1:com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions horizontalClassMergerOptions():642:642 -> O
-    1:1:boolean isClassMergingExtensionRequired():582:582 -> P
-    2:2:boolean com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.isEnabled():1189:1189 -> P
-    2:2:boolean isClassMergingExtensionRequired():582 -> P
-    3:3:boolean isClassMergingExtensionRequired():582:582 -> P
-    1:1:boolean isDesugaredLibraryCompilation():408:408 -> Q
-    1:1:boolean isDesugaring():447:447 -> R
-    1:1:boolean isGeneratingClassFiles():443:443 -> S
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():435:435 -> T
-    1:1:boolean isGeneratingDex():431 -> T
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():439:439 -> T
-    2:2:boolean isGeneratingDex():431 -> T
-    1:6:boolean isInterfaceMethodDesugaringEnabled():1487:1492 -> U
-    1:1:boolean isKeepAttributesSignatureEnabled():574:574 -> V
-    1:3:boolean isMinifying():546:546 -> W
-    5:5:boolean isMinifying():548:548 -> W
-    1:1:boolean isRelease():536:536 -> X
-    1:2:boolean isRepackagingEnabled():563:564 -> Y
-    1:3:boolean isShrinking():540:540 -> Z
-    5:5:boolean isShrinking():542:542 -> Z
+    java.util.Set extensiveInterfaceMethodMinifierLoggingFilter -> A0
+    1:21:void <clinit>():99:119 -> <clinit>
+    1:1:void <init>():149:149 -> <init>
+    2:923:void <init>():141:1062 -> <init>
+    924:928:void <init>():150:154 -> <init>
+    929:929:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):158:158 -> <init>
+    930:1851:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):141:1062 -> <init>
+    1852:1859:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):159:166 -> <init>
+    1860:1860:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):170:170 -> <init>
+    1861:2782:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):141:1062 -> <init>
+    2783:2797:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):171:185 -> <init>
+    1:1:boolean canUseTwrCloseResourceMethod():1603:1603 -> A
+    1:1:com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions desugarSpecificOptions():664:664 -> B
+    1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():126:126 -> C
+    1:3:void disableAllOptimizations():199:201 -> D
+    1:7:void disableGlobalOptimizations():205:211 -> E
+    8:8:void com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.disable():1290:1290 -> E
+    8:8:void disableGlobalOptimizations():211 -> E
+    9:18:void disableGlobalOptimizations():212:221 -> E
+    1:1:void disableNameReflectionOptimization():1537:1537 -> F
+    1:6:void enableProtoShrinking():190:195 -> G
+    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():698:706 -> H
+    1:9:java.util.Set getExtensiveLoggingFilter():672:680 -> I
+    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():403:403 -> J
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():442:442 -> J
+    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():404 -> J
+    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():405:405 -> J
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():446:446 -> J
+    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():406 -> J
+    5:9:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():407:411 -> J
+    1:1:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():134:134 -> K
+    1:1:boolean hasConsumer():399:399 -> L
+    1:1:boolean hasMethodsFilter():1157:1157 -> M
+    1:1:boolean hasProguardConfiguration():130:130 -> N
+    1:1:boolean hasUsageInformationConsumer():793:793 -> O
+    1:1:com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions horizontalClassMergerOptions():652:652 -> P
+    1:1:boolean isClassMergingExtensionRequired():593:593 -> Q
+    2:2:boolean com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.isEnabled():1331:1331 -> Q
+    2:2:boolean isClassMergingExtensionRequired():593 -> Q
+    3:3:boolean isClassMergingExtensionRequired():593:593 -> Q
+    1:1:boolean isDesugaredLibraryCompilation():415:415 -> R
+    1:1:boolean isDesugaring():454:454 -> S
+    1:1:boolean isGeneratingClassFiles():450:450 -> T
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():442:442 -> U
+    1:1:boolean isGeneratingDex():438 -> U
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():446:446 -> U
+    2:2:boolean isGeneratingDex():438 -> U
+    1:6:boolean isInterfaceMethodDesugaringEnabled():1617:1622 -> V
+    1:1:boolean isKeepAttributesSignatureEnabled():585:585 -> W
+    1:3:boolean isMinifying():557:557 -> X
+    5:5:boolean isMinifying():559:559 -> X
+    1:1:boolean isRelease():547:547 -> Y
+    1:2:boolean isRepackagingEnabled():574:575 -> Z
     boolean lambda$new$0(java.lang.String,java.lang.Long) -> a
-    1:2:void setMarker(com.android.tools.r8.dex.Marker):351:352 -> a
-    3:4:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):356:357 -> a
-    5:27:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):364:386 -> a
-    5:27:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):359 -> a
-    28:28:boolean assertionsEnabled():776:776 -> a
-    29:31:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):807:809 -> a
-    32:32:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():650:650 -> a
-    32:32:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):809 -> a
-    33:33:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):809:809 -> a
-    34:34:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):807:807 -> a
-    35:41: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):851:857 -> a
-    42:42: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):852:852 -> a
-    43:44:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):864:865 -> a
-    45:45:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():650:650 -> a
-    45:45:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):867 -> a
-    46:52:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):867:873 -> a
-    53:53:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):865:865 -> a
-    54:62:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.utils.collections.DexClassAndMethodSet):883:891 -> a
-    63:63:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.utils.collections.DexClassAndMethodSet):890:890 -> a
-    64:64:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.utils.collections.DexClassAndMethodSet):884:884 -> a
-    65:65:com.android.tools.r8.references.MethodReference lambda$warningInvalidLibrarySuperclassForDesugar$1(com.android.tools.r8.graph.DexClassAndMethod):892:892 -> a
-    66:69:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.cf.CfVersion):897:900 -> a
-    70:74:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):905:909 -> a
-    75:81:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):914:920 -> a
-    82:82:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):915:915 -> a
-    83:83:java.util.List lambda$warningInvalidDebugInfo$4(com.android.tools.r8.origin.Origin):919:919 -> a
-    84:89:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):1023:1028 -> a
-    90:90:boolean hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1401:1401 -> a
-    91:91:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1421:1421 -> a
-    92:93:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.requiredCfVersionForConstClassInstructions():1426:1427 -> a
-    92:93:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1422 -> a
-    94:94:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1422:1422 -> a
-    1:1:boolean isStringSwitchConversionEnabled():1500:1500 -> a0
-    1:1:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions callSiteOptimizationOptions():638:638 -> b
-    2:16:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):813:827 -> b
-    17:17:java.lang.String com.android.tools.r8.utils.StringUtils.join(java.lang.String,java.lang.Iterable,java.util.function.Function):132:132 -> b
-    17:17:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):827 -> b
-    18:22:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):827:831 -> b
-    23:23:java.lang.String com.android.tools.r8.utils.StringUtils.join(java.lang.String,java.lang.Iterable,java.util.function.Function):132:132 -> b
-    23:23:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):831 -> b
-    24:28:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):831:835 -> b
-    29:29:java.lang.String com.android.tools.r8.utils.StringUtils.join(java.lang.String,java.lang.Iterable,java.util.function.Function):132:132 -> b
-    29:29:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):836 -> b
-    30:36:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):836:842 -> b
-    37:37:java.lang.String com.android.tools.r8.utils.StringUtils.join(java.lang.String,java.lang.Iterable,java.util.function.Function):132:132 -> b
-    37:37:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):843 -> b
-    38:41:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):843:846 -> b
-    42:42:java.util.List lambda$warningInvalidParameterAnnotations$3(com.android.tools.r8.origin.Origin):908:908 -> b
-    43:48:com.android.tools.r8.cf.CfVersion classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1525:1530 -> b
-    1:2:boolean keepInnerClassStructure():592:593 -> b0
-    1:1:java.util.List lambda$warningMissingEnclosingMember$2(com.android.tools.r8.origin.Origin):899:899 -> c
-    2:2:boolean canHaveArtCheckCastVerifierBug():1838:1838 -> c
-    1:1:com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions():650:650 -> c0
-    1:10:void warningExperimentalClassFileVersion(com.android.tools.r8.origin.Origin):926:935 -> d
-    11:17:void warningExperimentalClassFileVersion(com.android.tools.r8.origin.Origin):931:937 -> d
-    18:19:boolean canHaveArtInstanceOfVerifierBug():1793:1794 -> d
-    1:32:boolean printWarnings():943:974 -> d0
-    33:72:boolean printWarnings():970:1009 -> d0
-    1:1:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():1870:1870 -> e
-    1:1:com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking():646:646 -> e0
-    1:1:boolean canHaveDalvikCatchHandlerVerificationBug():1862:1862 -> f
-    1:2:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1426:1427 -> f0
-    1:1:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1884:1884 -> g
-    1:1:boolean shouldBackportMethods():416:416 -> g0
-    1:1:boolean canInitCauseAfterAssertionErrorObjectConstructor():1540:1540 -> h
-    1:1:boolean shouldDesugarNests():485:485 -> h0
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1455:1455 -> h0
-    2:2:boolean shouldDesugarNests():488 -> h0
-    1:1:boolean canLeaveStaticInterfaceMethodInvokes():1459:1459 -> i
-    1:1:boolean shouldKeepStackMapTable():420:420 -> i0
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():412:412 -> i0
-    2:2:boolean shouldKeepStackMapTable():420 -> i0
-    3:4:boolean shouldKeepStackMapTable():420:421 -> i0
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():412:412 -> i0
-    5:5:boolean shouldKeepStackMapTable():422 -> i0
-    6:6:boolean shouldKeepStackMapTable():423:423 -> i0
-    1:1:boolean canUseAssertionErrorTwoArgumentConstructor():1521:1521 -> j
-    1:1:boolean shouldRerunEnqueuer():427:427 -> j0
-    1:1:boolean canUseConstantMethodHandle():1439:1439 -> k
-    1:18:void signalFinishedToConsumers():463:480 -> k0
-    1:1:boolean canUseConstantMethodType():1443:1443 -> l
-    1:1:boolean canUseDefaultAndStaticInterfaceMethods():1451:1451 -> m
-    1:2:boolean canUseFilledNewArrayOfObjects():1552:1553 -> n
-    1:1:boolean canUseInputStackMaps():597:597 -> o
-    1:1:boolean canUseInvokeCustom():1447:1447 -> p
-    1:1:boolean canUseInvokePolymorphic():1435:1435 -> q
-    1:1:boolean canUseInvokePolymorphicOnVarHandle():1431:1431 -> r
-    1:1:boolean canUseJavaUtilObjects():1509:1509 -> s
-    1:2:boolean canUseMultidex():1504:1505 -> t
-    1:1:boolean canUseNotInstruction():1588:1588 -> u
-    1:1:boolean canUsePrivateInterfaceMethods():1477:1477 -> v
-    1:1:boolean canUseRequireNonNull():1513:1513 -> w
-    1:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1561:1562 -> x
-    1:1:boolean canUseTwrCloseResourceMethod():1463:1463 -> y
-    1:1:com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions desugarSpecificOptions():654:654 -> z
-com.android.tools.r8.utils.InternalOptions$1 -> com.android.tools.r8.internal.di$a:
-    int[] $SwitchMap$com$android$tools$r8$utils$OffOrAuto -> a
-    1:1:void <clinit>():1467:1467 -> <clinit>
-com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions -> com.android.tools.r8.internal.di$b:
+    1:2:void setMarker(com.android.tools.r8.dex.Marker):358:359 -> a
+    3:4:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):363:364 -> a
+    5:27:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):371:393 -> a
+    5:27:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):366 -> a
+    28:28:boolean assertionsEnabled():833:833 -> a
+    29:29:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):849:849 -> a
+    30:30:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):871:871 -> a
+    31:37: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):965:971 -> a
+    38: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):966:966 -> a
+    39:40:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):978:979 -> a
+    41:41:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():632:632 -> a
+    41:41:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):981 -> a
+    42:48:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):981:987 -> a
+    49:49:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):979:979 -> a
+    50:58:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.utils.collections.DexClassAndMethodSet):997:1005 -> 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,com.android.tools.r8.utils.collections.DexClassAndMethodSet):1004:1004 -> a
+    60:60:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.utils.collections.DexClassAndMethodSet):998:998 -> a
+    61:61:com.android.tools.r8.references.MethodReference lambda$warningInvalidLibrarySuperclassForDesugar$1(com.android.tools.r8.graph.DexClassAndMethod):1006:1006 -> a
+    62:65:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.cf.CfVersion):1011:1014 -> a
+    66:70:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):1019:1023 -> a
+    71:77:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):1028:1034 -> a
+    78:78:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):1029:1029 -> a
+    79:79:java.util.List lambda$warningInvalidDebugInfo$4(com.android.tools.r8.origin.Origin):1033:1033 -> a
+    80:85:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):1162:1167 -> a
+    86:86:boolean hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1541:1541 -> a
+    87:87:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1561:1561 -> a
+    88:89:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.requiredCfVersionForConstClassInstructions():1566:1567 -> a
+    88:89:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1562 -> a
+    90:90:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1562:1562 -> a
+    1:3:boolean isShrinking():551:551 -> a0
+    5:5:boolean isShrinking():553:553 -> a0
+    1:1:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions callSiteOptimizationOptions():648:648 -> b
+    2:4:java.lang.String messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):905:907 -> b
+    5:10:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):921:926 -> b
+    11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> b
+    11:11:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):926 -> b
+    12:12:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):928:928 -> 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):929 -> b
+    14:18:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):930:934 -> 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):934 -> b
+    20:41:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):934:955 -> b
+    42:42:java.util.List lambda$warningInvalidParameterAnnotations$3(com.android.tools.r8.origin.Origin):1022:1022 -> b
+    43:48:com.android.tools.r8.cf.CfVersion classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1651:1656 -> b
+    1:1:boolean isStringSwitchConversionEnabled():1626:1626 -> b0
+    1:1:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):887:887 -> c
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> c
+    2:2:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):888 -> c
+    3:3:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):889:889 -> 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):891 -> c
+    5:5:void com.android.tools.r8.utils.InternalOptions.errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):871:871 -> c
+    5:5:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):892 -> c
+    6:7:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):896:897 -> c
+    8:8:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():632:632 -> c
+    8:8:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):899 -> c
+    9:9:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):899:899 -> c
+    10:10:java.lang.String com.android.tools.r8.utils.InternalOptions.messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):959:959 -> c
+    10:10:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):901 -> c
+    11:11:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):901:901 -> c
+    12:12:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):897:897 -> c
+    13:15:java.lang.String messageWarningMissingNestHost(com.android.tools.r8.graph.DexClass):914:916 -> c
+    16:16:java.util.List lambda$warningMissingEnclosingMember$2(com.android.tools.r8.origin.Origin):1013:1013 -> c
+    17:17:boolean canHaveArtCheckCastVerifierBug():1964:1964 -> c
+    1:2:boolean keepInnerClassStructure():603:604 -> c0
+    1:1:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):860:860 -> d
+    2:2:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> d
+    2:2:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):860 -> d
+    3:3:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):863:863 -> d
+    4:4:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():632:632 -> d
+    4:4:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):865 -> d
+    5:7:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):865:867 -> d
+    8:8:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):863:863 -> d
+    9:9:void com.android.tools.r8.utils.InternalOptions.errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):849:849 -> d
+    9:9:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):861 -> d
+    10:10:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):875:875 -> d
+    11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):273:273 -> d
+    11:11:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):876 -> d
+    12:12:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> d
+    12:12:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):877 -> d
+    13:13:void com.android.tools.r8.utils.InternalOptions.errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):871:871 -> d
+    13:13:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):878 -> d
+    14:14:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):882:882 -> d
+    15:15:java.lang.String com.android.tools.r8.utils.InternalOptions.messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):959:959 -> d
+    15:15:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):882 -> d
+    16:16:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):882:882 -> d
+    17:26:void warningExperimentalClassFileVersion(com.android.tools.r8.origin.Origin):1065:1074 -> d
+    27:33:void warningExperimentalClassFileVersion(com.android.tools.r8.origin.Origin):1070:1076 -> d
+    34:35:boolean canHaveArtInstanceOfVerifierBug():1919:1920 -> d
+    1:1:com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions():660:660 -> d0
+    1:1:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):853:853 -> e
+    2:2:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> e
+    2:2:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):853 -> e
+    3:3:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):856:856 -> e
+    4:4:void com.android.tools.r8.utils.InternalOptions.errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):849:849 -> e
+    4:4:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):854 -> e
+    5:5:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():1996:1996 -> e
+    1:32:boolean printWarnings():1082:1113 -> e0
+    33:72:boolean printWarnings():1109:1148 -> e0
+    1:1:boolean canHaveDalvikCatchHandlerVerificationBug():1988:1988 -> f
+    1:1:com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking():656:656 -> f0
+    1:1:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():2010:2010 -> g
+    1:2:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1566:1567 -> g0
+    1:1:boolean canInitCauseAfterAssertionErrorObjectConstructor():1666:1666 -> h
+    1:1:boolean shouldBackportMethods():423:423 -> h0
+    1:1:boolean canLeaveStaticInterfaceMethodInvokes():1599:1599 -> i
+    1:4:boolean shouldDesugarNests():492:495 -> i0
+    1:1:boolean canUseAssertionErrorTwoArgumentConstructor():1647:1647 -> j
+    1:1:boolean shouldKeepStackMapTable():427:427 -> j0
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():419:419 -> j0
+    2:2:boolean shouldKeepStackMapTable():427 -> j0
+    3:4:boolean shouldKeepStackMapTable():427:428 -> j0
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():419:419 -> j0
+    5:5:boolean shouldKeepStackMapTable():429 -> j0
+    6:6:boolean shouldKeepStackMapTable():430:430 -> j0
+    1:1:boolean canUseConstantMethodHandle():1579:1579 -> k
+    1:1:boolean shouldRerunEnqueuer():434:434 -> k0
+    1:1:boolean canUseConstantMethodType():1583:1583 -> l
+    1:18:void signalFinishedToConsumers():470:487 -> l0
+    1:1:boolean canUseDefaultAndStaticInterfaceMethods():1591:1591 -> m
+    1:2:boolean canUseFilledNewArrayOfObjects():1678:1679 -> n
+    1:1:boolean canUseInputStackMaps():608:608 -> o
+    1:1:boolean canUseInvokeCustom():1587:1587 -> p
+    1:1:boolean canUseInvokePolymorphic():1575:1575 -> q
+    1:1:boolean canUseInvokePolymorphicOnVarHandle():1571:1571 -> r
+    1:1:boolean canUseJavaUtilObjects():1635:1635 -> s
+    1:2:boolean canUseMultidex():1630:1631 -> t
+    1:1:boolean canUseNestBasedAccess():1595:1595 -> u
+    1:1:boolean canUseNotInstruction():1714:1714 -> v
+    1:1:boolean canUsePrivateInterfaceMethods():1607:1607 -> w
+    1:1:boolean canUseRequireNonNull():1639:1639 -> x
+    1:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1687:1688 -> y
+    1:1:boolean canUseSuppressedExceptions():1643:1643 -> z
+com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions -> com.android.tools.r8.internal.ph$a:
     boolean $assertionsDisabled -> a
     boolean enableConstantPropagation -> b
     boolean enableTypePropagation -> c
-    1:1:void <clinit>():1091:1091 -> <clinit>
-    1:11:void <init>():1091:1101 -> <init>
-    1:2:void com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions.disableOptimization():1104:1105 -> a
-    1:2:void access$000(com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions):1091 -> a
-    3:3:void disableTypePropagationForTesting():1109:1109 -> a
-    4:5:void enableConstantPropagationForTesting(com.android.tools.r8.utils.InternalOptions):1115:1116 -> a
-    1:1:boolean isConstantPropagationEnabled():1128:1128 -> b
-    1:1:boolean isEnabled():1124:1124 -> c
-    1:1:boolean isTypePropagationEnabled():1132:1132 -> d
-com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions -> com.android.tools.r8.internal.di$c:
+    1:1:void <clinit>():1234:1234 -> <clinit>
+    1:11:void <init>():1234:1244 -> <init>
+    1:2:void com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions.disableOptimization():1247:1248 -> a
+    1:2:void access$000(com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions):1234 -> a
+    3:3:void disableTypePropagationForTesting():1252:1252 -> a
+    4:5:void enableConstantPropagationForTesting(com.android.tools.r8.utils.InternalOptions):1258:1259 -> a
+    1:1:boolean isConstantPropagationEnabled():1271:1271 -> b
+    1:1:boolean isEnabled():1267:1267 -> c
+    1:1:boolean isTypePropagationEnabled():1275:1275 -> d
+com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions -> com.android.tools.r8.internal.ph$b:
     boolean sortMethodsOnCfOutput -> a
     boolean allowAllDesugaredInput -> b
-    1:9:void <init>():1080:1088 -> <init>
-com.android.tools.r8.utils.InternalOptions$DesugarState -> com.android.tools.r8.internal.di$d:
+    1:9:void <init>():1223:1231 -> <init>
+com.android.tools.r8.utils.InternalOptions$DesugarState -> com.android.tools.r8.internal.ph$c:
     com.android.tools.r8.utils.InternalOptions$DesugarState ON -> b
     com.android.tools.r8.utils.InternalOptions$DesugarState OFF -> a
-    1:2:void <clinit>():105:106 -> <clinit>
-    1:1:void <init>(java.lang.String,int):104:104 -> <init>
-com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions -> com.android.tools.r8.internal.di$e:
+    1:2:void <clinit>():111:112 -> <clinit>
+    1:1:void <init>(java.lang.String,int):110:110 -> <init>
+com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions -> com.android.tools.r8.internal.ph$d:
     int maxGroupSize -> f
     int syntheticArgumentCount -> e
     boolean enable -> a
     boolean enableConstructorMerging -> b
     boolean enableJavaLambdaMerging -> c
     boolean enableKotlinLambdaMerging -> d
-    1:10:void <init>():1136:1145 -> <init>
-    1:1:void disableKotlinLambdaMerging():1153:1153 -> a
-    2:2:void enableIf(boolean):1161:1161 -> a
-    1:1:void enable():1157:1157 -> b
-    2:2:void enableKotlinLambdaMergingIf(boolean):1169:1169 -> b
-    1:1:void enableJavaLambdaMerging():1165:1165 -> c
-    1:1:int getMaxGroupSize():1173:1173 -> d
-    1:1:boolean com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.isEnabled():1189:1189 -> e
-    1:1:boolean isDisabled():1185 -> e
-    1:1:boolean isEnabled():1189:1189 -> f
-    1:1:boolean isJavaLambdaMergingEnabled():1193:1193 -> g
-com.android.tools.r8.utils.InternalOptions$InvalidParameterAnnotationInfo -> com.android.tools.r8.internal.di$f:
+    1:9:void <init>():1279:1287 -> <init>
+    1:1:void disableKotlinLambdaMerging():1295:1295 -> a
+    2:2:void enableIf(boolean):1303:1303 -> a
+    1:1:void enable():1299:1299 -> b
+    2:2:void enableKotlinLambdaMergingIf(boolean):1311:1311 -> b
+    1:1:void enableJavaLambdaMerging():1307:1307 -> c
+    1:1:int getMaxGroupSize():1315:1315 -> d
+    1:1:boolean com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.isEnabled():1331:1331 -> e
+    1:1:boolean isDisabled():1327 -> e
+    1:1:boolean isEnabled():1331:1331 -> f
+    1:1:boolean isJavaLambdaMergingEnabled():1335:1335 -> g
+com.android.tools.r8.utils.InternalOptions$InvalidParameterAnnotationInfo -> com.android.tools.r8.internal.ph$e:
     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):693:696 -> <init>
-com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions -> com.android.tools.r8.internal.di$g:
+    1:4:void <init>(com.android.tools.r8.graph.DexMethod,int,int):750:753 -> <init>
+com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions -> com.android.tools.r8.internal.ph$f:
     boolean disableKotlinSpecificOptimizations -> a
-    1:3:void <init>():1073:1075 -> <init>
-com.android.tools.r8.utils.InternalOptions$LineNumberOptimization -> com.android.tools.r8.internal.di$h:
+    1:3:void <init>():1216:1218 -> <init>
+com.android.tools.r8.utils.InternalOptions$LineNumberOptimization -> com.android.tools.r8.internal.ph$g:
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization ON -> b
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization OFF -> a
-    1:2:void <clinit>():100:101 -> <clinit>
-    1:1:void <init>(java.lang.String,int):99:99 -> <init>
-com.android.tools.r8.utils.InternalOptions$OutlineOptions -> com.android.tools.r8.internal.di$i:
+    1:2:void <clinit>():106:107 -> <clinit>
+    1:1:void <init>(java.lang.String,int):105:105 -> <init>
+com.android.tools.r8.utils.InternalOptions$OutlineOptions -> com.android.tools.r8.internal.ph$h:
     int threshold -> d
     boolean enabled -> a
     int minSize -> b
     int maxSize -> c
-    1:5:void <init>():1066:1070 -> <init>
-com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode -> com.android.tools.r8.internal.di$j:
+    1:9:void <init>():1205:1213 -> <init>
+com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode -> com.android.tools.r8.internal.ph$i:
     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>():1043:1047 -> <clinit>
-    1:1:void <init>(java.lang.String,int):1041:1041 -> <init>
-    1:1:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isNone():1050:1050 -> a
-    1:1:boolean isSome():1062 -> a
-com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions -> com.android.tools.r8.internal.di$k:
+    1:5:void <clinit>():1182:1186 -> <clinit>
+    1:1:void <init>(java.lang.String,int):1180:1180 -> <init>
+    1:1:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isNone():1189:1189 -> a
+    1:1:boolean isSome():1201 -> a
+com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions -> com.android.tools.r8.internal.ph$j:
     boolean enableEnumLiteProtoShrinking -> e
     boolean enableGeneratedExtensionRegistryShrinking -> a
     boolean enableGeneratedMessageLiteShrinking -> b
     boolean enableGeneratedMessageLiteBuilderShrinking -> c
     boolean traverseOneOfAndRepeatedProtoFields -> d
-    1:7:void <init>():1201:1207 -> <init>
-    1:1:boolean enableRemoveProtoEnumSwitchMap():1213:1213 -> a
-    1:1:boolean isEnumLiteProtoShrinkingEnabled():1224:1224 -> b
-    1:1:boolean isProtoShrinkingEnabled():1217:1217 -> c
-com.android.tools.r8.utils.InternalOptions$TestingOptions -> com.android.tools.r8.internal.di$l:
-    boolean allowCheckDiscardedErrors -> m
-    boolean verifyKeptGraphInfo -> d0
-    java.util.function.BiConsumer unboxedEnumsConsumer -> i
-    boolean disableStackMapVerification -> f0
+    1:7:void <init>():1343:1349 -> <init>
+    1:1:boolean enableRemoveProtoEnumSwitchMap():1355:1355 -> a
+    1:1:boolean isEnumLiteProtoShrinkingEnabled():1366:1366 -> b
+    1:1:boolean isProtoShrinkingEnabled():1359:1359 -> c
+com.android.tools.r8.utils.InternalOptions$TestingOptions -> com.android.tools.r8.internal.ph$k:
+    boolean addCallEdgesForLibraryInvokes -> m
+    boolean allowOutlinerInterfaceArrayArguments -> d0
+    java.util.function.BiConsumer staticallyMergedClassesConsumer -> i
+    boolean trackDesugaredAPIConversions -> P
     java.util.function.BiConsumer methodProcessingIdConsumer -> e
-    boolean allowNonAbstractClassesWithAbstractMethods -> b0
-    boolean reportUnusedProguardConfigurationRules -> u
-    boolean allowInvalidCfAccessFlags -> X
+    boolean readInputStackMaps -> b0
+    boolean alwaysUseExistingAccessInfoCollectionsInMemberRebinding -> u
+    boolean enableD8ResourcesPassThrough -> X
     boolean allowInvokeErrors -> q
     com.android.tools.r8.utils.IROrdering irOrdering -> b
-    boolean allowStaticInterfaceMethodsForPreNApiLevel -> T
-    boolean enableExperimentalMissingClassesReporting -> y
-    boolean forceJumboStringProcessing -> G
-    boolean forceRedundantConstNumberRemoval -> C
+    java.io.PrintStream whyAreYouNotInliningConsumer -> O
+    boolean enableInvokeSuperToInvokeVirtualRewriting -> y
+    java.lang.Runnable hookInIrConversion -> g0
+    java.util.function.Predicate cfByteCodePassThrough -> k0
+    int verificationSizeLimitInBytesOverride -> T
+    boolean invertConditionals -> C
     java.util.function.BiConsumer horizontallyMergedLambdaClassesConsumer -> h
-    boolean allowDexInputForTesting -> n
-    java.util.function.Consumer inlineeIrModifier -> M
-    boolean noLocalsTableOnInput -> I
-    int limitNumberOfClassesPerDex -> h0
-    com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions minifier -> i0
+    boolean dontReportFailingCheckDiscarded -> M
+    boolean allowCheckDiscardedErrors -> n
+    int basicBlockMuncherIterationLimit -> L
+    boolean forceNameReflectionOptimization -> I
+    boolean forceIRForCfToCfDesugar -> U
     java.util.function.Function kotlinLambdaMergerFactoryForClass -> d
-    boolean alwaysUseExistingAccessInfoCollectionsInMemberRebinding -> v
-    boolean trackDesugaredAPIConversions -> Q
-    boolean allowUnnecessaryDontWarnWildcards -> r
-    java.io.PrintStream whyAreYouNotInliningConsumer -> P
+    boolean enableCheckCastAndInstanceOfRemoval -> v
+    boolean enumUnboxingRewriteJavaCGeneratedMethod -> Q
+    boolean disableL8AnnotationRemoval -> r
+    java.util.Set validInliningReasons -> G
     byte[] forceDexVersionBytes -> a
-    boolean checkForNotExpandingMainDexTracingResult -> Y
-    boolean enableInvokeSuperToInvokeVirtualRewriting -> z
-    int verificationSizeLimitInBytesOverride -> U
-    java.util.function.Consumer irModifier -> L
-    boolean invertConditionals -> D
-    com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData proguardIfRuleEvaluationData -> l0
-    boolean readInputStackMaps -> e0
+    boolean allowNonAbstractClassesWithAbstractMethods -> Y
+    boolean enableSwitchToIfRewriting -> z
+    boolean noLocalsTableOnInput -> H
+    java.util.function.Consumer callSiteOptimizationInfoInspector -> j0
+    boolean measureProguardIfRuleEvaluations -> h0
+    com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData proguardIfRuleEvaluationData -> i0
+    boolean placeExceptionalBlocksLast -> D
+    boolean deterministicSortingBasedOnDexType -> N
     boolean allowInjectedAnnotationMethods -> o
-    boolean allowOutlinerInterfaceArrayArguments -> g0
-    boolean forceNameReflectionOptimization -> J
-    boolean enableD8ResourcesPassThrough -> a0
+    java.util.function.BiConsumer verticallyMergedClassesConsumer -> k
+    boolean enableNarrowAndWideningingChecksInD8 -> J
+    boolean verifyKeptGraphInfo -> a0
     java.util.function.BiConsumer horizontallyMergedClassesConsumer -> g
-    boolean enableForceNestBasedAccessDesugaringForTest -> c0
-    boolean forceIRForCfToCfDesugar -> V
-    boolean enableCheckCastAndInstanceOfRemoval -> w
-    boolean enumUnboxingRewriteJavaCGeneratedMethod -> R
-    boolean allowUnusedDontWarnRules -> s
-    java.util.Set validInliningReasons -> H
-    boolean allowConflictingSyntheticTypes -> Z
-    java.lang.Runnable hookInIrConversion -> j0
-    java.util.function.Predicate cfByteCodePassThrough -> n0
-    boolean placeExceptionalBlocksLast -> E
+    boolean disableStackMapVerification -> c0
+    boolean disableMappingToOriginalProgramVerification -> V
+    boolean enableDeadSwitchCaseElimination -> w
+    boolean assertConsistentRenamingOfSignature -> R
+    boolean allowClassInlinerGracefulExit -> s
+    boolean enableForceNestBasedAccessDesugaringForTest -> Z
+    boolean dontCreateMarkerInD8 -> E
     java.util.function.BiConsumer enqueuerInspector -> c
-    boolean enableSwitchToIfRewriting -> A
-    int basicBlockMuncherIterationLimit -> N
-    java.util.function.BiConsumer verticallyMergedClassesConsumer -> j
-    boolean dontReportFailingCheckDiscarded -> O
+    java.util.function.Consumer waveModifier -> l
+    boolean enableEnumUnboxingDebugLogs -> A
+    java.util.function.Consumer irModifier -> K
+    java.util.function.BiConsumer unboxedEnumsConsumer -> j
     boolean allowTypeErrors -> p
-    boolean enableNarrowAndWideningingChecksInD8 -> K
-    boolean addCallEdgesForLibraryInvokes -> l
-    boolean disableMappingToOriginalProgramVerification -> W
+    int limitNumberOfClassesPerDex -> e0
+    com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions minifier -> f0
+    boolean allowInvalidCfAccessFlags -> W
     java.util.function.Function repackagingConfigurationFactory -> f
-    boolean enableDeadSwitchCaseElimination -> x
-    boolean assertConsistentRenamingOfSignature -> S
-    boolean disableL8AnnotationRemoval -> t
-    java.util.function.Consumer callSiteOptimizationInfoInspector -> m0
-    boolean dontCreateMarkerInD8 -> F
-    java.util.function.Consumer waveModifier -> k
-    boolean enableEnumUnboxingDebugLogs -> B
-    boolean measureProguardIfRuleEvaluations -> k0
-    1:163:void <init>():1228:1390 -> <init>
+    boolean enableExperimentalMissingClassesReporting -> x
+    boolean allowStaticInterfaceMethodsForPreNApiLevel -> S
+    boolean reportUnusedProguardConfigurationRules -> t
+    boolean forceJumboStringProcessing -> F
+    boolean forceRedundantConstNumberRemoval -> B
+    1:161:void <init>():1370:1530 -> <init>
     void lambda$new$1(java.util.Deque) -> a
-    1:1:void enableExperimentalMissingClassesReporting(com.android.tools.r8.utils.InternalOptions):1231:1231 -> a
-    2:3:com.android.tools.r8.repackaging.Repackaging$RepackagingConfiguration lambda$new$0(com.android.tools.r8.graph.AppView):1254:1255 -> a
-com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions -> com.android.tools.r8.internal.di$l$a:
+    1:1:void enableExperimentalMissingClassesReporting(com.android.tools.r8.utils.InternalOptions):1373:1373 -> a
+    2:3:com.android.tools.r8.repackaging.Repackaging$RepackagingConfiguration lambda$new$0(com.android.tools.r8.graph.AppView):1396:1397 -> a
+com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions -> com.android.tools.r8.internal.ph$k$a:
     java.util.Comparator interfaceMethodOrdering -> a
-    1:3:void <init>():1364:1366 -> <init>
-    1:2:java.util.Comparator getInterfaceMethodOrderingOrDefault(java.util.Comparator):1370:1371 -> 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):1372:1372 -> a
-com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData -> com.android.tools.r8.internal.di$l$b:
+    1:3:void <init>():1504:1506 -> <init>
+    1:2:java.util.Comparator getInterfaceMethodOrderingOrDefault(java.util.Comparator):1510:1511 -> 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):1512:1512 -> a
+com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData -> com.android.tools.r8.internal.ph$k$b:
     int numberOfProguardIfRuleMemberEvaluations -> b
     int numberOfProguardIfRuleClassEvaluations -> a
-    1:4:void <init>():1382:1385 -> <init>
-com.android.tools.r8.utils.InternalOptions$TypeVersionPair -> com.android.tools.r8.internal.di$m:
+    1:4:void <init>():1522:1525 -> <init>
+com.android.tools.r8.utils.InternalOptions$TypeVersionPair -> com.android.tools.r8.internal.ph$l:
     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):705:707 -> <init>
-com.android.tools.r8.utils.InternalOutputMode -> com.android.tools.r8.internal.ei:
+    1:3:void <init>(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.DexType):762:764 -> <init>
+com.android.tools.r8.utils.InternalOutputMode -> com.android.tools.r8.internal.qh:
     com.android.tools.r8.utils.InternalOutputMode DexIndexed -> a
     com.android.tools.r8.utils.InternalOutputMode DexFilePerClassFile -> b
     com.android.tools.r8.utils.InternalOutputMode ClassFile -> c
@@ -81335,24 +81712,25 @@
     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.Gi:
+com.android.tools.r8.utils.IterableUtils -> com.android.tools.r8.internal.Rh:
     1:1:java.lang.Iterable filter(java.lang.Iterable,java.util.function.Predicate):63:63 -> a
-    2:2:int size(java.lang.Iterable):72:72 -> a
-    3:3:java.util.Iterator lambda$singleton$1(java.lang.Object):93:93 -> a
-    4:4:java.lang.Iterable flatMap(java.lang.Iterable,java.util.function.Function):119:119 -> a
+    2:2:int size(java.lang.Iterable):68:68 -> a
+    3:3:java.util.Iterator lambda$singleton$1(java.lang.Object):85:85 -> a
+    4:4:java.lang.Iterable flatMap(java.lang.Iterable,java.util.function.Function):111:111 -> a
+    5:5:java.lang.Iterable lambda$flatMap$3(java.util.function.Function,java.lang.Object):111:111 -> a
     1:2:int firstIndexMatching(java.lang.Iterable,java.util.function.Predicate):53:54 -> b
-    3:3:java.lang.Iterable singleton(java.lang.Object):93:93 -> b
-    4:4:int sumInt(java.lang.Iterable):109:109 -> b
-    5:6:java.lang.Object com.android.tools.r8.utils.IterableUtils.flatten(java.lang.Object,java.util.function.BiFunction,java.lang.Iterable):102:103 -> b
-    5:6:int sumInt(java.lang.Iterable):109 -> b
-    7:7:int sumInt(java.lang.Iterable):109:109 -> b
-    8:9:int sumInt(java.lang.Iterable,java.util.function.Function):113:114 -> b
+    3:3:java.lang.Iterable singleton(java.lang.Object):85:85 -> b
+    4:4:int sumInt(java.lang.Iterable):101:101 -> b
+    5:6:java.lang.Object com.android.tools.r8.utils.IterableUtils.flatten(java.lang.Object,java.util.function.BiFunction,java.lang.Iterable):94:95 -> b
+    5:6:int sumInt(java.lang.Iterable):101 -> b
+    7:7:int sumInt(java.lang.Iterable):101:101 -> b
+    8:8:java.lang.Integer lambda$sumInt$2(java.util.function.Function,java.lang.Object):105:105 -> b
+    9:10:int sumInt(java.lang.Iterable,java.util.function.Function):105:106 -> b
     1:1:java.util.Iterator lambda$filter$0(java.lang.Iterable,java.util.function.Predicate):63:63 -> c
     2:2:java.util.Iterator com.android.tools.r8.utils.IteratorUtils.filter(java.util.Iterator,java.util.function.Predicate):21:21 -> c
     2:2:java.util.Iterator lambda$filter$0(java.lang.Iterable,java.util.function.Predicate):63 -> c
-    3:4:java.util.List toNewArrayList(java.lang.Iterable):79:80 -> c
-    5:5:java.lang.Iterable transform(java.lang.Iterable,java.util.function.Function):85:85 -> c
-com.android.tools.r8.utils.IteratorUtils -> com.android.tools.r8.internal.Mi:
+    3:4:java.util.List toNewArrayList(java.lang.Iterable):75:76 -> c
+com.android.tools.r8.utils.IteratorUtils -> com.android.tools.r8.internal.Wh:
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
     1:1:void <clinit>():17:17 -> <clinit>
@@ -81361,16 +81739,16 @@
     6:18:boolean anyRemainingMatch(java.util.ListIterator,java.util.function.Predicate):135:147 -> a
     1:3:java.lang.Object peekPrevious(java.util.ListIterator):64:66 -> b
     4:7:void removeIf(java.util.Iterator,java.util.function.Predicate):112:115 -> b
-com.android.tools.r8.utils.IteratorUtils$1 -> com.android.tools.r8.internal.Li:
+com.android.tools.r8.utils.IteratorUtils$1 -> com.android.tools.r8.internal.Vh:
     java.util.Iterator val$iterator -> b
     java.util.function.Predicate val$predicate -> c
     java.lang.Object next -> a
     1:3:void <init>(java.util.Iterator,java.util.function.Predicate):21:23 -> <init>
-    1:3:java.lang.Object advance():27:29 -> f
+    1:3:java.lang.Object advance():27:29 -> e
     1:1:boolean hasNext():38:38 -> hasNext
     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.tn:
+com.android.tools.r8.utils.LRUCacheTable -> com.android.tools.r8.internal.ym:
     int columnCapacity -> b
     int rowCapacity -> a
     1:3:void <init>(int,int,float):31:33 -> <init>
@@ -81378,15 +81756,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.sn:
+com.android.tools.r8.utils.LRUCacheTable$LRUCacheRow -> com.android.tools.r8.internal.xm:
     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.do:
+com.android.tools.r8.utils.LazyBox -> com.android.tools.r8.internal.in:
     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.lo:
+com.android.tools.r8.utils.LebUtils -> com.android.tools.r8.internal.qn:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():10:10 -> <clinit>
     1:6:int parseSleb128(com.android.tools.r8.dex.BinaryReader):65:70 -> a
@@ -81397,7 +81775,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.no:
+com.android.tools.r8.utils.LibraryClassCollection -> com.android.tools.r8.internal.sn:
     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
@@ -81407,7 +81785,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.Ko:
+com.android.tools.r8.utils.LineNumberOptimizer -> com.android.tools.r8.internal.On:
     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
@@ -81419,7 +81797,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:66:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):456:470 -> a
     52: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():558:558 -> a
+    67:67:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():569:569 -> 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):152 -> 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
@@ -81429,7 +81807,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():1482:1482 -> a
+    105:105:boolean com.android.tools.r8.utils.InternalOptions.canUseDexPcAsDebugInformation():1612:1612 -> 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
@@ -81463,7 +81841,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):1460:1460 -> a
+    409:409:int com.android.tools.r8.graph.DexEncodedMethod.slowCompare(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1482:1482 -> 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
@@ -81476,7 +81854,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.Co:
+com.android.tools.r8.utils.LineNumberOptimizer$1 -> com.android.tools.r8.internal.Gn:
     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
@@ -81494,7 +81872,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.Do:
+com.android.tools.r8.utils.LineNumberOptimizer$2 -> com.android.tools.r8.internal.Hn:
     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
@@ -81504,11 +81882,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.Eo:
+com.android.tools.r8.utils.LineNumberOptimizer$IdentityPositionRemapper -> com.android.tools.r8.internal.In:
     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.Fo:
+com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper -> com.android.tools.r8.internal.Jn:
     com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parsedData -> h
     com.android.tools.r8.graph.DexItemFactory factory -> c
     java.util.Map parsedKotlinSourceDebugExtensions -> d
@@ -81523,18 +81901,23 @@
     3:18:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.CfLineToMethodMapper):116:131 -> <init>
     1:1:com.android.tools.r8.graph.DexEncodedMethod access$202(com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper,com.android.tools.r8.graph.DexEncodedMethod):112:112 -> a
     2:4:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):136:138 -> a
-    5:17:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper.getAndParseSourceDebugExtension(com.android.tools.r8.graph.DexType):184:196 -> a
-    5:17:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):138 -> a
-    18:18:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper.getAndParseSourceDebugExtension(com.android.tools.r8.graph.DexType):188:188 -> a
-    18:18:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):138 -> a
-    19:35:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):140:156 -> a
-    36:38:java.lang.String com.android.tools.r8.utils.CfLineToMethodMapper.getName(java.lang.String):74:76 -> a
-    36:38:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):157 -> a
-    39:41:java.lang.String com.android.tools.r8.utils.CfLineToMethodMapper.getDescriptor(java.lang.String):80:82 -> a
-    39:41:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):158 -> a
-    42:52:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):159:169 -> a
-    53:67: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.Go:
+    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):273:273 -> 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
+    13:18:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):138 -> a
+    19:19:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper.getAndParseSourceDebugExtension(com.android.tools.r8.graph.DexType):188:188 -> a
+    19:19:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):138 -> a
+    20:36:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):140:156 -> a
+    37:39:java.lang.String com.android.tools.r8.utils.CfLineToMethodMapper.getName(java.lang.String):74:76 -> a
+    37:39:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):157 -> a
+    40:42:java.lang.String com.android.tools.r8.utils.CfLineToMethodMapper.getDescriptor(java.lang.String):80:82 -> a
+    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.Kn:
     int obfuscatedLine -> d
     int originalLine -> b
     com.android.tools.r8.ir.code.Position caller -> c
@@ -81545,7 +81928,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.Ho:
+com.android.tools.r8.utils.LineNumberOptimizer$OptimizingPositionRemapper -> com.android.tools.r8.internal.Ln:
     int previousSourceLine -> d
     int nextOptimizedLineNumber -> e
     boolean $assertionsDisabled -> a
@@ -81555,7 +81938,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.Io:
+com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter -> com.android.tools.r8.internal.Mn:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.DexMethod method -> d
     int previousPc -> e
@@ -81573,16 +81956,15 @@
     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.Jo:
+com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper -> com.android.tools.r8.internal.Nn:
     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.So:
-    1:15:java.util.List flatMap(java.util.List,java.util.function.Function,java.util.List):27:41 -> a
-    16:16:java.lang.Object first(java.util.List):48:48 -> a
-    17:18:int lastIndexMatching(java.util.List,java.util.function.Predicate):65:66 -> a
-    19:21:java.util.List map(java.util.Collection,java.util.function.Function):82:84 -> a
-    1:1:java.lang.Object last(java.util.List):61:61 -> b
-    2:17:java.util.List mapOrElse(java.util.List,java.util.function.Function,java.util.List):95:110 -> b
-com.android.tools.r8.utils.LongInterval -> com.android.tools.r8.internal.wp:
+com.android.tools.r8.utils.ListUtils -> com.android.tools.r8.internal.Wn:
+    1:1:java.lang.Object first(java.util.List):18:18 -> a
+    2:3:int lastIndexMatching(java.util.List,java.util.function.Predicate):35:36 -> a
+    4:6:java.util.List map(java.util.Collection,java.util.function.Function):44:46 -> a
+    7:22:java.util.List mapOrElse(java.util.List,java.util.function.Function,java.util.List):57:72 -> a
+    1:1:java.lang.Object last(java.util.List):31:31 -> b
+com.android.tools.r8.utils.LongInterval -> com.android.tools.r8.internal.zo:
     long min -> b
     long max -> c
     boolean $assertionsDisabled -> a
@@ -81598,7 +81980,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.Np:
+com.android.tools.r8.utils.MainDexListParser -> com.android.tools.r8.internal.Po:
     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
@@ -81613,15 +81995,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.MapUtils -> com.android.tools.r8.internal.Qp:
-    1:2:java.util.Map map(java.util.Map,java.util.function.IntFunction,java.util.function.Function,java.util.function.Function,java.util.function.BiFunction):29:30 -> a
-    3:7:void lambda$map$0(java.util.function.Function,java.util.function.Function,java.util.Map,java.util.function.BiFunction,java.lang.Object,java.lang.Object):32:36 -> a
-    8:8:boolean lambda$removeIdentityMappings$1(java.util.Map$Entry):43:43 -> a
-    9:9:void removeIdentityMappings(java.util.Map):43:43 -> a
-    1:1:java.lang.String lambda$toString$2(java.util.Map$Entry):48:48 -> b
-    2:2:java.lang.String toString(java.util.Map):48:48 -> b
-    3:3:java.lang.String toString(java.util.Map):47:47 -> b
-com.android.tools.r8.utils.MethodJavaSignatureEquivalence -> com.android.tools.r8.internal.Vq:
+com.android.tools.r8.utils.MethodJavaSignatureEquivalence -> com.android.tools.r8.internal.Up:
     com.android.tools.r8.utils.MethodJavaSignatureEquivalence INSTANCE -> a
     com.android.tools.r8.utils.MethodJavaSignatureEquivalence INSTANCE_IGNORE_NAME -> b
     boolean ignoreName -> c
@@ -81635,26 +82009,21 @@
     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.MethodReferenceUtils -> com.android.tools.r8.internal.er:
-    1:16:java.lang.String com.android.tools.r8.utils.MethodReferenceUtils.toSourceString(com.android.tools.r8.references.MethodReference,boolean,boolean):19:34 -> a
-    1:16:java.lang.String toSourceStringWithoutHolderAndReturnType(com.android.tools.r8.references.MethodReference):14 -> a
-com.android.tools.r8.utils.MethodSignatureEquivalence -> com.android.tools.r8.internal.fr:
+com.android.tools.r8.utils.MethodSignatureEquivalence -> com.android.tools.r8.internal.dq:
+    com.android.tools.r8.utils.MethodSignatureEquivalence INSTANCE_IGNORE_NAME -> b
     com.android.tools.r8.utils.MethodSignatureEquivalence INSTANCE -> a
-    1:1:void <clinit>():16:16 -> <clinit>
-    1:1:void <init>(boolean):23:23 -> <init>
+    boolean ignoreName -> c
+    1:3:void <clinit>():16:18 -> <clinit>
+    1:2:void <init>(boolean):23:24 -> <init>
     1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):14:14 -> a
-    2:2:boolean com.android.tools.r8.utils.MethodSignatureEquivalence.doEquivalent(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):40:40 -> a
-    2:2:boolean doEquivalent(java.lang.Object,java.lang.Object):14 -> a
-    3:3:int doHash(java.lang.Object):14:14 -> a
-    4:4:int com.android.tools.r8.utils.MethodSignatureEquivalence.doHash(com.android.tools.r8.graph.DexMethod):48:48 -> a
-    4:4:int doHash(java.lang.Object):14 -> a
-    5:5:com.android.tools.r8.utils.MethodSignatureEquivalence get():28:28 -> a
-com.android.tools.r8.utils.NumberUtils -> com.android.tools.r8.internal.Xs:
-    boolean is16Bit(long) -> a
-    boolean is32Bit(long) -> b
-com.android.tools.r8.utils.ObjectUtils -> com.android.tools.r8.internal.ku:
-    1:1:boolean getBooleanOrElse(java.lang.Object,java.util.function.Predicate,boolean):14:14 -> a
-com.android.tools.r8.utils.OffOrAuto -> com.android.tools.r8.internal.pu:
+    2:5:boolean com.android.tools.r8.utils.MethodSignatureEquivalence.doEquivalent(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):37:40 -> a
+    2:5:boolean doEquivalent(java.lang.Object,java.lang.Object):14 -> a
+    6:6:int doHash(java.lang.Object):14:14 -> a
+    7:10:int com.android.tools.r8.utils.MethodSignatureEquivalence.doHash(com.android.tools.r8.graph.DexMethod):45:48 -> a
+    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.jt:
     com.android.tools.r8.utils.OffOrAuto Auto -> b
     com.android.tools.r8.utils.OffOrAuto Off -> a
     com.android.tools.r8.utils.OffOrAuto[] $VALUES -> c
@@ -81676,7 +82045,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.wu:
+com.android.tools.r8.utils.OptionalBool -> com.android.tools.r8.internal.qt:
     com.android.tools.r8.utils.OptionalBool UNKNOWN -> e
     com.android.tools.r8.utils.OptionalBool TRUE -> c
     com.android.tools.r8.utils.OptionalBool FALSE -> d
@@ -81686,19 +82055,18 @@
     1:1:com.android.tools.r8.utils.OptionalBool of(boolean):69:69 -> a
     int ordinal() -> h
     1:1:int hashCode():88:88 -> hashCode
-com.android.tools.r8.utils.OptionalBool$1 -> com.android.tools.r8.internal.wu$a:
+com.android.tools.r8.utils.OptionalBool$1 -> com.android.tools.r8.internal.qt$a:
     1:1:void <init>():10:10 -> <init>
     boolean isTrue() -> f
     int ordinal() -> h
-com.android.tools.r8.utils.OptionalBool$2 -> com.android.tools.r8.internal.wu$b:
+com.android.tools.r8.utils.OptionalBool$2 -> com.android.tools.r8.internal.qt$b:
     1:1:void <init>():29:29 -> <init>
     boolean isFalse() -> c
     int ordinal() -> h
-com.android.tools.r8.utils.OptionalBool$3 -> com.android.tools.r8.internal.wu$c:
+com.android.tools.r8.utils.OptionalBool$3 -> com.android.tools.r8.internal.qt$c:
     1:1:void <init>():48:48 -> <init>
-    boolean isUnknown() -> g
     int ordinal() -> h
-com.android.tools.r8.utils.OptionsParsing -> com.android.tools.r8.internal.yu:
+com.android.tools.r8.utils.OptionsParsing -> com.android.tools.r8.internal.rt:
     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
@@ -81706,14 +82074,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.yu$a:
+com.android.tools.r8.utils.OptionsParsing$ParseContext -> com.android.tools.r8.internal.rt$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.Cu:
+com.android.tools.r8.utils.OriginWithPosition -> com.android.tools.r8.internal.vt:
     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>
@@ -81721,14 +82089,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.Pu:
+com.android.tools.r8.utils.OutputBuilder -> com.android.tools.r8.internal.It:
     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.Vu:
+com.android.tools.r8.utils.Pair -> com.android.tools.r8.internal.Ot:
     java.lang.Object second -> b
     java.lang.Object first -> a
     1:3:void <init>(java.lang.Object,java.lang.Object):23:25 -> <init>
@@ -81738,8 +82106,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
-    1:1:java.lang.String toString():56:56 -> toString
-com.android.tools.r8.utils.PredicateSet -> com.android.tools.r8.internal.uv:
+com.android.tools.r8.utils.PredicateSet -> com.android.tools.r8.internal.nu:
     java.util.List predicates -> b
     java.util.Set elements -> a
     1:4:void <init>():14:17 -> <init>
@@ -81747,13 +82114,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.PredicateUtils -> com.android.tools.r8.internal.vv:
-    1:2:java.lang.Object findFirst(java.lang.Object[],java.util.function.Predicate):13:14 -> a
-    3:3:boolean lambda$not$0(java.util.function.Predicate,java.lang.Object):22:22 -> a
-    4:4:java.util.function.Predicate not(java.util.function.Predicate):22:22 -> a
-    5:5:java.util.function.Predicate isNull(java.util.function.Function):26:26 -> a
-    6:6:boolean lambda$isNull$1(java.util.function.Function,java.lang.Object):26:26 -> a
-com.android.tools.r8.utils.PreloadedClassFileProvider -> com.android.tools.r8.internal.Fv:
+com.android.tools.r8.utils.PreloadedClassFileProvider -> com.android.tools.r8.internal.yu:
     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>
@@ -81772,8 +82133,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.Fv$a:
-com.android.tools.r8.utils.PreloadedClassFileProvider$Builder -> com.android.tools.r8.internal.Fv$b:
+com.android.tools.r8.utils.PreloadedClassFileProvider$1 -> com.android.tools.r8.internal.yu$a:
+com.android.tools.r8.utils.PreloadedClassFileProvider$Builder -> com.android.tools.r8.internal.yu$b:
     java.util.Map content -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():74:74 -> <clinit>
@@ -81782,11 +82143,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.Fv$c:
+com.android.tools.r8.utils.PreloadedClassFileProvider$ClassDescriptorOrigin -> com.android.tools.r8.internal.yu$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.Yv:
+com.android.tools.r8.utils.ProgramClassCollection -> com.android.tools.r8.internal.Ru:
     com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver conflictResolver -> e
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():18:18 -> <clinit>
@@ -81811,13 +82172,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():650:650 -> b
+    4:4:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():632:632 -> 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.ew:
+com.android.tools.r8.utils.ProgramMethodEquivalence -> com.android.tools.r8.internal.Xu:
     com.android.tools.r8.utils.ProgramMethodEquivalence INSTANCE -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():14:14 -> <init>
@@ -81828,7 +82189,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.gA:
+com.android.tools.r8.utils.Reporter -> com.android.tools.r8.internal.Sy:
     java.util.List diagnosticsLevelMapping -> b
     com.android.tools.r8.DiagnosticsHandler clientHandler -> a
     com.android.tools.r8.utils.AbortException abort -> c
@@ -81852,18 +82213,18 @@
     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.gA$a:
+com.android.tools.r8.utils.Reporter$1 -> com.android.tools.r8.internal.Sy$a:
     1:1:void <init>():49:49 -> <init>
-com.android.tools.r8.utils.Reporter$2 -> com.android.tools.r8.internal.gA$b:
+com.android.tools.r8.utils.Reporter$2 -> com.android.tools.r8.internal.Sy$b:
     int[] $SwitchMap$com$android$tools$r8$DiagnosticsLevel -> a
     1:1:void <clinit>():66:66 -> <clinit>
-com.android.tools.r8.utils.Reporter$DiagnosticsLevelMapping -> com.android.tools.r8.internal.gA$c:
+com.android.tools.r8.utils.Reporter$DiagnosticsLevelMapping -> com.android.tools.r8.internal.Sy$c:
     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.uB:
+com.android.tools.r8.utils.SegmentTree -> com.android.tools.r8.internal.gA:
     java.util.TreeMap internalTree -> b
     int size -> d
     boolean $assertionsDisabled -> a
@@ -81876,7 +82237,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.vB:
+com.android.tools.r8.utils.SemanticVersion -> com.android.tools.r8.internal.hA:
     int minor -> b
     int patch -> c
     int major -> a
@@ -81892,13 +82253,17 @@
     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.SetUtils -> com.android.tools.r8.internal.zB:
+com.android.tools.r8.utils.SetUtils -> com.android.tools.r8.internal.lA:
     1:2:java.util.Set newIdentityHashSet(java.lang.Object):16:17 -> a
     3:4:java.util.Set newIdentityHashSet(java.lang.Iterable):28:29 -> a
     5:7:java.util.Set newIdentityHashSet(java.lang.Iterable,java.lang.Iterable):34:36 -> a
     8:8:java.util.Set newIdentityHashSet(int):41:41 -> a
     9:11:java.util.Set mapIdentityHashSet(java.util.Set,java.util.function.Function):51:53 -> a
-com.android.tools.r8.utils.StreamUtils -> com.android.tools.r8.internal.iD:
+com.android.tools.r8.utils.SingletonEquivalence -> com.android.tools.r8.internal.WA:
+    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.YB:
     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
@@ -81912,7 +82277,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.LD:
+com.android.tools.r8.utils.StringUtils -> com.android.tools.r8.internal.zC:
     char[] EMPTY_CHAR_ARRAY -> a
     java.lang.String LINE_SEPARATOR -> c
     java.lang.String[] EMPTY_ARRAY -> b
@@ -81921,41 +82286,41 @@
     1:6:boolean appendNonEmpty(java.lang.StringBuilder,java.lang.String,java.lang.Object,java.lang.String):69:74 -> a
     7:10:java.lang.StringBuilder appendLeftPadded(java.lang.StringBuilder,java.lang.String,int):92:95 -> a
     11:11:java.lang.StringBuilder append(java.lang.StringBuilder,java.util.Collection):108:108 -> a
-    12:12:java.lang.StringBuilder append(java.lang.StringBuilder,java.lang.Iterable,java.lang.String,com.android.tools.r8.utils.StringUtils$BraceType):113:113 -> a
+    12:12:java.lang.StringBuilder append(java.lang.StringBuilder,java.util.Collection,java.lang.String,com.android.tools.r8.utils.StringUtils$BraceType):113:113 -> a
     13:18:java.lang.String com.android.tools.r8.utils.StringUtils$BraceType.left():32:37 -> a
-    13:18:java.lang.StringBuilder append(java.lang.StringBuilder,java.lang.Iterable,java.lang.String,com.android.tools.r8.utils.StringUtils$BraceType):113 -> a
-    19:27:java.lang.StringBuilder append(java.lang.StringBuilder,java.lang.Iterable,java.lang.String,com.android.tools.r8.utils.StringUtils$BraceType):113:121 -> a
+    13:18:java.lang.StringBuilder append(java.lang.StringBuilder,java.util.Collection,java.lang.String,com.android.tools.r8.utils.StringUtils$BraceType):113 -> a
+    19:27:java.lang.StringBuilder append(java.lang.StringBuilder,java.util.Collection,java.lang.String,com.android.tools.r8.utils.StringUtils$BraceType):113:121 -> a
     28:33:java.lang.String com.android.tools.r8.utils.StringUtils$BraceType.right():42:47 -> a
-    28:33:java.lang.StringBuilder append(java.lang.StringBuilder,java.lang.Iterable,java.lang.String,com.android.tools.r8.utils.StringUtils$BraceType):123 -> a
-    34:34:java.lang.StringBuilder append(java.lang.StringBuilder,java.lang.Iterable,java.lang.String,com.android.tools.r8.utils.StringUtils$BraceType):123:123 -> a
+    28:33:java.lang.StringBuilder append(java.lang.StringBuilder,java.util.Collection,java.lang.String,com.android.tools.r8.utils.StringUtils$BraceType):123 -> a
+    34:34:java.lang.StringBuilder append(java.lang.StringBuilder,java.util.Collection,java.lang.String,com.android.tools.r8.utils.StringUtils$BraceType):123:123 -> a
     35:35:java.lang.String join(java.util.Collection,java.lang.String):128:128 -> a
-    36:36:java.lang.String join(java.lang.String,java.lang.String[]):136:136 -> a
-    37:37:java.lang.String join(java.util.Collection,java.lang.String,com.android.tools.r8.utils.StringUtils$BraceType):140:140 -> a
-    38:40:java.lang.String join(java.lang.String,java.lang.Iterable,java.util.function.Function,com.android.tools.r8.utils.StringUtils$BraceType):145:147 -> a
-    41:45:java.lang.String lines(java.util.List):151:155 -> a
-    46:46:java.lang.String joinLines(java.lang.String[]):173:173 -> a
-    47:47:java.lang.String joinLines(java.util.Collection):177:177 -> a
-    48:48:java.lang.String hexString(int,int):223:223 -> a
-    49:57:java.lang.String hexString(int,int,boolean):227:235 -> a
-    58:66:java.lang.String com.android.tools.r8.utils.StringUtils.hexString(long,int,boolean):244:252 -> a
-    58:66:java.lang.String hexString(long,int):240 -> a
-    67:71:java.lang.String times(java.lang.String,int):271:275 -> a
-    72:72:boolean isWhitespace(int):283:283 -> a
-    73:73:java.lang.String replaceAll(java.lang.String,java.lang.String,java.lang.String):340:340 -> a
-    74:77:java.lang.String capitalize(java.lang.String):350:353 -> a
+    36:36:java.lang.String join(java.lang.String,java.lang.String[]):132:132 -> a
+    37:37:java.lang.String join(java.util.Collection,java.lang.String,com.android.tools.r8.utils.StringUtils$BraceType):136:136 -> a
+    38:40:java.lang.String join(java.util.Collection,java.lang.String,com.android.tools.r8.utils.StringUtils$BraceType,java.util.function.Function):141:143 -> a
+    41:45:java.lang.String lines(java.util.List):147:151 -> a
+    46:46:java.lang.String joinLines(java.lang.String[]):169:169 -> a
+    47:47:java.lang.String joinLines(java.util.Collection):173:173 -> a
+    48:48:java.lang.String hexString(int,int):219:219 -> a
+    49:57:java.lang.String hexString(int,int,boolean):223:231 -> a
+    58:66:java.lang.String com.android.tools.r8.utils.StringUtils.hexString(long,int,boolean):240:248 -> a
+    58:66:java.lang.String hexString(long,int):236 -> a
+    67:71:java.lang.String times(java.lang.String,int):267:271 -> a
+    72:72:boolean isWhitespace(int):279:279 -> a
+    73:73:java.lang.String replaceAll(java.lang.String,java.lang.String,java.lang.String):336:336 -> a
+    74:77:java.lang.String capitalize(java.lang.String):346:349 -> a
     1:3:java.lang.StringBuilder appendRightPadded(java.lang.StringBuilder,java.lang.String,int):100:102 -> b
-    4:4:java.lang.String lines(java.lang.String[]):159:159 -> b
-    5:22:java.util.List splitLines(java.lang.String):181:198 -> b
-    23:23:java.lang.String zeroPrefix(int,int):205:205 -> b
-    24:30:java.lang.String zeroPrefixString(java.lang.String,int):210:216 -> b
-    1:2:java.lang.String stripLeadingBOM(java.lang.String):287:288 -> c
+    4:4:java.lang.String lines(java.lang.String[]):155:155 -> b
+    5:22:java.util.List splitLines(java.lang.String):177:194 -> b
+    23:23:java.lang.String zeroPrefix(int,int):201:201 -> b
+    24:30:java.lang.String zeroPrefixString(java.lang.String,int):206:212 -> b
+    1:2:java.lang.String stripLeadingBOM(java.lang.String):283:284 -> c
     1:9:java.lang.String toASCIIString(java.lang.String):53:61 -> d
-    1:9:java.lang.String trim(java.lang.String):296:304 -> e
-    1:5:java.lang.String withNativeLineSeparator(java.lang.String):163:167 -> f
-com.android.tools.r8.utils.StringUtils$1 -> com.android.tools.r8.internal.LD$a:
+    1:9:java.lang.String trim(java.lang.String):292:300 -> e
+    1:5:java.lang.String withNativeLineSeparator(java.lang.String):159:163 -> f
+com.android.tools.r8.utils.StringUtils$1 -> com.android.tools.r8.internal.zC$a:
     int[] $SwitchMap$com$android$tools$r8$utils$StringUtils$BraceType -> a
     1:1:void <clinit>():32:32 -> <clinit>
-com.android.tools.r8.utils.StringUtils$BraceType -> com.android.tools.r8.internal.LD$b:
+com.android.tools.r8.utils.StringUtils$BraceType -> com.android.tools.r8.internal.zC$b:
     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
@@ -81965,7 +82330,7 @@
     5:5:void <clinit>():25:25 -> <clinit>
     1:1:void <init>(java.lang.String,int):25:25 -> <init>
     1:1:com.android.tools.r8.utils.StringUtils$BraceType[] values():25:25 -> a
-com.android.tools.r8.utils.SymbolGenerationUtils -> com.android.tools.r8.internal.nE:
+com.android.tools.r8.utils.SymbolGenerationUtils -> com.android.tools.r8.internal.aD:
     char[] IDENTIFIER_CHARACTERS -> b
     boolean $assertionsDisabled -> e
     java.util.Set PRIMITIVE_TYPE_NAMES -> a
@@ -81974,71 +82339,71 @@
     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.nE$a:
+com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing -> com.android.tools.r8.internal.aD$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>
     1:1:void <init>(java.lang.String,int):15:15 -> <init>
 com.android.tools.r8.utils.ThreadUtils -> com.android.tools.r8.utils.p:
-    1:1:java.lang.Object lambda$processItemsWithResults$0(com.android.tools.r8.utils.ThrowingFunction,java.lang.Object,int):30:30 -> a
-    2:2:java.util.Collection processItemsWithResults(java.lang.Iterable,com.android.tools.r8.utils.ThrowingFunction,java.util.concurrent.ExecutorService):30:30 -> a
-    3:3:java.util.Collection processItemsWithResults(java.lang.Iterable,com.android.tools.r8.utils.ThrowingReferenceIntFunction,java.util.concurrent.ExecutorService):38:38 -> a
-    4:6:java.util.Collection processItemsWithResults(com.android.tools.r8.utils.ForEachable,com.android.tools.r8.utils.ThrowingReferenceIntFunction,java.util.concurrent.ExecutorService):52:54 -> a
-    7:21:java.util.Collection awaitFuturesWithResults(java.util.Collection):140:154 -> a
-    7:21:java.util.Collection processItemsWithResults(com.android.tools.r8.utils.ForEachable,com.android.tools.r8.utils.ThrowingReferenceIntFunction,java.util.concurrent.ExecutorService):59 -> a
-    22:32:java.util.Collection awaitFuturesWithResults(java.util.Collection):147:157 -> a
-    22:32:java.util.Collection processItemsWithResults(com.android.tools.r8.utils.ForEachable,com.android.tools.r8.utils.ThrowingReferenceIntFunction,java.util.concurrent.ExecutorService):59 -> a
-    33:34:void lambda$processItemsWithResults$3(com.android.tools.r8.utils.IntBox,java.util.List,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.ThrowingReferenceIntFunction,java.lang.Object):56:57 -> a
-    35:35:java.lang.Object lambda$processItemsWithResults$2(com.android.tools.r8.utils.ThrowingReferenceIntFunction,java.lang.Object,int):57:57 -> a
-    36:36:void lambda$processItems$4(com.android.tools.r8.utils.ThrowingConsumer,java.lang.Object,int):65:65 -> a
-    37:37:void processItems(java.lang.Iterable,com.android.tools.r8.utils.ThrowingConsumer,java.util.concurrent.ExecutorService):65:65 -> a
-    38:38:void processItems(java.lang.Iterable,com.android.tools.r8.utils.ThrowingReferenceIntConsumer,java.util.concurrent.ExecutorService):73:73 -> a
-    39:39:void processItems(com.android.tools.r8.utils.ForEachable,com.android.tools.r8.utils.ThrowingConsumer,java.util.concurrent.ExecutorService):79:79 -> a
-    40:40:void processItems(com.android.tools.r8.utils.ForEachable,com.android.tools.r8.utils.ThrowingReferenceIntConsumer,java.util.concurrent.ExecutorService):87:87 -> a
-    41:41:java.lang.Object lambda$processItems$6(com.android.tools.r8.utils.ThrowingReferenceIntConsumer,java.lang.Object,int):90:90 -> a
-    42:42:void processMap(java.util.Map,com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):99:99 -> a
-    43:43:java.lang.Object lambda$processMap$7(com.android.tools.r8.utils.ThrowingBiConsumer,java.lang.Object,java.lang.Object):102:102 -> a
-    44:44:java.lang.Object lambda$processMapWithResults$8(com.android.tools.r8.utils.ThrowingBiFunction,java.util.Map$Entry):112:112 -> a
-    45:45:java.util.Collection processMapWithResults(java.util.Map,com.android.tools.r8.utils.ThrowingBiFunction,java.util.concurrent.ExecutorService):112:112 -> a
-    46:46:java.util.Collection processMapWithResults(java.util.Map,com.android.tools.r8.utils.ThrowingBiFunction,java.util.concurrent.ExecutorService):111:111 -> a
-    47:60:void awaitFutures(java.lang.Iterable):117:130 -> a
-    61:71:void awaitFutures(java.lang.Iterable):123:133 -> a
-    72:72:java.util.concurrent.ExecutorService getExecutorService(int):177:177 -> a
-    73:73:java.util.concurrent.ExecutorService getExecutorServiceForThreads(int):172:172 -> a
-    73:73:java.util.concurrent.ExecutorService getExecutorService(int):178 -> a
-    74:74:java.util.concurrent.ExecutorService getExecutorService(com.android.tools.r8.utils.InternalOptions):182:182 -> a
-    1:1:void lambda$processItems$5(com.android.tools.r8.utils.ThrowingConsumer,java.lang.Object,int):79:79 -> b
-    2:2:java.util.concurrent.ExecutorService getExecutorServiceForProcessors(int):165:165 -> b
-    3:3:java.util.concurrent.ExecutorService getExecutorServiceForThreads(int):172:172 -> b
-    3:3:java.util.concurrent.ExecutorService getExecutorServiceForProcessors(int):166 -> b
-com.android.tools.r8.utils.ThrowingAction -> com.android.tools.r8.internal.FE:
+    1:1:java.lang.Object lambda$processItemsWithResults$0(com.android.tools.r8.utils.ThrowingFunction,java.lang.Object,int):24:24 -> a
+    2:2:java.util.Collection processItemsWithResults(java.lang.Iterable,com.android.tools.r8.utils.ThrowingFunction,java.util.concurrent.ExecutorService):24:24 -> a
+    3:3:java.util.Collection processItemsWithResults(java.lang.Iterable,com.android.tools.r8.utils.ThrowingReferenceIntFunction,java.util.concurrent.ExecutorService):32:32 -> a
+    4:6:java.util.Collection processItemsWithResults(com.android.tools.r8.utils.ForEachable,com.android.tools.r8.utils.ThrowingReferenceIntFunction,java.util.concurrent.ExecutorService):46:48 -> a
+    7:21:java.util.Collection awaitFuturesWithResults(java.util.Collection):134:148 -> a
+    7:21:java.util.Collection processItemsWithResults(com.android.tools.r8.utils.ForEachable,com.android.tools.r8.utils.ThrowingReferenceIntFunction,java.util.concurrent.ExecutorService):53 -> a
+    22:32:java.util.Collection awaitFuturesWithResults(java.util.Collection):141:151 -> a
+    22:32:java.util.Collection processItemsWithResults(com.android.tools.r8.utils.ForEachable,com.android.tools.r8.utils.ThrowingReferenceIntFunction,java.util.concurrent.ExecutorService):53 -> a
+    33:34:void lambda$processItemsWithResults$3(com.android.tools.r8.utils.IntBox,java.util.List,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.ThrowingReferenceIntFunction,java.lang.Object):50:51 -> a
+    35:35:java.lang.Object lambda$processItemsWithResults$2(com.android.tools.r8.utils.ThrowingReferenceIntFunction,java.lang.Object,int):51:51 -> a
+    36:36:void lambda$processItems$4(com.android.tools.r8.utils.ThrowingConsumer,java.lang.Object,int):59:59 -> a
+    37:37:void processItems(java.lang.Iterable,com.android.tools.r8.utils.ThrowingConsumer,java.util.concurrent.ExecutorService):59:59 -> a
+    38:38:void processItems(java.lang.Iterable,com.android.tools.r8.utils.ThrowingReferenceIntConsumer,java.util.concurrent.ExecutorService):67:67 -> a
+    39:39:void processItems(com.android.tools.r8.utils.ForEachable,com.android.tools.r8.utils.ThrowingConsumer,java.util.concurrent.ExecutorService):73:73 -> a
+    40:40:void processItems(com.android.tools.r8.utils.ForEachable,com.android.tools.r8.utils.ThrowingReferenceIntConsumer,java.util.concurrent.ExecutorService):81:81 -> a
+    41:41:java.lang.Object lambda$processItems$6(com.android.tools.r8.utils.ThrowingReferenceIntConsumer,java.lang.Object,int):84:84 -> a
+    42:42:void processMap(java.util.Map,com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):93:93 -> a
+    43:43:java.lang.Object lambda$processMap$7(com.android.tools.r8.utils.ThrowingBiConsumer,java.lang.Object,java.lang.Object):96:96 -> a
+    44:44:java.lang.Object lambda$processMapWithResults$8(com.android.tools.r8.utils.ThrowingBiFunction,java.util.Map$Entry):106:106 -> a
+    45:45:java.util.Collection processMapWithResults(java.util.Map,com.android.tools.r8.utils.ThrowingBiFunction,java.util.concurrent.ExecutorService):106:106 -> a
+    46:46:java.util.Collection processMapWithResults(java.util.Map,com.android.tools.r8.utils.ThrowingBiFunction,java.util.concurrent.ExecutorService):105:105 -> a
+    47:60:void awaitFutures(java.lang.Iterable):111:124 -> a
+    61:71:void awaitFutures(java.lang.Iterable):117:127 -> a
+    72:72:java.util.concurrent.ExecutorService getExecutorService(int):171:171 -> a
+    73:73:java.util.concurrent.ExecutorService getExecutorServiceForThreads(int):166:166 -> a
+    73:73:java.util.concurrent.ExecutorService getExecutorService(int):172 -> a
+    74:74:java.util.concurrent.ExecutorService getExecutorService(com.android.tools.r8.utils.InternalOptions):176:176 -> a
+    1:1:void lambda$processItems$5(com.android.tools.r8.utils.ThrowingConsumer,java.lang.Object,int):73:73 -> b
+    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.ThrowingAction -> com.android.tools.r8.internal.yD:
     void execute() -> a
-com.android.tools.r8.utils.ThrowingBiConsumer -> com.android.tools.r8.internal.GE:
-com.android.tools.r8.utils.ThrowingBiFunction -> com.android.tools.r8.internal.HE:
-com.android.tools.r8.utils.ThrowingCharIterator -> com.android.tools.r8.internal.IE:
+com.android.tools.r8.utils.ThrowingBiConsumer -> com.android.tools.r8.internal.zD:
+com.android.tools.r8.utils.ThrowingBiFunction -> com.android.tools.r8.internal.AD:
+com.android.tools.r8.utils.ThrowingCharIterator -> com.android.tools.r8.internal.BD:
     char nextChar() -> a
-com.android.tools.r8.utils.ThrowingConsumer -> com.android.tools.r8.internal.JE:
-com.android.tools.r8.utils.ThrowingFunction -> com.android.tools.r8.internal.KE:
-com.android.tools.r8.utils.ThrowingIntIterator -> com.android.tools.r8.internal.LE:
+com.android.tools.r8.utils.ThrowingConsumer -> com.android.tools.r8.internal.CD:
+com.android.tools.r8.utils.ThrowingFunction -> com.android.tools.r8.internal.DD:
+com.android.tools.r8.utils.ThrowingIntIterator -> com.android.tools.r8.internal.ED:
     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.ME:
+com.android.tools.r8.utils.ThrowingIntSupplier -> com.android.tools.r8.internal.FD:
     int getAsInt() -> a
-com.android.tools.r8.utils.ThrowingIterator -> com.android.tools.r8.internal.NE:
+com.android.tools.r8.utils.ThrowingIterator -> com.android.tools.r8.internal.GD:
     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.OE:
-com.android.tools.r8.utils.ThrowingReferenceIntFunction -> com.android.tools.r8.internal.PE:
+com.android.tools.r8.utils.ThrowingReferenceIntConsumer -> com.android.tools.r8.internal.HD:
+com.android.tools.r8.utils.ThrowingReferenceIntFunction -> com.android.tools.r8.internal.ID:
     java.lang.Object apply(java.lang.Object,int) -> a
-com.android.tools.r8.utils.ThrowingSupplier -> com.android.tools.r8.internal.QE:
-com.android.tools.r8.utils.Timing -> com.android.tools.r8.internal.RE:
+com.android.tools.r8.utils.ThrowingSupplier -> com.android.tools.r8.internal.JD:
+com.android.tools.r8.utils.Timing -> com.android.tools.r8.internal.KD:
     java.util.Stack stack -> d
     com.android.tools.r8.utils.Timing EMPTY -> a
     com.android.tools.r8.utils.Timing$Node top -> c
@@ -82083,20 +82448,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.RE$a:
+com.android.tools.r8.utils.Timing$1 -> com.android.tools.r8.internal.KD$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.RE$a$a:
+com.android.tools.r8.utils.Timing$1$1 -> com.android.tools.r8.internal.KD$a$a:
     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.RE$b:
+com.android.tools.r8.utils.Timing$MemInfo -> com.android.tools.r8.internal.KD$b:
     long used -> a
     1:2:void <init>(long):101:102 -> <init>
-com.android.tools.r8.utils.Timing$Node -> com.android.tools.r8.internal.RE$c:
+com.android.tools.r8.utils.Timing$Node -> com.android.tools.r8.internal.KD$c:
     java.util.Map children -> d
     long start_time -> f
     long duration -> e
@@ -82157,7 +82522,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.RE$d:
+com.android.tools.r8.utils.Timing$TimingMerger -> com.android.tools.r8.internal.KD$d:
     com.android.tools.r8.utils.Timing$Node merged -> c
     int taskCount -> d
     com.android.tools.r8.utils.Timing$Node slowest -> e
@@ -82173,7 +82538,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.SE:
+com.android.tools.r8.utils.Timing$TimingMerger$1 -> com.android.tools.r8.internal.LD:
     boolean $assertionsDisabled -> i
     int val$numberOfThreads -> j
     com.android.tools.r8.utils.Timing$TimingMerger this$0 -> k
@@ -82192,23 +82557,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.TE:
+com.android.tools.r8.utils.Timing$TimingMerger$Item -> com.android.tools.r8.internal.MD:
     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.dF:
+com.android.tools.r8.utils.TraversalContinuation -> com.android.tools.r8.internal.WD:
     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
-com.android.tools.r8.utils.TriConsumer -> com.android.tools.r8.internal.hF:
+    1:1:boolean shouldContinue():16:16 -> b
+com.android.tools.r8.utils.TriConsumer -> com.android.tools.r8.internal.aE:
     void accept(java.lang.Object,java.lang.Object,java.lang.Object) -> a
-com.android.tools.r8.utils.TriFunction -> com.android.tools.r8.internal.iF:
+com.android.tools.r8.utils.TriFunction -> com.android.tools.r8.internal.bE:
     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.jF:
+com.android.tools.r8.utils.TriPredicate -> com.android.tools.r8.internal.cE:
     boolean test(java.lang.Object,java.lang.Object,java.lang.Object) -> a
-com.android.tools.r8.utils.VersionProperties -> com.android.tools.r8.internal.DG:
+com.android.tools.r8.utils.VersionProperties -> com.android.tools.r8.internal.TF:
     com.android.tools.r8.utils.VersionProperties INSTANCE -> a
     java.lang.String sha -> c
     boolean $assertionsDisabled -> b
@@ -82227,7 +82593,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.dH:
+com.android.tools.r8.utils.Visibility -> com.android.tools.r8.internal.vG:
     com.android.tools.r8.utils.Visibility[] $VALUES -> e
     com.android.tools.r8.utils.Visibility PUBLIC -> a
     com.android.tools.r8.utils.Visibility PROTECTED -> b
@@ -82238,10 +82604,10 @@
     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.Visibility$1 -> com.android.tools.r8.internal.dH$a:
+com.android.tools.r8.utils.Visibility$1 -> com.android.tools.r8.internal.vG$a:
     int[] $SwitchMap$com$android$tools$r8$utils$Visibility -> a
     1:1:void <clinit>():33:33 -> <clinit>
-com.android.tools.r8.utils.WorkList -> com.android.tools.r8.internal.tH:
+com.android.tools.r8.utils.WorkList -> com.android.tools.r8.internal.LG:
     java.util.Deque workingList -> b
     java.util.Set seen -> c
     boolean $assertionsDisabled -> a
@@ -82261,7 +82627,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.tH$a:
+com.android.tools.r8.utils.WorkList$EqualityTest -> com.android.tools.r8.internal.LG$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>
@@ -82314,100 +82680,100 @@
     18:18:com.android.tools.r8.utils.ZipUtils$ZipBuilder addFilesRelative(java.nio.file.Path,java.nio.file.Path[]):224:224 -> a
     19:22:com.android.tools.r8.utils.ZipUtils$ZipBuilder addBytes(java.lang.String,byte[]):228:231 -> a
     23:24:java.nio.file.Path build():236:237 -> a
-com.android.tools.r8.utils.collections.BidirectionalManyToManyMap -> com.android.tools.r8.internal.p2:
+com.android.tools.r8.utils.collections.BidirectionalManyToManyMap -> com.android.tools.r8.internal.k2:
     java.util.Set getKeys(java.lang.Object) -> a
-com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap -> com.android.tools.r8.internal.q2:
-    java.lang.Object getRepresentativeValue(java.lang.Object) -> b
-    java.lang.Object getRepresentativeKey(java.lang.Object) -> c
-com.android.tools.r8.utils.collections.BidirectionalManyToOneHashMap -> com.android.tools.r8.internal.r2:
+com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap -> com.android.tools.r8.internal.l2:
+    java.lang.Object getRepresentativeValue(java.lang.Object) -> c
+    java.lang.Object getRepresentativeKey(java.lang.Object) -> d
+com.android.tools.r8.utils.collections.BidirectionalManyToOneHashMap -> com.android.tools.r8.internal.m2:
     java.util.Map backing -> b
     java.util.Map inverse -> c
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():21:21 -> <init>
     2:4:void <init>(java.util.Map,java.util.Map):24:26 -> <init>
-    1:1:void forEachManyToOneMapping(java.util.function.BiConsumer):57:57 -> a
-    2:2:void lambda$forEachManyToOneMapping$0(java.util.function.BiConsumer,java.lang.Object,java.util.Set):57:57 -> a
-    3:3:java.util.Map getForwardMap():72:72 -> a
-    4:4:java.util.Set getKeys(java.lang.Object):82:82 -> a
-    5:5:void removeAll(java.lang.Iterable):111:111 -> a
-    6:6:void lambda$put$2(java.lang.Object,java.lang.Object):136:136 -> a
-    7:7:void put(java.lang.Iterable,java.lang.Object):136:136 -> a
-    1:2:void clear():31:32 -> b
-    3:5:void put(java.lang.Object,java.lang.Object):129:131 -> b
+    1:2:void clear():31:32 -> a
+    3:3:void forEachManyToOneMapping(java.util.function.BiConsumer):57:57 -> a
+    4:4:void lambda$forEachManyToOneMapping$0(java.util.function.BiConsumer,java.lang.Object,java.util.Set):57:57 -> a
+    5:5:java.util.Set getKeys(java.lang.Object):82:82 -> a
+    6:6:void removeAll(java.lang.Iterable):111:111 -> a
+    7:7:void lambda$put$2(java.lang.Object,java.lang.Object):136:136 -> a
+    8:8:void put(java.lang.Iterable,java.lang.Object):136:136 -> a
+    1:1:java.util.Map getForwardMap():72:72 -> b
+    2:8:java.util.Set removeValue(java.lang.Object):116:122 -> b
+    9:11:void put(java.lang.Object,java.lang.Object):129:131 -> b
     1:1:boolean containsKey(java.lang.Object):37:37 -> containsKey
     1:1:boolean containsValue(java.lang.Object):42:42 -> containsValue
-    1:1:java.util.Set lambda$put$1(java.lang.Object):131:131 -> d
-    1:6:java.lang.Object remove(java.lang.Object):98:103 -> e
-    1:7:java.util.Set removeValue(java.lang.Object):116:122 -> f
+    1:1:java.util.Set lambda$put$1(java.lang.Object):131:131 -> e
+    1:6:java.lang.Object remove(java.lang.Object):98:103 -> f
     1:1:void forEach(java.util.function.BiConsumer):47:47 -> forEach
     1:1: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:boolean isEmpty():93:93 -> isEmpty
     1:1:java.util.Set keySet():77:77 -> keySet
     1:1:java.util.Set values():141:141 -> values
-com.android.tools.r8.utils.collections.BidirectionalManyToOneMap -> com.android.tools.r8.internal.s2:
+com.android.tools.r8.utils.collections.BidirectionalManyToOneMap -> com.android.tools.r8.internal.n2:
     void forEachManyToOneMapping(java.util.function.BiConsumer) -> a
-    java.util.Map getForwardMap() -> a
-com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeHashMap -> com.android.tools.r8.internal.t2:
+    java.util.Map getForwardMap() -> b
+com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeHashMap -> com.android.tools.r8.internal.o2:
     java.util.Map representatives -> d
     1:5:void <init>():12:16 -> <init>
-    1:2:void clear():20:21 -> b
-    3:3:java.lang.Object getRepresentativeValue(java.lang.Object):45:45 -> b
+    1:2:void clear():20:21 -> a
+    1:1:java.util.Set removeValue(java.lang.Object):67:67 -> b
+    2:2:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeHashMap.removeRepresentativeFor(java.lang.Object):26:26 -> b
+    2:2:java.util.Set removeValue(java.lang.Object):68 -> b
     1:1:void setRepresentative(java.lang.Object,java.lang.Object):31:31 -> c
-    2:4:java.lang.Object getRepresentativeKey(java.lang.Object):36:38 -> c
-    1:2:java.lang.Object remove(java.lang.Object):58:59 -> e
-    3:3:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeHashMap.removeRepresentativeFor(java.lang.Object):26:26 -> e
-    3:3:java.lang.Object remove(java.lang.Object):60 -> e
-    1:1:java.util.Set removeValue(java.lang.Object):67:67 -> f
-    2:2:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeHashMap.removeRepresentativeFor(java.lang.Object):26:26 -> f
-    2:2:java.util.Set removeValue(java.lang.Object):68 -> f
+    2:2:java.lang.Object getRepresentativeValue(java.lang.Object):45:45 -> c
+    1:3:java.lang.Object getRepresentativeKey(java.lang.Object):36:38 -> d
+    1:2:java.lang.Object remove(java.lang.Object):58:59 -> f
+    3:3:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeHashMap.removeRepresentativeFor(java.lang.Object):26:26 -> f
+    3:3:java.lang.Object remove(java.lang.Object):60 -> f
     1:1:java.lang.Object removeRepresentativeFor(java.lang.Object):26:26 -> g
-com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap -> com.android.tools.r8.internal.u2:
-com.android.tools.r8.utils.collections.BidirectionalOneToManyHashMap -> com.android.tools.r8.internal.v2:
+com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap -> com.android.tools.r8.internal.p2:
+com.android.tools.r8.utils.collections.BidirectionalOneToManyHashMap -> com.android.tools.r8.internal.q2:
     java.util.Map backing -> b
     java.util.Map inverse -> c
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():21:21 -> <init>
     2:4:void <init>(java.util.Map,java.util.Map):24:26 -> <init>
-    1:1:void lambda$forEach$0(java.util.function.BiConsumer,java.lang.Object,java.lang.Object):47:47 -> a
-    2:2:void lambda$forEach$1(java.util.function.BiConsumer,java.lang.Object,java.util.Set):47:47 -> a
-    3:3:void removeAll(java.lang.Iterable):110:110 -> a
-    4:4:void lambda$put$3(java.lang.Object,java.lang.Object):135:135 -> a
-    5:5:void put(java.lang.Object,java.util.Set):135:135 -> a
-    1:2:void clear():31:32 -> b
-    3:3:void forEachOneToManyMapping(java.util.function.BiConsumer):57:57 -> b
-    4:6:void put(java.lang.Object,java.lang.Object):128:130 -> b
+    1:2:void clear():31:32 -> a
+    3:3:void lambda$forEach$0(java.util.function.BiConsumer,java.lang.Object,java.lang.Object):47:47 -> a
+    4:4:void lambda$forEach$1(java.util.function.BiConsumer,java.lang.Object,java.util.Set):47:47 -> a
+    5:5:void removeAll(java.lang.Iterable):110:110 -> a
+    6:6:void lambda$put$3(java.lang.Object,java.lang.Object):135:135 -> a
+    7:7:void put(java.lang.Object,java.util.Set):135:135 -> a
+    1:1:void forEachOneToManyMapping(java.util.function.BiConsumer):57:57 -> b
+    2:4:void put(java.lang.Object,java.lang.Object):128:130 -> b
     1:1:boolean containsKey(java.lang.Object):37:37 -> containsKey
     1:1:boolean containsValue(java.lang.Object):42:42 -> containsValue
-    1:1:java.lang.Object getKey(java.lang.Object):72:72 -> d
-    1:1:java.util.Set getValues(java.lang.Object):83:83 -> e
-    2:2:java.util.Set com.android.tools.r8.utils.collections.BidirectionalOneToManyHashMap.getOrDefault(java.lang.Object,java.util.Set):67:67 -> e
-    2:2:java.util.Set getValues(java.lang.Object):83 -> e
-    1:1:java.util.Set lambda$put$2(java.lang.Object):129:129 -> f
+    1:1:java.lang.Object getKey(java.lang.Object):72:72 -> e
+    1:1:java.util.Set getValues(java.lang.Object):83:83 -> f
+    2:2:java.util.Set com.android.tools.r8.utils.collections.BidirectionalOneToManyHashMap.getOrDefault(java.lang.Object,java.util.Set):67:67 -> f
+    2:2:java.util.Set getValues(java.lang.Object):83 -> f
     1:1:void forEach(java.util.function.BiConsumer):47:47 -> forEach
-    1:7:java.util.Set remove(java.lang.Object):97:103 -> g
-    1:6:java.lang.Object removeValue(java.lang.Object):115:120 -> h
+    1:1:java.util.Set lambda$put$2(java.lang.Object):129:129 -> g
+    1:7:java.util.Set remove(java.lang.Object):97:103 -> h
+    1:6:java.lang.Object removeValue(java.lang.Object):115:120 -> i
     1:1:boolean isEmpty():88:88 -> isEmpty
     1:1:java.util.Set keySet():92:92 -> keySet
-com.android.tools.r8.utils.collections.BidirectionalOneToManyRepresentativeHashMap -> com.android.tools.r8.internal.w2:
+com.android.tools.r8.utils.collections.BidirectionalOneToManyRepresentativeHashMap -> com.android.tools.r8.internal.r2:
     java.util.Map representatives -> e
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():12:12 -> <clinit>
     1:5:void <init>():12:16 -> <init>
-    1:2:void removeAll(java.lang.Iterable):47:48 -> a
-    1:2:void clear():20:21 -> b
-    3:5:java.lang.Object getRepresentativeValue(java.lang.Object):31:33 -> b
-    1:1:java.lang.Object getRepresentativeKey(java.lang.Object):26:26 -> c
-    1:1:java.util.Set remove(java.lang.Object):40:40 -> g
-    2:2:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalOneToManyRepresentativeHashMap.removeRepresentativeFor(java.lang.Object):53:53 -> g
-    2:2:java.util.Set remove(java.lang.Object):41 -> g
-    1:2:java.lang.Object removeValue(java.lang.Object):58:59 -> h
-    3:3:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalOneToManyRepresentativeHashMap.removeRepresentativeFor(java.lang.Object):53:53 -> h
-    3:3:java.lang.Object removeValue(java.lang.Object):60 -> h
-com.android.tools.r8.utils.collections.BidirectionalOneToManyRepresentativeMap -> com.android.tools.r8.internal.x2:
-com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap -> com.android.tools.r8.internal.y2:
+    1:2:void clear():20:21 -> a
+    3:4:void removeAll(java.lang.Iterable):47:48 -> a
+    1:3:java.lang.Object getRepresentativeValue(java.lang.Object):31:33 -> c
+    1:1:java.lang.Object getRepresentativeKey(java.lang.Object):26:26 -> d
+    1:1:java.util.Set remove(java.lang.Object):40:40 -> h
+    2:2:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalOneToManyRepresentativeHashMap.removeRepresentativeFor(java.lang.Object):53:53 -> h
+    2:2:java.util.Set remove(java.lang.Object):41 -> h
+    1:2:java.lang.Object removeValue(java.lang.Object):58:59 -> i
+    3:3:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalOneToManyRepresentativeHashMap.removeRepresentativeFor(java.lang.Object):53:53 -> i
+    3:3:java.lang.Object removeValue(java.lang.Object):60 -> i
+com.android.tools.r8.utils.collections.BidirectionalOneToManyRepresentativeMap -> com.android.tools.r8.internal.s2:
+com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap -> com.android.tools.r8.internal.t2:
     com.android.tools.r8.com.google.common.collect.BiMap backing -> a
     1:1:void <init>():21:21 -> <init>
     2:3:void <init>(com.android.tools.r8.com.google.common.collect.BiMap):24:25 -> <init>
@@ -82418,19 +82784,19 @@
     3:5:java.util.Set getKeys(java.lang.Object):97:99 -> a
     6:6:void forEachManyToOneMapping(java.util.function.BiConsumer):60:60 -> a
     7:7:void lambda$forEachManyToOneMapping$0(java.util.function.BiConsumer,java.lang.Object,java.lang.Object):60:60 -> a
-    8:8:com.android.tools.r8.com.google.common.collect.BiMap getForwardMap():76:76 -> a
-    9:9:com.android.tools.r8.com.google.common.collect.BiMap com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap.getForwardMap():76:76 -> a
-    9:9:java.util.Map getForwardMap():15 -> a
-    10:10:void putAll(com.android.tools.r8.utils.collections.BidirectionalManyToManyMap):127:127 -> a
-    1:1:java.lang.Object getRepresentativeValue(java.lang.Object):91:91 -> b
-    1:1:java.lang.Object getRepresentativeKey(java.lang.Object):86:86 -> c
+    8:8:void putAll(com.android.tools.r8.utils.collections.BidirectionalManyToManyMap):127:127 -> a
+    1:1:com.android.tools.r8.com.google.common.collect.BiMap getForwardMap():76:76 -> b
+    2:2:com.android.tools.r8.com.google.common.collect.BiMap com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap.getForwardMap():76:76 -> b
+    2:2:java.util.Map getForwardMap():15 -> b
+    1:1:java.lang.Object getRepresentativeValue(java.lang.Object):91:91 -> c
     1:1:void clear():30:30 -> clear
     1:1:boolean containsKey(java.lang.Object):35:35 -> containsKey
     1:1:boolean containsValue(java.lang.Object):40:40 -> containsValue
+    1:1:java.lang.Object getRepresentativeKey(java.lang.Object):86:86 -> d
     1:1:java.util.Set entrySet():45:45 -> entrySet
-    1:1:com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap.getInverseOneToOneMap():81:81 -> f
-    1:1:com.android.tools.r8.utils.collections.BidirectionalOneToOneMap getInverseOneToOneMap():15 -> f
     1:1:void forEach(java.util.function.BiConsumer):50:50 -> forEach
+    1:1:com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap.getInverseOneToOneMap():81:81 -> g
+    1:1:com.android.tools.r8.utils.collections.BidirectionalOneToOneMap getInverseOneToOneMap():15 -> g
     1:1:java.lang.Object get(java.lang.Object):65:65 -> get
     1:1:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap.get(java.lang.Object):65:65 -> getOrDefault
     1:1:java.lang.Object getOrDefault(java.lang.Object,java.lang.Object):70 -> getOrDefault
@@ -82443,14 +82809,14 @@
     1:1:java.util.Set com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap.values():147:147 -> values
     1:1:java.util.Collection values():15 -> values
     2:2:java.util.Set values():147:147 -> values
-com.android.tools.r8.utils.collections.BidirectionalOneToOneMap -> com.android.tools.r8.internal.z2:
-    com.android.tools.r8.com.google.common.collect.BiMap getForwardMap() -> a
-    com.android.tools.r8.utils.collections.BidirectionalOneToOneMap getInverseOneToOneMap() -> f
-com.android.tools.r8.utils.collections.DexClassAndMethodSet -> com.android.tools.r8.internal.Z9:
+com.android.tools.r8.utils.collections.BidirectionalOneToOneMap -> com.android.tools.r8.internal.u2:
+    com.android.tools.r8.com.google.common.collect.BiMap getForwardMap() -> b
+    com.android.tools.r8.utils.collections.BidirectionalOneToOneMap getInverseOneToOneMap() -> g
+com.android.tools.r8.utils.collections.DexClassAndMethodSet -> com.android.tools.r8.internal.w9:
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(java.util.function.Supplier):22:22 -> <init>
     1:1:com.android.tools.r8.utils.collections.DexClassAndMethodSet create():32:32 -> b
-com.android.tools.r8.utils.collections.DexClassAndMethodSetBase -> com.android.tools.r8.internal.aa:
+com.android.tools.r8.utils.collections.DexClassAndMethodSetBase -> com.android.tools.r8.internal.x9:
     java.util.function.Supplier backingFactory -> c
     java.util.Map backing -> b
     boolean $assertionsDisabled -> a
@@ -82458,9 +82824,10 @@
     1:1:void <init>(java.util.function.Supplier):24:24 -> <init>
     2:4:void <init>(java.util.function.Supplier,java.util.Map):28:30 -> <init>
     1:2:boolean add(com.android.tools.r8.graph.DexClassAndMethod):34:35 -> a
-    3:3:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):44:44 -> a
-    4:6:java.util.Set toDefinitionSet():82:84 -> a
-    7:7:void lambda$toDefinitionSet$0(java.util.Set,com.android.tools.r8.graph.DexClassAndMethod):84:84 -> a
+    3:3:void addAll(java.lang.Iterable):40:40 -> a
+    4:4:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):44:44 -> a
+    5:7:java.util.Set toDefinitionSet():82:84 -> a
+    8:8:void lambda$toDefinitionSet$0(java.util.Set,com.android.tools.r8.graph.DexClassAndMethod):84:84 -> a
     1:1:boolean contains(com.android.tools.r8.graph.DexClassAndMethod):48:48 -> b
     2:2:boolean remove(com.android.tools.r8.graph.DexEncodedMethod):70:70 -> b
     3:3:boolean com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.remove(com.android.tools.r8.graph.DexMethod):65:65 -> b
@@ -82470,10 +82837,10 @@
     1:1:java.util.Iterator iterator():61:61 -> iterator
     1:1:int size():74:74 -> size
     1:1:java.util.stream.Stream stream():78:78 -> stream
-com.android.tools.r8.utils.collections.DexMethodSignatureSet -> com.android.tools.r8.internal.ia:
+com.android.tools.r8.utils.collections.DexMethodSignatureSet -> com.android.tools.r8.internal.F9:
     java.util.Set backing -> a
     1:2:void <init>(java.util.Set):21:22 -> <init>
-    1:1:com.android.tools.r8.utils.collections.DexMethodSignatureSet create():26:26 -> a
+    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
@@ -82485,34 +82852,33 @@
     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:1:com.android.tools.r8.utils.collections.DexMethodSignatureSet create(com.android.tools.r8.utils.collections.DexMethodSignatureSet):30:30 -> b
-    2:2:com.android.tools.r8.utils.collections.DexMethodSignatureSet createLinked():34:34 -> b
-    3:3:void addAllMethods(java.lang.Iterable):58:58 -> b
-    4:4:boolean contains(com.android.tools.r8.graph.DexMethodSignature):72:72 -> b
-    5:5:boolean remove(com.android.tools.r8.graph.DexEncodedMethod):85:85 -> b
-    6:6:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexEncodedMethod.getSignature():406:406 -> b
+    2:2:void addAllMethods(java.lang.Iterable):58:58 -> b
+    3:3:boolean contains(com.android.tools.r8.graph.DexMethodSignature):72:72 -> b
+    4:4:boolean remove(com.android.tools.r8.graph.DexEncodedMethod):85:85 -> b
+    5:5:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexEncodedMethod.getSignature():407:407 -> b
+    5:5:boolean remove(com.android.tools.r8.graph.DexEncodedMethod):85 -> b
+    6:6:void com.android.tools.r8.graph.DexMethodSignature.<init>(com.android.tools.r8.graph.DexMethod):14:14 -> b
+    6:6:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexEncodedMethod.getSignature():407 -> b
     6:6:boolean remove(com.android.tools.r8.graph.DexEncodedMethod):85 -> b
-    7:7:void com.android.tools.r8.graph.DexMethodSignature.<init>(com.android.tools.r8.graph.DexMethod):14:14 -> b
-    7:7:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexEncodedMethod.getSignature():406 -> b
+    7:7:boolean com.android.tools.r8.utils.collections.DexMethodSignatureSet.remove(com.android.tools.r8.graph.DexMethodSignature):81:81 -> b
     7:7:boolean remove(com.android.tools.r8.graph.DexEncodedMethod):85 -> b
-    8:8:boolean com.android.tools.r8.utils.collections.DexMethodSignatureSet.remove(com.android.tools.r8.graph.DexMethodSignature):81:81 -> b
-    8:8:boolean remove(com.android.tools.r8.graph.DexEncodedMethod):85 -> 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.EmptyBidirectionalOneToOneMap -> com.android.tools.r8.internal.Fa:
+com.android.tools.r8.utils.collections.EmptyBidirectionalOneToOneMap -> com.android.tools.r8.internal.ba:
     1:1:void <init>():14:14 -> <init>
     void forEachManyToOneMapping(java.util.function.BiConsumer) -> a
-    1:1:com.android.tools.r8.com.google.common.collect.BiMap getForwardMap():56:56 -> a
-    2:2:com.android.tools.r8.com.google.common.collect.BiMap com.android.tools.r8.utils.collections.EmptyBidirectionalOneToOneMap.getForwardMap():56:56 -> a
-    2:2:java.util.Map getForwardMap():14 -> a
-    3:3:java.util.Set getKeys(java.lang.Object):71:71 -> a
-    java.lang.Object getRepresentativeValue(java.lang.Object) -> b
-    java.lang.Object getRepresentativeKey(java.lang.Object) -> c
-    1:1:com.android.tools.r8.utils.collections.BidirectionalOneToOneMap getInverseOneToOneMap():96:96 -> f
+    1:1:java.util.Set getKeys(java.lang.Object):71:71 -> a
+    1:1:com.android.tools.r8.com.google.common.collect.BiMap getForwardMap():56:56 -> b
+    2:2:com.android.tools.r8.com.google.common.collect.BiMap com.android.tools.r8.utils.collections.EmptyBidirectionalOneToOneMap.getForwardMap():56:56 -> b
+    2:2:java.util.Map getForwardMap():14 -> b
+    java.lang.Object getRepresentativeValue(java.lang.Object) -> c
+    java.lang.Object getRepresentativeKey(java.lang.Object) -> d
+    1:1:com.android.tools.r8.utils.collections.BidirectionalOneToOneMap getInverseOneToOneMap():96:96 -> g
     1:1:java.util.Set keySet():86:86 -> keySet
     1:1:java.util.Set values():91:91 -> values
-com.android.tools.r8.utils.collections.ImmutableDeque -> com.android.tools.r8.internal.Ce:
+com.android.tools.r8.utils.collections.ImmutableDeque -> com.android.tools.r8.internal.Od:
     boolean isClosed -> a
     1:1:void <init>(java.util.Collection):20:20 -> <init>
     2:2:void <init>(java.util.Collection):17:17 -> <init>
@@ -82536,24 +82902,23 @@
     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.Ie:
+com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap -> com.android.tools.r8.internal.Ud:
     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>
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap.entrySet():85:85 -> a
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():17 -> a
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):96:96 -> a
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(java.lang.Integer):135:135 -> a
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(java.lang.Integer,java.lang.Integer):141:141 -> a
-    5:5:java.lang.Object put(int,java.lang.Object):158:158 -> a
-    6:6:java.lang.Object put(java.lang.Integer,java.lang.Object):163:163 -> a
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap.int2ReferenceEntrySet():78:78 -> b
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ReferenceEntrySet():17 -> b
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet():78:78 -> b
-    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:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):96:96 -> a
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(java.lang.Integer):135:135 -> a
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(java.lang.Integer,java.lang.Integer):141:141 -> a
+    4:4:java.lang.Object put(int,java.lang.Object):158:158 -> a
+    5:5:java.lang.Object put(java.lang.Integer,java.lang.Object):163:163 -> a
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap.entrySet():85:85 -> b
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():17 -> b
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):108:108 -> b
+    3:3: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.objects.ObjectSortedSet com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap.int2ReferenceEntrySet():78:78 -> c
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ReferenceEntrySet():17 -> c
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet():78:78 -> c
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):102:102 -> 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
@@ -82563,13 +82928,14 @@
     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:com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$Builder builder():38:38 -> f
     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:com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$Builder builder():38:38 -> 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
@@ -82602,13 +82968,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.Ge:
-com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$Builder -> com.android.tools.r8.internal.He:
+com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$1 -> com.android.tools.r8.internal.Sd:
+com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$Builder -> com.android.tools.r8.internal.Td:
     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.zp:
+com.android.tools.r8.utils.collections.LongLivedProgramMethodMultisetBuilder -> com.android.tools.r8.internal.Co:
     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>
@@ -82616,13 +82982,13 @@
     2:2:void add(com.android.tools.r8.graph.ProgramMethod):26:26 -> a
     3:4:com.android.tools.r8.utils.collections.ProgramMethodMultiset build(com.android.tools.r8.graph.AppView):34:35 -> a
     5:5:void lambda$build$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodMultiset,com.android.tools.r8.graph.DexMethod,int):37:37 -> a
-    6:6:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):320:320 -> a
+    6:6:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):321:321 -> a
     6:6:void lambda$build$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodMultiset,com.android.tools.r8.graph.DexMethod,int):37 -> a
     7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
     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.Ap:
+com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder -> com.android.tools.r8.internal.Do:
     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>
@@ -82638,9 +83004,10 @@
     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.MutableBidirectionalManyToOneMap -> com.android.tools.r8.internal.Vr:
-com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap -> com.android.tools.r8.internal.Wr:
-com.android.tools.r8.utils.collections.ProgramFieldSet -> com.android.tools.r8.internal.cw:
+com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap -> com.android.tools.r8.internal.Pq:
+    java.util.Set removeValue(java.lang.Object) -> b
+com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap -> com.android.tools.r8.internal.Qq:
+com.android.tools.r8.utils.collections.ProgramFieldSet -> com.android.tools.r8.internal.Vu:
     java.util.Map backing -> b
     boolean $assertionsDisabled -> a
     1:3:void <clinit>():19:21 -> <clinit>
@@ -82651,7 +83018,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.ProgramMethodMap -> com.android.tools.r8.internal.fw:
+com.android.tools.r8.utils.collections.ProgramMethodMap -> com.android.tools.r8.internal.Yu:
     java.util.Map backing -> a
     1:2:void <init>(java.util.function.Supplier):21:22 -> <init>
     1:1:void clear():34:34 -> a
@@ -82665,7 +83032,7 @@
     1:1:com.android.tools.r8.utils.collections.ProgramMethodMap create():26:26 -> b
     1:1:com.android.tools.r8.utils.collections.ProgramMethodMap createLinked():30:30 -> c
     1:1:boolean isEmpty():46:46 -> d
-com.android.tools.r8.utils.collections.ProgramMethodMultiset -> com.android.tools.r8.internal.gw:
+com.android.tools.r8.utils.collections.ProgramMethodMultiset -> com.android.tools.r8.internal.Zu:
     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
@@ -82675,7 +83042,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.hw:
+com.android.tools.r8.utils.collections.ProgramMethodSet -> com.android.tools.r8.internal.av:
     com.android.tools.r8.utils.collections.ProgramMethodSet EMPTY -> d
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>(java.util.function.Supplier):25:25 -> <init>
@@ -82692,7 +83059,7 @@
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet createLinked():59:59 -> d
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet empty():63:63 -> e
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet create(int):39:39 -> g
-com.android.tools.r8.utils.collections.SortedProgramMethodSet -> com.android.tools.r8.internal.wC:
+com.android.tools.r8.utils.collections.SortedProgramMethodSet -> com.android.tools.r8.internal.hB:
     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>
@@ -82704,15 +83071,16 @@
     11:11:int lambda$toDefinitionSet$5(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):67:67 -> a
     12:12:void lambda$toDefinitionSet$6(java.util.Set,com.android.tools.r8.graph.ProgramMethod):69:69 -> 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
-    1:1:com.android.tools.r8.utils.collections.SortedProgramMethodSet create():33:33 -> f
+    1:1:com.android.tools.r8.utils.collections.SortedProgramMethodSet create():33:33 -> g
     1:1:com.android.tools.r8.utils.collections.SortedProgramMethodSet createConcurrent():50:50 -> h
     1:1:com.android.tools.r8.utils.collections.SortedProgramMethodSet empty():54:54 -> i
     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
-com.android.tools.r8.utils.structural.CompareToVisitor -> com.android.tools.r8.internal.W7:
+com.android.tools.r8.utils.structural.CompareToVisitor -> com.android.tools.r8.internal.y7:
     1:1:void <init>():18:18 -> <init>
     int visit(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping) -> a
+    int visit(java.lang.Object,java.lang.Object,java.util.Comparator) -> a
     int visitBool(boolean,boolean) -> a
     int visitDexReference(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference) -> a
     int visitDexString(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString) -> a
@@ -82722,157 +83090,165 @@
     int visitInt(int,int) -> a
     int visitItemIterator(java.util.Iterator,java.util.Iterator,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept) -> a
     int visitLong(long,long) -> a
-    1:1:int visitItemCollection(java.util.Collection,java.util.Collection):40:40 -> a
-    2:2:int visitDexField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):48:48 -> a
-    3:3:int visitDexMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):52:52 -> a
-com.android.tools.r8.utils.structural.CompareToVisitorBase -> com.android.tools.r8.internal.Z7:
+    1:2:int visitItemCollection(java.util.Collection,java.util.Collection):41:42 -> a
+    3:3:int visitItemCollection(java.util.Collection,java.util.Collection):40:40 -> a
+    4:4:int lambda$visitItemCollection$0(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):43:43 -> a
+    5:5:int visitDexField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):51:51 -> a
+    6:6:int visitDexMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):55:55 -> a
+com.android.tools.r8.utils.structural.CompareToVisitorBase -> com.android.tools.r8.internal.B7:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():19:19 -> <clinit>
     1:1:void <init>():19:19 -> <init>
-    1:1:int visitBool(boolean,boolean):33:33 -> a
-    2:2:int visitInt(int,int):38:38 -> a
-    3:3:int visitLong(long,long):43:43 -> a
-    4:4:int visitFloat(float,float):48:48 -> a
-    5:5:int visitDouble(double,double):53:53 -> a
-    6:10:int visitItemIterator(java.util.Iterator,java.util.Iterator,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept):60:64 -> a
-    11:11:int com.android.tools.r8.utils.structural.CompareToVisitorBase.visitBool(boolean,boolean):33:33 -> a
-    11:11:int visitItemIterator(java.util.Iterator,java.util.Iterator,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept):64 -> a
-    12:12:int visitDexString(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):71:71 -> a
-    13:13:int visitDexReference(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference):76:76 -> a
-    14:14:int com.android.tools.r8.utils.structural.CompareToVisitorBase.visitInt(int,int):38:38 -> a
-    14:14:int visitDexReference(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference):76 -> a
-    15:15:int visitDexReference(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference):78:78 -> a
+    1:1:int visitBool(boolean,boolean):23:23 -> a
+    2:2:int visitInt(int,int):28:28 -> a
+    3:3:int visitLong(long,long):33:33 -> a
+    4:4:int visitFloat(float,float):38:38 -> a
+    5:5:int visitDouble(double,double):43:43 -> a
+    6:10:int visitItemIterator(java.util.Iterator,java.util.Iterator,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept):50:54 -> a
+    11:11:int com.android.tools.r8.utils.structural.CompareToVisitorBase.visitBool(boolean,boolean):23:23 -> a
+    11:11:int visitItemIterator(java.util.Iterator,java.util.Iterator,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept):54 -> a
+    12:12:int visitDexString(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):61:61 -> a
+    13:13:int visitDexReference(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference):66:66 -> a
+    14:14:int com.android.tools.r8.utils.structural.CompareToVisitorBase.visitInt(int,int):28:28 -> a
+    14:14:int visitDexReference(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference):66 -> a
+    15:15:int visitDexReference(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference):68:68 -> a
     16:16:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
-    16:16:int visitDexReference(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference):79 -> a
-    17:21:int visitDexReference(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference):80:84 -> a
-    22:24:int visit(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):97:99 -> a
-com.android.tools.r8.utils.structural.CompareToVisitorBase$1 -> com.android.tools.r8.internal.X7:
-com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification -> com.android.tools.r8.internal.Y7:
+    16:16:int visitDexReference(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference):69 -> a
+    17:21:int visitDexReference(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference):70:74 -> a
+    22:22:int visit(java.lang.Object,java.lang.Object,java.util.Comparator):82:82 -> a
+    23:25:int visit(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):87:89 -> a
+com.android.tools.r8.utils.structural.CompareToVisitorBase$1 -> com.android.tools.r8.internal.z7:
+com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification -> com.android.tools.r8.internal.A7:
     com.android.tools.r8.utils.structural.CompareToVisitorBase parent -> b
     java.lang.Object item2 -> d
     java.lang.Object item1 -> c
     int order -> e
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():102:102 -> <clinit>
-    1:1:void <init>(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.CompareToVisitorBase,com.android.tools.r8.utils.structural.CompareToVisitorBase$1):102:102 -> <init>
-    2:2:void <init>(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.CompareToVisitorBase):110:110 -> <init>
-    3:8:void <init>(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.CompareToVisitorBase):108:113 -> <init>
+    1:1:void <clinit>():92:92 -> <clinit>
+    1:1:void <init>(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.CompareToVisitorBase,com.android.tools.r8.utils.structural.CompareToVisitorBase$1):92:92 -> <init>
+    2:2:void <init>(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.CompareToVisitorBase):100:100 -> <init>
+    3:8:void <init>(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.CompareToVisitorBase):98:103 -> <init>
     com.android.tools.r8.utils.structural.StructuralSpecification self() -> a
-    1:1:int access$100(com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification):102:102 -> a
-    2:3:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withAssert(java.util.function.Predicate):123:124 -> a
-    2:3:com.android.tools.r8.utils.structural.StructuralSpecification withAssert(java.util.function.Predicate):102 -> a
-    4:5:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withInt(java.util.function.ToIntFunction):138:139 -> a
-    4:5:com.android.tools.r8.utils.structural.StructuralSpecification withInt(java.util.function.ToIntFunction):102 -> a
-    6:6:int com.android.tools.r8.utils.structural.CompareToVisitorBase.visitInt(int,int):38:38 -> a
-    6:6:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withInt(java.util.function.ToIntFunction):139 -> a
-    6:6:com.android.tools.r8.utils.structural.StructuralSpecification withInt(java.util.function.ToIntFunction):102 -> a
-    7:7:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withInt(java.util.function.ToIntFunction):139:139 -> a
-    7:7:com.android.tools.r8.utils.structural.StructuralSpecification withInt(java.util.function.ToIntFunction):102 -> a
-    8:9:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withLong(java.util.function.ToLongFunction):146:147 -> a
-    8:9:com.android.tools.r8.utils.structural.StructuralSpecification withLong(java.util.function.ToLongFunction):102 -> a
-    10:10:int com.android.tools.r8.utils.structural.CompareToVisitorBase.visitLong(long,long):43:43 -> a
-    10:10:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withLong(java.util.function.ToLongFunction):147 -> a
-    10:10:com.android.tools.r8.utils.structural.StructuralSpecification withLong(java.util.function.ToLongFunction):102 -> a
-    11:11:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withLong(java.util.function.ToLongFunction):147:147 -> a
-    11:11:com.android.tools.r8.utils.structural.StructuralSpecification withLong(java.util.function.ToLongFunction):102 -> a
-    12:18:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withConditionalCustomItem(java.util.function.Predicate,java.util.function.Function,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):198:204 -> a
-    12:18:com.android.tools.r8.utils.structural.StructuralSpecification withConditionalCustomItem(java.util.function.Predicate,java.util.function.Function,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):102 -> a
-    19:19:int com.android.tools.r8.utils.structural.CompareToVisitorBase.visitBool(boolean,boolean):33:33 -> a
-    19:19:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withConditionalCustomItem(java.util.function.Predicate,java.util.function.Function,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):204 -> a
-    19:19:com.android.tools.r8.utils.structural.StructuralSpecification withConditionalCustomItem(java.util.function.Predicate,java.util.function.Function,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):102 -> a
-    20:20:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withConditionalCustomItem(java.util.function.Predicate,java.util.function.Function,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):204:204 -> a
-    20:20:com.android.tools.r8.utils.structural.StructuralSpecification withConditionalCustomItem(java.util.function.Predicate,java.util.function.Function,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):102 -> a
-    21:22:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withDexReference(java.util.function.Function):221:222 -> a
-    21:22:com.android.tools.r8.utils.structural.StructuralSpecification withDexReference(java.util.function.Function):102 -> a
-    1:2:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withBool(java.util.function.Predicate):130:131 -> b
-    1:2:com.android.tools.r8.utils.structural.StructuralSpecification withBool(java.util.function.Predicate):102 -> b
-    3:3:int com.android.tools.r8.utils.structural.CompareToVisitorBase.visitBool(boolean,boolean):33:33 -> b
-    3:3:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withBool(java.util.function.Predicate):131 -> b
-    3:3:com.android.tools.r8.utils.structural.StructuralSpecification withBool(java.util.function.Predicate):102 -> b
-    4:4:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withBool(java.util.function.Predicate):131:131 -> b
-    4:4:com.android.tools.r8.utils.structural.StructuralSpecification withBool(java.util.function.Predicate):102 -> b
-    5:10:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withIntArray(java.util.function.Function):162:167 -> b
-    5:10:com.android.tools.r8.utils.structural.StructuralSpecification withIntArray(java.util.function.Function):102 -> b
-    11:11:int com.android.tools.r8.utils.structural.CompareToVisitorBase.visitInt(int,int):38:38 -> b
-    11:11:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withIntArray(java.util.function.Function):167 -> b
-    11:11:com.android.tools.r8.utils.structural.StructuralSpecification withIntArray(java.util.function.Function):102 -> b
-    12:15:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withIntArray(java.util.function.Function):167:170 -> b
-    12:15:com.android.tools.r8.utils.structural.StructuralSpecification withIntArray(java.util.function.Function):102 -> b
-    16:16:int com.android.tools.r8.utils.structural.CompareToVisitorBase.visitInt(int,int):38:38 -> b
-    16:16:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withIntArray(java.util.function.Function):170 -> b
-    16:16:com.android.tools.r8.utils.structural.StructuralSpecification withIntArray(java.util.function.Function):102 -> b
-    17:17:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withIntArray(java.util.function.Function):170:170 -> b
-    17:17:com.android.tools.r8.utils.structural.StructuralSpecification withIntArray(java.util.function.Function):102 -> b
-    18:19:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withCustomItemIterator(java.util.function.Function,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):213:214 -> b
-    18:19:com.android.tools.r8.utils.structural.StructuralSpecification withCustomItemIterator(java.util.function.Function,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):102 -> b
-    1:6:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withShortArray(java.util.function.Function):178:183 -> i
-    1:6:com.android.tools.r8.utils.structural.StructuralSpecification withShortArray(java.util.function.Function):102 -> i
-    7:7:int com.android.tools.r8.utils.structural.CompareToVisitorBase.visitInt(int,int):38:38 -> i
-    7:7:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withShortArray(java.util.function.Function):183 -> i
-    7:7:com.android.tools.r8.utils.structural.StructuralSpecification withShortArray(java.util.function.Function):102 -> i
-    8:11:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withShortArray(java.util.function.Function):183:186 -> i
-    8:11:com.android.tools.r8.utils.structural.StructuralSpecification withShortArray(java.util.function.Function):102 -> i
-    12:12:int com.android.tools.r8.utils.structural.CompareToVisitorBase.visitInt(int,int):38:38 -> i
-    12:12:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withShortArray(java.util.function.Function):186 -> i
-    12:12:com.android.tools.r8.utils.structural.StructuralSpecification withShortArray(java.util.function.Function):102 -> i
-    13:13:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withShortArray(java.util.function.Function):186:186 -> i
-    13:13:com.android.tools.r8.utils.structural.StructuralSpecification withShortArray(java.util.function.Function):102 -> i
-com.android.tools.r8.utils.structural.CompareToVisitorWithNamingLens -> com.android.tools.r8.internal.a8:
+    1:1:int access$100(com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification):92:92 -> a
+    2:3:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withAssert(java.util.function.Predicate):113:114 -> a
+    2:3:com.android.tools.r8.utils.structural.StructuralSpecification withAssert(java.util.function.Predicate):92 -> a
+    4:5:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withInt(java.util.function.ToIntFunction):128:129 -> a
+    4:5:com.android.tools.r8.utils.structural.StructuralSpecification withInt(java.util.function.ToIntFunction):92 -> a
+    6:6:int com.android.tools.r8.utils.structural.CompareToVisitorBase.visitInt(int,int):28:28 -> a
+    6:6:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withInt(java.util.function.ToIntFunction):129 -> a
+    6:6:com.android.tools.r8.utils.structural.StructuralSpecification withInt(java.util.function.ToIntFunction):92 -> a
+    7:7:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withInt(java.util.function.ToIntFunction):129:129 -> a
+    7:7:com.android.tools.r8.utils.structural.StructuralSpecification withInt(java.util.function.ToIntFunction):92 -> a
+    8:9:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withLong(java.util.function.ToLongFunction):136:137 -> a
+    8:9:com.android.tools.r8.utils.structural.StructuralSpecification withLong(java.util.function.ToLongFunction):92 -> a
+    10:10:int com.android.tools.r8.utils.structural.CompareToVisitorBase.visitLong(long,long):33:33 -> a
+    10:10:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withLong(java.util.function.ToLongFunction):137 -> a
+    10:10:com.android.tools.r8.utils.structural.StructuralSpecification withLong(java.util.function.ToLongFunction):92 -> a
+    11:11:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withLong(java.util.function.ToLongFunction):137:137 -> a
+    11:11:com.android.tools.r8.utils.structural.StructuralSpecification withLong(java.util.function.ToLongFunction):92 -> a
+    12:18:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withConditionalCustomItem(java.util.function.Predicate,java.util.function.Function,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):188:194 -> a
+    12:18:com.android.tools.r8.utils.structural.StructuralSpecification withConditionalCustomItem(java.util.function.Predicate,java.util.function.Function,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):92 -> a
+    19:19:int com.android.tools.r8.utils.structural.CompareToVisitorBase.visitBool(boolean,boolean):23:23 -> a
+    19:19:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withConditionalCustomItem(java.util.function.Predicate,java.util.function.Function,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):194 -> a
+    19:19:com.android.tools.r8.utils.structural.StructuralSpecification withConditionalCustomItem(java.util.function.Predicate,java.util.function.Function,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):92 -> a
+    20:20:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withConditionalCustomItem(java.util.function.Predicate,java.util.function.Function,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):194:194 -> a
+    20:20:com.android.tools.r8.utils.structural.StructuralSpecification withConditionalCustomItem(java.util.function.Predicate,java.util.function.Function,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):92 -> a
+    21:22:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withDexReference(java.util.function.Function):211:212 -> a
+    21:22:com.android.tools.r8.utils.structural.StructuralSpecification withDexReference(java.util.function.Function):92 -> a
+    1:2:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withBool(java.util.function.Predicate):120:121 -> b
+    1:2:com.android.tools.r8.utils.structural.StructuralSpecification withBool(java.util.function.Predicate):92 -> b
+    3:3:int com.android.tools.r8.utils.structural.CompareToVisitorBase.visitBool(boolean,boolean):23:23 -> b
+    3:3:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withBool(java.util.function.Predicate):121 -> b
+    3:3:com.android.tools.r8.utils.structural.StructuralSpecification withBool(java.util.function.Predicate):92 -> b
+    4:4:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withBool(java.util.function.Predicate):121:121 -> b
+    4:4:com.android.tools.r8.utils.structural.StructuralSpecification withBool(java.util.function.Predicate):92 -> b
+    5:10:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withIntArray(java.util.function.Function):152:157 -> b
+    5:10:com.android.tools.r8.utils.structural.StructuralSpecification withIntArray(java.util.function.Function):92 -> b
+    11:11:int com.android.tools.r8.utils.structural.CompareToVisitorBase.visitInt(int,int):28:28 -> b
+    11:11:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withIntArray(java.util.function.Function):157 -> b
+    11:11:com.android.tools.r8.utils.structural.StructuralSpecification withIntArray(java.util.function.Function):92 -> b
+    12:15:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withIntArray(java.util.function.Function):157:160 -> b
+    12:15:com.android.tools.r8.utils.structural.StructuralSpecification withIntArray(java.util.function.Function):92 -> b
+    16:16:int com.android.tools.r8.utils.structural.CompareToVisitorBase.visitInt(int,int):28:28 -> b
+    16:16:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withIntArray(java.util.function.Function):160 -> b
+    16:16:com.android.tools.r8.utils.structural.StructuralSpecification withIntArray(java.util.function.Function):92 -> b
+    17:17:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withIntArray(java.util.function.Function):160:160 -> b
+    17:17:com.android.tools.r8.utils.structural.StructuralSpecification withIntArray(java.util.function.Function):92 -> b
+    18:19:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withItemIterator(java.util.function.Function,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):203:204 -> b
+    18:19:com.android.tools.r8.utils.structural.StructuralSpecification withItemIterator(java.util.function.Function,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):92 -> b
+    1:6:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withShortArray(java.util.function.Function):168:173 -> h
+    1:6:com.android.tools.r8.utils.structural.StructuralSpecification withShortArray(java.util.function.Function):92 -> h
+    7:7:int com.android.tools.r8.utils.structural.CompareToVisitorBase.visitInt(int,int):28:28 -> h
+    7:7:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withShortArray(java.util.function.Function):173 -> h
+    7:7:com.android.tools.r8.utils.structural.StructuralSpecification withShortArray(java.util.function.Function):92 -> h
+    8:11:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withShortArray(java.util.function.Function):173:176 -> h
+    8:11:com.android.tools.r8.utils.structural.StructuralSpecification withShortArray(java.util.function.Function):92 -> h
+    12:12:int com.android.tools.r8.utils.structural.CompareToVisitorBase.visitInt(int,int):28:28 -> h
+    12:12:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withShortArray(java.util.function.Function):176 -> h
+    12:12:com.android.tools.r8.utils.structural.StructuralSpecification withShortArray(java.util.function.Function):92 -> h
+    13:13:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withShortArray(java.util.function.Function):176:176 -> h
+    13:13:com.android.tools.r8.utils.structural.StructuralSpecification withShortArray(java.util.function.Function):92 -> h
+com.android.tools.r8.utils.structural.CompareToVisitorWithNamingLens -> com.android.tools.r8.internal.C7:
     com.android.tools.r8.naming.NamingLens namingLens -> b
     1:2:void <init>(com.android.tools.r8.naming.NamingLens):26:27 -> <init>
-    1:4:int visitDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):32:35 -> a
-    5:5:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):57:57 -> a
-    5:5:int visitDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):35 -> a
-    6:6:int visitDexField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):40:40 -> a
-    7:7:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):63:63 -> a
-    7:7:int visitDexField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):40 -> a
-    8:8:int visitDexField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):44:44 -> a
-    9:9:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):57:57 -> a
-    9:9:int visitDexField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):44 -> a
-    10:10:int visitDexField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):48:48 -> a
-    11:11:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):63:63 -> a
-    11:11:int visitDexField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):48 -> a
-    12:12:int visitDexMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):53:53 -> a
-    13:13:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):63:63 -> a
-    13:13:int visitDexMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):53 -> a
-    14:14:int visitDexMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):57:57 -> a
-    15:15:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):57:57 -> a
-    15:15:int visitDexMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):57 -> a
-    16:16:int visitDexMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):61:61 -> a
-com.android.tools.r8.utils.structural.CompareToVisitorWithStringTable -> com.android.tools.r8.internal.b8:
+    1:3:int visitDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):32:34 -> a
+    4:4:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):57:57 -> a
+    4:4:int visitDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):34 -> a
+    5:5:int visitDexField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):39:39 -> a
+    6:6:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):68:68 -> a
+    6:6:int visitDexField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):39 -> a
+    7:7:int visitDexField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):43:43 -> a
+    8:8:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):57:57 -> a
+    8:8:int visitDexField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):43 -> a
+    9:9:int visitDexField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):47:47 -> a
+    10:10:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):68:68 -> a
+    10:10:int visitDexField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):47 -> a
+    11:11:int visitDexMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):52:52 -> a
+    12:12:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):68:68 -> a
+    12:12:int visitDexMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):52 -> a
+    13:13:int visitDexMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):56:56 -> a
+    14:14:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):57:57 -> a
+    14:14:int visitDexMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):56 -> a
+    15:15:int visitDexMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):60:60 -> a
+com.android.tools.r8.utils.structural.CompareToVisitorWithStringTable -> com.android.tools.r8.internal.D7:
     java.util.function.ToIntFunction stringTable -> c
     1:2:void <init>(com.android.tools.r8.naming.NamingLens,java.util.function.ToIntFunction):16:17 -> <init>
     1:1:int visitDexString(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):22:22 -> a
-    2:2:int com.android.tools.r8.utils.structural.CompareToVisitorBase.visitInt(int,int):38:38 -> a
+    2:2:int com.android.tools.r8.utils.structural.CompareToVisitorBase.visitInt(int,int):28:28 -> a
     2:2:int visitDexString(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):22 -> a
-com.android.tools.r8.utils.structural.CompareToVisitorWithTypeEquivalence -> com.android.tools.r8.internal.c8:
+com.android.tools.r8.utils.structural.CompareToVisitorWithTypeEquivalence -> com.android.tools.r8.internal.E7:
     com.android.tools.r8.utils.structural.RepresentativeMap representatives -> b
     1:2:void <init>(com.android.tools.r8.utils.structural.RepresentativeMap):23:24 -> <init>
-    1:3:int visitDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):29:31 -> a
-    4:4:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):57:57 -> a
-    4:4:int visitDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):31 -> a
-com.android.tools.r8.utils.structural.CompareToVisitorWithTypeTable -> com.android.tools.r8.internal.d8:
+    1:1:int lambda$run$0(com.android.tools.r8.utils.structural.StructuralMapping,java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.CompareToVisitor):12:12 -> a
+    2:2:int run(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.RepresentativeMap,com.android.tools.r8.utils.structural.StructuralMapping):12:12 -> a
+    3:4:int run(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.RepresentativeMap,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept):17:18 -> a
+    5:6:int visitDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):29:30 -> a
+    7:8:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexType.getDescriptor():83:83 -> a
+    7:8:int visitDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):31 -> a
+    9:9:int visitDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):31:31 -> a
+    10:10:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):57:57 -> a
+    10:10:int visitDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):31 -> a
+com.android.tools.r8.utils.structural.CompareToVisitorWithTypeTable -> com.android.tools.r8.internal.F7:
     java.util.function.ToIntFunction typeTable -> d
     1:2:void <init>(com.android.tools.r8.naming.NamingLens,java.util.function.ToIntFunction,java.util.function.ToIntFunction):19:20 -> <init>
     1:1:int visitDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):25:25 -> a
-    2:2:int com.android.tools.r8.utils.structural.CompareToVisitorBase.visitInt(int,int):38:38 -> a
+    2:2:int com.android.tools.r8.utils.structural.CompareToVisitorBase.visitInt(int,int):28:28 -> a
     2:2:int visitDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):25 -> a
-com.android.tools.r8.utils.structural.DefaultCompareToVisitor -> com.android.tools.r8.internal.a9:
+com.android.tools.r8.utils.structural.DefaultCompareToVisitor -> com.android.tools.r8.internal.z8:
     com.android.tools.r8.graph.DexType lambda$run$1(com.android.tools.r8.graph.DexType) -> a
     1:1:int run(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept):21:21 -> a
     2:3:int com.android.tools.r8.utils.structural.CompareToVisitorWithTypeEquivalence.run(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.RepresentativeMap,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept):17:18 -> a
     2:3:int run(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept):21 -> a
-com.android.tools.r8.utils.structural.DefaultHashingVisitor -> com.android.tools.r8.internal.d9:
-    com.android.tools.r8.graph.DexType lambda$run$1(com.android.tools.r8.graph.DexType) -> a
-    1:1:void run(java.lang.Object,com.android.tools.r8.com.google.common.hash.Hasher,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):22:22 -> a
-com.android.tools.r8.utils.structural.Equatable -> com.android.tools.r8.internal.Bb:
+    4:4:void com.android.tools.r8.utils.structural.DefaultHashingVisitor.run(java.lang.Object,com.android.tools.r8.com.google.common.hash.Hasher,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):22:22 -> a
+    com.android.tools.r8.graph.DexType com.android.tools.r8.utils.structural.DefaultHashingVisitor.lambda$run$1(com.android.tools.r8.graph.DexType) -> b
+com.android.tools.r8.utils.structural.Equatable -> com.android.tools.r8.internal.Va:
     1:1:void <clinit>():6:6 -> <clinit>
     boolean isEqualTo(java.lang.Object) -> a
     1:8:boolean equalsImpl(com.android.tools.r8.utils.structural.Equatable,java.lang.Object):47:54 -> a
-com.android.tools.r8.utils.structural.Equatable$1 -> com.android.tools.r8.internal.Bb$a:
+com.android.tools.r8.utils.structural.Equatable$1 -> com.android.tools.r8.internal.Va$a:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():47:47 -> <clinit>
-com.android.tools.r8.utils.structural.HashCodeVisitor -> com.android.tools.r8.internal.Ld:
+com.android.tools.r8.utils.structural.HashCodeVisitor -> com.android.tools.r8.internal.Zc:
     java.lang.Object item -> c
     int hashCode -> d
     boolean $assertionsDisabled -> a
@@ -82892,53 +83268,59 @@
     8:8:com.android.tools.r8.utils.structural.StructuralSpecification withLong(java.util.function.ToLongFunction):25 -> a
     9:9:com.android.tools.r8.utils.structural.HashCodeVisitor com.android.tools.r8.utils.structural.HashCodeVisitor.withDexReference(java.util.function.Function):119:119 -> a
     9:9:com.android.tools.r8.utils.structural.StructuralSpecification withDexReference(java.util.function.Function):25 -> a
-    1:1:com.android.tools.r8.utils.structural.StructuralSpecification withCustomItemIterator(java.util.function.Function,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):25:25 -> b
+    1:1:com.android.tools.r8.utils.structural.StructuralSpecification withItemIterator(java.util.function.Function,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):25:25 -> b
     2:2:com.android.tools.r8.utils.structural.HashCodeVisitor com.android.tools.r8.utils.structural.HashCodeVisitor.withBool(java.util.function.Predicate):64:64 -> b
     2:2:com.android.tools.r8.utils.structural.StructuralSpecification withBool(java.util.function.Predicate):25 -> b
     3:3:com.android.tools.r8.utils.structural.HashCodeVisitor com.android.tools.r8.utils.structural.HashCodeVisitor.withIntArray(java.util.function.Function):84:84 -> b
     3:3:com.android.tools.r8.utils.structural.StructuralSpecification withIntArray(java.util.function.Function):25 -> b
     4:9:com.android.tools.r8.utils.structural.HashCodeVisitor withConditionalCustomItem(java.util.function.Predicate,java.util.function.Function,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):98:103 -> b
-    1:1:com.android.tools.r8.utils.structural.HashCodeVisitor com.android.tools.r8.utils.structural.HashCodeVisitor.withShortArray(java.util.function.Function):89:89 -> i
-    1:1:com.android.tools.r8.utils.structural.StructuralSpecification withShortArray(java.util.function.Function):25 -> i
-    1:3:com.android.tools.r8.utils.structural.HashCodeVisitor withCustomItemIterator(java.util.function.Function,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):110:112 -> j
-com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence -> com.android.tools.r8.internal.Vd:
+    1:1:com.android.tools.r8.utils.structural.HashCodeVisitor com.android.tools.r8.utils.structural.HashCodeVisitor.withShortArray(java.util.function.Function):89:89 -> h
+    1:1:com.android.tools.r8.utils.structural.StructuralSpecification withShortArray(java.util.function.Function):25 -> h
+    1:3:com.android.tools.r8.utils.structural.HashCodeVisitor withItemIterator(java.util.function.Function,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):110:112 -> i
+com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence -> com.android.tools.r8.internal.id:
     com.android.tools.r8.com.google.common.hash.Hasher hash -> a
     com.android.tools.r8.utils.structural.RepresentativeMap representatives -> b
     1:1:void com.android.tools.r8.utils.structural.HashingVisitor.<init>():18:18 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.common.hash.Hasher,com.android.tools.r8.utils.structural.RepresentativeMap):36 -> <init>
     2:3:void <init>(com.android.tools.r8.com.google.common.hash.Hasher,com.android.tools.r8.utils.structural.RepresentativeMap):37:38 -> <init>
     void com.android.tools.r8.utils.structural.HashingVisitor.visitDexReference(com.android.tools.r8.graph.DexReference) -> a
-    1:1:void run(java.lang.Object,com.android.tools.r8.com.google.common.hash.Hasher,com.android.tools.r8.utils.structural.RepresentativeMap,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):30:30 -> a
-    2:2:void com.android.tools.r8.utils.structural.HashingVisitor.visitItemArray(com.android.tools.r8.utils.structural.StructuralItem[]):34:34 -> a
-    2:2:void com.android.tools.r8.utils.structural.HashingVisitor.visitItemArray(com.android.tools.r8.utils.structural.StructuralItem[]):0 -> a
-    3:3:void com.android.tools.r8.utils.structural.HashingVisitor.visitItemCollection(java.util.Collection):0:0 -> a
-    3:3:void com.android.tools.r8.utils.structural.HashingVisitor.visitItemArray(com.android.tools.r8.utils.structural.StructuralItem[]):34 -> a
-    3:3:void com.android.tools.r8.utils.structural.HashingVisitor.visitItemArray(com.android.tools.r8.utils.structural.StructuralItem[]):0 -> a
-    41:41:void com.android.tools.r8.utils.structural.HashingVisitor.visitItemCollection(java.util.Collection):38:38 -> a
-    42:43:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visitItemIterator(java.util.Iterator,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):83:84 -> a
-    42:43:void com.android.tools.r8.utils.structural.HashingVisitor.visitItemCollection(java.util.Collection):38 -> a
-    44:44:void visitBool(boolean):43:43 -> a
-    45:45:void com.android.tools.r8.utils.structural.HashingVisitor.visitDexField(com.android.tools.r8.graph.DexField):46:46 -> a
-    45:45:void com.android.tools.r8.utils.structural.HashingVisitor.visitDexField(com.android.tools.r8.graph.DexField):0 -> a
-    46:46:void visitInt(int):48:48 -> a
-    47:47:void com.android.tools.r8.utils.structural.HashingVisitor.visitDexMethod(com.android.tools.r8.graph.DexMethod):50:50 -> a
-    47:47:void com.android.tools.r8.utils.structural.HashingVisitor.visitDexMethod(com.android.tools.r8.graph.DexMethod):0 -> a
-    48:48:void visitFloat(float):53:53 -> a
-    49:49:void visitLong(long):58:58 -> a
-    50:50:void visitDouble(double):63:63 -> a
-    51:51:void visitDexString(com.android.tools.r8.graph.DexString):68:68 -> a
-    52:52:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visitInt(int):48:48 -> a
-    52:52:void visitDexString(com.android.tools.r8.graph.DexString):68 -> a
-    53:53:void visitDexType(com.android.tools.r8.graph.DexType):73:73 -> a
-    54:54:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visitDexString(com.android.tools.r8.graph.DexString):68:68 -> a
-    54:54:void visitDexType(com.android.tools.r8.graph.DexType):73 -> a
+    1:1:void lambda$run$0(com.android.tools.r8.utils.structural.StructuralMapping,java.lang.Object,com.android.tools.r8.utils.structural.HashingVisitor):25:25 -> a
+    2:2:void run(java.lang.Object,com.android.tools.r8.com.google.common.hash.Hasher,com.android.tools.r8.utils.structural.RepresentativeMap,com.android.tools.r8.utils.structural.StructuralMapping):25:25 -> a
+    3:3:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.run(java.lang.Object,com.android.tools.r8.com.google.common.hash.Hasher,com.android.tools.r8.utils.structural.RepresentativeMap,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):30:30 -> a
+    3:3:void run(java.lang.Object,com.android.tools.r8.com.google.common.hash.Hasher,com.android.tools.r8.utils.structural.RepresentativeMap,com.android.tools.r8.utils.structural.StructuralMapping):25 -> a
+    4:4:void run(java.lang.Object,com.android.tools.r8.com.google.common.hash.Hasher,com.android.tools.r8.utils.structural.RepresentativeMap,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):30:30 -> a
+    5:5:void com.android.tools.r8.utils.structural.HashingVisitor.visitItemArray(com.android.tools.r8.utils.structural.StructuralItem[]):34:34 -> a
+    5:5:void com.android.tools.r8.utils.structural.HashingVisitor.visitItemArray(com.android.tools.r8.utils.structural.StructuralItem[]):0 -> a
+    6:6:void com.android.tools.r8.utils.structural.HashingVisitor.visitItemCollection(java.util.Collection):0:0 -> a
+    6:6:void com.android.tools.r8.utils.structural.HashingVisitor.visitItemArray(com.android.tools.r8.utils.structural.StructuralItem[]):34 -> a
+    6:6:void com.android.tools.r8.utils.structural.HashingVisitor.visitItemArray(com.android.tools.r8.utils.structural.StructuralItem[]):0 -> a
+    44:44:void com.android.tools.r8.utils.structural.HashingVisitor.visitItemCollection(java.util.Collection):38:38 -> a
+    45:46:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visitItemIterator(java.util.Iterator,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):83:84 -> a
+    45:46:void com.android.tools.r8.utils.structural.HashingVisitor.visitItemCollection(java.util.Collection):38 -> a
+    47:47:void visitBool(boolean):43:43 -> a
+    48:48:void com.android.tools.r8.utils.structural.HashingVisitor.visitDexField(com.android.tools.r8.graph.DexField):46:46 -> a
+    48:48:void com.android.tools.r8.utils.structural.HashingVisitor.visitDexField(com.android.tools.r8.graph.DexField):0 -> a
+    49:49:void visitInt(int):48:48 -> a
+    50:50:void com.android.tools.r8.utils.structural.HashingVisitor.visitDexMethod(com.android.tools.r8.graph.DexMethod) -> a
+    50:50:void com.android.tools.r8.utils.structural.HashingVisitor.visitDexMethod(com.android.tools.r8.graph.DexMethod):0 -> a
+    51:51:void visitFloat(float):53:53 -> a
+    52:52:void visitLong(long):58:58 -> a
+    53:53:void visitDouble(double):63:63 -> a
+    54:54:void visitDexString(com.android.tools.r8.graph.DexString):68:68 -> a
     55:55:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visitInt(int):48:48 -> a
-    55:55:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visitDexString(com.android.tools.r8.graph.DexString):68 -> a
-    55:55:void visitDexType(com.android.tools.r8.graph.DexType):73 -> a
-    56:56:void visit(java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):78:78 -> a
+    55:55:void visitDexString(com.android.tools.r8.graph.DexString):68 -> a
+    56:56:void visitDexType(com.android.tools.r8.graph.DexType):73:73 -> a
+    57:57:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexType.getDescriptor():83:83 -> a
+    57:57:void visitDexType(com.android.tools.r8.graph.DexType):73 -> a
+    58:58:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visitDexString(com.android.tools.r8.graph.DexString):68:68 -> a
+    58:58:void visitDexType(com.android.tools.r8.graph.DexType):73 -> a
+    59:59:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visitInt(int):48:48 -> a
+    59:59:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visitDexString(com.android.tools.r8.graph.DexString):68 -> a
+    59:59:void visitDexType(com.android.tools.r8.graph.DexType):73 -> a
+    60:60:void visit(java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):78:78 -> a
     1:1:void com.android.tools.r8.utils.structural.HashingVisitor.visitDexReference(com.android.tools.r8.graph.DexReference):54:54 -> b
-com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$1 -> com.android.tools.r8.internal.Td:
-com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$ItemSpecification -> com.android.tools.r8.internal.Ud:
+com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$1 -> com.android.tools.r8.internal.gd:
+com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$ItemSpecification -> com.android.tools.r8.internal.hd:
     java.lang.Object item -> c
     com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence parent -> b
     boolean $assertionsDisabled -> a
@@ -82960,14 +83342,14 @@
     1:1:com.android.tools.r8.utils.structural.StructuralSpecification withBool(java.util.function.Predicate):93 -> b
     2:4:com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$ItemSpecification com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$ItemSpecification.withIntArray(java.util.function.Function):141:143 -> b
     2:4:com.android.tools.r8.utils.structural.StructuralSpecification withIntArray(java.util.function.Function):93 -> b
-    5:5:com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$ItemSpecification com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$ItemSpecification.withCustomItemIterator(java.util.function.Function,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):175:175 -> b
-    5:5:com.android.tools.r8.utils.structural.StructuralSpecification withCustomItemIterator(java.util.function.Function,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):93 -> b
+    5:5:com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$ItemSpecification com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$ItemSpecification.withItemIterator(java.util.function.Function,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):175:175 -> b
+    5:5:com.android.tools.r8.utils.structural.StructuralSpecification withItemIterator(java.util.function.Function,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):93 -> b
     6:7:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visitItemIterator(java.util.Iterator,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):83:84 -> b
-    6:7:com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$ItemSpecification com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$ItemSpecification.withCustomItemIterator(java.util.function.Function,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):175 -> b
-    6:7:com.android.tools.r8.utils.structural.StructuralSpecification withCustomItemIterator(java.util.function.Function,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):93 -> b
-    1:3:com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$ItemSpecification com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$ItemSpecification.withShortArray(java.util.function.Function):150:152 -> i
-    1:3:com.android.tools.r8.utils.structural.StructuralSpecification withShortArray(java.util.function.Function):93 -> i
-com.android.tools.r8.utils.structural.Ordered -> com.android.tools.r8.internal.Au:
+    6:7:com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$ItemSpecification com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$ItemSpecification.withItemIterator(java.util.function.Function,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):175 -> b
+    6:7:com.android.tools.r8.utils.structural.StructuralSpecification withItemIterator(java.util.function.Function,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):93 -> b
+    1:3:com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$ItemSpecification com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$ItemSpecification.withShortArray(java.util.function.Function):150:152 -> h
+    1:3:com.android.tools.r8.utils.structural.StructuralSpecification withShortArray(java.util.function.Function):93 -> h
+com.android.tools.r8.utils.structural.Ordered -> com.android.tools.r8.internal.tt:
     1:1:void <clinit>():7:7 -> <clinit>
     1:2:boolean isEqualTo(java.lang.Object):16:17 -> a
     3:3:com.android.tools.r8.utils.structural.Ordered com.android.tools.r8.utils.structural.Ordered.min(com.android.tools.r8.utils.structural.Ordered,com.android.tools.r8.utils.structural.Ordered):21:21 -> a
@@ -82979,32 +83361,30 @@
     1:1:com.android.tools.r8.utils.structural.Ordered min(com.android.tools.r8.utils.structural.Ordered,com.android.tools.r8.utils.structural.Ordered):21:21 -> d
     2:2:boolean isGreaterThanOrEqualTo(java.lang.Object):61:61 -> d
     1:1:boolean isLessThanOrEqualTo(java.lang.Object):53:53 -> e
-com.android.tools.r8.utils.structural.Ordered$1 -> com.android.tools.r8.internal.Au$a:
+com.android.tools.r8.utils.structural.Ordered$1 -> com.android.tools.r8.internal.tt$a:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():16:16 -> <clinit>
-com.android.tools.r8.utils.structural.RepresentativeMap -> com.android.tools.r8.internal.hA:
+com.android.tools.r8.utils.structural.RepresentativeMap -> com.android.tools.r8.internal.Ty:
     com.android.tools.r8.graph.DexType getRepresentative(com.android.tools.r8.graph.DexType) -> a
-com.android.tools.r8.utils.structural.StructuralAcceptor -> com.android.tools.r8.internal.VD:
-com.android.tools.r8.utils.structural.StructuralItem -> com.android.tools.r8.internal.WD:
+com.android.tools.r8.utils.structural.StructuralAcceptor -> com.android.tools.r8.internal.IC:
+com.android.tools.r8.utils.structural.StructuralItem -> com.android.tools.r8.internal.JC:
     1:1:int compareTo(com.android.tools.r8.utils.structural.StructuralItem):31:31 -> a
     2:2:int compareWithTypeEquivalenceTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.RepresentativeMap):42:42 -> a
-    3:4:int com.android.tools.r8.utils.structural.CompareToVisitorWithTypeEquivalence.run(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.RepresentativeMap,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept):17:18 -> a
-    3:4:int compareWithTypeEquivalenceTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.RepresentativeMap):41 -> a
-    5:5:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):47:47 -> a
-    6:6:void hash(com.android.tools.r8.com.google.common.hash.Hasher):64:64 -> a
-    7:7:void hashWithTypeEquivalence(com.android.tools.r8.com.google.common.hash.Hasher,com.android.tools.r8.utils.structural.RepresentativeMap):81:81 -> a
-    8:8:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):86:86 -> a
+    3:3:int compareWithTypeEquivalenceTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.RepresentativeMap):41:41 -> a
+    4:4:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):47:47 -> a
+    5:5:void hash(com.android.tools.r8.com.google.common.hash.Hasher):64:64 -> a
+    6:6:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):86:86 -> a
     1:1:int compareTo(java.lang.Object):10:10 -> compareTo
-    com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping() -> f
+    com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping() -> e
     com.android.tools.r8.utils.structural.StructuralItem self() -> k
     1:3:java.lang.String hashForTesting():69:71 -> n
-com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept -> com.android.tools.r8.internal.WD$a:
+com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept -> com.android.tools.r8.internal.JC$a:
     int acceptCompareTo(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.CompareToVisitor) -> a
-com.android.tools.r8.utils.structural.StructuralItem$HashingAccept -> com.android.tools.r8.internal.WD$b:
+com.android.tools.r8.utils.structural.StructuralItem$HashingAccept -> com.android.tools.r8.internal.JC$b:
     void acceptHashing(java.lang.Object,com.android.tools.r8.utils.structural.HashingVisitor) -> a
-com.android.tools.r8.utils.structural.StructuralMapping -> com.android.tools.r8.internal.XD:
+com.android.tools.r8.utils.structural.StructuralMapping -> com.android.tools.r8.internal.KC:
     void apply(com.android.tools.r8.utils.structural.StructuralSpecification) -> a
-com.android.tools.r8.utils.structural.StructuralSpecification -> com.android.tools.r8.internal.YD:
+com.android.tools.r8.utils.structural.StructuralSpecification -> com.android.tools.r8.internal.LC:
     1:1:void <init>():18:18 -> <init>
     boolean lambda$withCustomItem$0(java.lang.Object) -> a
     com.android.tools.r8.utils.structural.StructuralSpecification self() -> a
@@ -83018,19 +83398,18 @@
     4:4:com.android.tools.r8.utils.structural.StructuralSpecification withCustomItemCollection(java.util.function.Function,com.android.tools.r8.utils.structural.StructuralAcceptor):59:59 -> a
     5:5:boolean lambda$withNullableItem$2(java.util.function.Function,java.lang.Object):73:73 -> a
     6:6:com.android.tools.r8.utils.structural.StructuralSpecification withConditionalItem(java.util.function.Predicate,java.util.function.Function):78:78 -> a
-    7:7:java.util.Iterator lambda$withItemArray$3(com.android.tools.r8.utils.structural.StructuralItem[]):93:93 -> a
-    8:8:int lambda$withItemArrayAllowingNullMembers$5(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):104:104 -> a
-    9:9:int lambda$withItemArrayAllowingNullMembers$5(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):102:102 -> a
-    10:12:void lambda$withItemArrayAllowingNullMembers$6(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.HashingVisitor):108:110 -> a
+    7:7:java.util.Iterator lambda$withItemArray$3(com.android.tools.r8.utils.structural.StructuralItem[]):92:92 -> a
+    8:8:int lambda$withItemArrayAllowingNullMembers$5(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):105:105 -> a
+    9:9:int lambda$withItemArrayAllowingNullMembers$5(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):103:103 -> a
+    10:12:void lambda$withItemArrayAllowingNullMembers$6(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.HashingVisitor):109:111 -> a
     boolean lambda$withItem$1(java.lang.Object) -> b
     com.android.tools.r8.utils.structural.StructuralSpecification withBool(java.util.function.Predicate) -> b
-    com.android.tools.r8.utils.structural.StructuralSpecification withCustomItemIterator(java.util.function.Function,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept) -> b
     com.android.tools.r8.utils.structural.StructuralSpecification withIntArray(java.util.function.Function) -> b
-    1:1:java.util.Iterator lambda$withItemArrayAllowingNullMembers$4(com.android.tools.r8.utils.structural.StructuralItem[]):99:99 -> b
+    com.android.tools.r8.utils.structural.StructuralSpecification withItemIterator(java.util.function.Function,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept) -> b
+    1:1:java.util.Iterator lambda$withItemArrayAllowingNullMembers$4(com.android.tools.r8.utils.structural.StructuralItem[]):100:100 -> b
     1:1:com.android.tools.r8.utils.structural.StructuralSpecification withItem(java.util.function.Function):69:69 -> c
-    1:1:com.android.tools.r8.utils.structural.StructuralSpecification withItemArray(java.util.function.Function):93:93 -> d
-    1:3:com.android.tools.r8.utils.structural.StructuralSpecification withItemArrayAllowingNullMembers(java.util.function.Function):98:98 -> e
-    1:1:com.android.tools.r8.utils.structural.StructuralSpecification withItemCollection(java.util.function.Function):89:89 -> f
-    1:1:com.android.tools.r8.utils.structural.StructuralSpecification withItemIterator(java.util.function.Function):83:83 -> g
-    1:1:com.android.tools.r8.utils.structural.StructuralSpecification withNullableItem(java.util.function.Function):73:73 -> h
-    com.android.tools.r8.utils.structural.StructuralSpecification withShortArray(java.util.function.Function) -> i
+    1:3:com.android.tools.r8.utils.structural.StructuralSpecification withItemArray(java.util.function.Function):91:91 -> d
+    1:3:com.android.tools.r8.utils.structural.StructuralSpecification withItemArrayAllowingNullMembers(java.util.function.Function):99:99 -> e
+    1:3:com.android.tools.r8.utils.structural.StructuralSpecification withItemCollection(java.util.function.Function):84:84 -> f
+    1:1:com.android.tools.r8.utils.structural.StructuralSpecification withNullableItem(java.util.function.Function):73:73 -> g
+    com.android.tools.r8.utils.structural.StructuralSpecification withShortArray(java.util.function.Function) -> h